Fna接口12

yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiFnaController.java

@@ -6,13 +6,18 @@ import com.yd.common.exception.BusinessException;
 import com.yd.common.result.Result;
 
 import com.yd.common.utils.RandomStringGenerator;
+import com.yd.csf.api.service.ApiAppointmentService;
+import com.yd.csf.feign.dto.appointment.ApiAppointmentInfoDto;
+import com.yd.csf.feign.response.appointment.ApiAppointmentDetailResponse;
 import com.yd.csf.service.common.ErrorCode;
 import com.yd.csf.service.dto.DeleteFnaRequest;
 import com.yd.csf.service.dto.FnaAddRequest;
 import com.yd.csf.service.dto.FnaQueryRequest;
 import com.yd.csf.service.dto.FnaUpdateRequest;
+import com.yd.csf.service.model.Appointment;
 import com.yd.csf.service.model.Customer;
 import com.yd.csf.service.model.Fna;
+import com.yd.csf.service.service.CustomerService;
 import com.yd.csf.service.service.FnaService;
 import com.yd.csf.service.vo.FnaVO;
 import com.yd.user.feign.client.sysuser.ApiSysUserFeignClient;
@@ -34,24 +39,27 @@ import javax.servlet.http.HttpServletRequest;
  */
 @RestController
 @RequestMapping("/Fna")
-@Tag(name = "Fna接口")
+@Tag(name = "流程接口")
 public class ApiFnaController {
 
     @Resource
     private FnaService fnaService;
-
+    @Resource
+    private CustomerService customerService;
+    @Resource
+    private ApiAppointmentService appointmentService;
     @Resource
     private ApiSysUserFeignClient apiSysUserFeignClient;
 
     /**
-     * 创建fna
+     * 新建流程
      *
      * @param fnaAddRequest
      * @param request
      * @return
      */
     @PostMapping("/add")
-    @Operation(summary = "创建Fna")
+    @Operation(summary = "新建流程")
     @Transactional(rollbackFor = Exception.class)
     public Result<String> addFna(@RequestBody FnaAddRequest fnaAddRequest, HttpServletRequest request) {
 
@@ -90,14 +98,14 @@ public class ApiFnaController {
     }
 
     /**
-     * 删除fna
+     * 删除流程
      *
      * @param deleteRequest
      * @param request
      * @return
      */
     @PostMapping("/delete")
-    @Operation(summary = "删除Fna")
+    @Operation(summary = "删除流程")
     public Result<Boolean> deleteFna(@RequestBody DeleteFnaRequest deleteRequest, HttpServletRequest request) {
         if (deleteRequest == null || deleteRequest.getId() == null) {
             throw new BusinessException(ErrorCode.PARAMS_ERROR.getCode(), ErrorCode.PARAMS_ERROR.getMessage());
@@ -114,8 +122,10 @@ public class ApiFnaController {
 //            throw new BusinessException(ErrorCode.NO_AUTH_ERROR);
 //        }
         // 操作数据库
-        oldFna.setIsDeleted(1);
-        boolean result = fnaService.updateById(oldFna);
+        Fna updateFna = new Fna();
+        updateFna.setId(id);
+        updateFna.setIsDeleted(1);
+        boolean result = fnaService.updateById(updateFna);
         if (!result) {
             return Result.fail(ErrorCode.OPERATION_ERROR.getCode(), ErrorCode.OPERATION_ERROR.getMessage());
         }
@@ -123,13 +133,13 @@ public class ApiFnaController {
     }
 
     /**
-     * 更新 Fna
+     * 更新流程
      *
      * @param fnaUpdateRequest
      * @return
      */
     @PostMapping("/update")
-    @Operation(summary = "更新Fna")
+    @Operation(summary = "更新流程")
     public Result<Boolean> updateFna(@RequestBody FnaUpdateRequest fnaUpdateRequest) {
         if (fnaUpdateRequest == null || StringUtils.isBlank(fnaUpdateRequest.getFnaBizId())) {
             throw new BusinessException(ErrorCode.PARAMS_ERROR.getCode(), ErrorCode.PARAMS_ERROR.getMessage());
@@ -144,6 +154,18 @@ public class ApiFnaController {
 
         BeanUtils.copyProperties(fnaUpdateRequest, fna,"fnaBizId");
 
+        if (StringUtils.isNotBlank(fnaUpdateRequest.getCustomerBizId())) {
+            Customer customer = customerService.getByCustomerBizId(fnaUpdateRequest.getCustomerBizId());
+            fna.setCustomerName(customer.getName());
+        }
+        if (StringUtils.isNotBlank(fnaUpdateRequest.getAppointmentBizId())) {
+            Result<ApiAppointmentInfoDto> apiAppointmentInfoDtoResult = appointmentService.mainDetail(fnaUpdateRequest.getAppointmentBizId());
+            if (apiAppointmentInfoDtoResult.getData() != null) {
+                ApiAppointmentInfoDto apiAppointmentInfoDto = apiAppointmentInfoDtoResult.getData();
+                fna.setAppointmentNo(apiAppointmentInfoDto.getAppointmentNo());
+            }
+        }
+
         // 操作数据库
         boolean result = fnaService.updateById(fna);
         if (!result) {
@@ -159,7 +181,7 @@ public class ApiFnaController {
      * @return
      */
     @GetMapping("/get/vo")
-    @Operation(summary = "根据id获取FnaVO")
+    @Operation(summary = "流程详情")
     public Result<FnaVO> getFnaVOById(long id, HttpServletRequest request) {
         if (id == 0) {
             return Result.fail(ErrorCode.PARAMS_ERROR.getCode(), ErrorCode.PARAMS_ERROR.getMessage());
@@ -181,7 +203,7 @@ public class ApiFnaController {
      * @return
      */
     @PostMapping("/list/page")
-    @Operation(summary = "分页获取Fna列表")
+    @Operation(summary = "分页获取流程列表")
     public Result<Page<FnaVO>> listFnaByPage(@RequestBody FnaQueryRequest fnaQueryRequest) {
         long current = fnaQueryRequest.getPageNo();
         long size = fnaQueryRequest.getPageSize();

yd-csf-service/src/main/java/com/yd/csf/service/dto/CompanyBusinessData.java

@@ -9,6 +9,10 @@ public class CompanyBusinessData {
     private String averageNetProfit;
     @Schema(description = "公司現時大約的總資產 (HKD)")
     private String estimatedTotalAssets;
+
+    @Schema(description = "币种")
+    private String currency;
+
     @Schema(description = "資產所佔百分比 (%)")
     private String assetPercentage;
 }

yd-csf-service/src/main/java/com/yd/csf/service/dto/ExistingSecurity.java

@@ -10,8 +10,10 @@ public class ExistingSecurity {
     private String insurer;
     @Schema(description = "保障类型")
     private String insuranceType;
-    @Schema(description = "保额 (HKD)")
+    @Schema(description = "保额")
     private String sumInsured;
+    @Schema(description = "币种")
+    private String currency;
     @Schema(description = "保单签发日期")
     private String policyIssueDate;
 }

yd-csf-service/src/main/java/com/yd/csf/service/dto/FnaFormAddRequest.java

@@ -4,6 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * 创建Fna表单请求
@@ -28,17 +29,17 @@ public class FnaFormAddRequest implements Serializable {
      * 家庭状况
      */
     @Schema(description = "家庭状况（父亲-father/母亲-mother/配偶-spouse/子女-children）")
-    private FamilyMembers familyMembers;
+    private List<FamilyMember> familyMembers;
 
     /**
      * 保单持有人个人已有保障
      */
-    private ExistingSecuritys existingSecurityOwner;
+    private List<ExistingSecurity> existingSecurityOwner;
 
     /**
      * 受保人个人已有保障
      */
-    private ExistingSecuritys existingSecurityInsured;
+    private List<ExistingSecurity> existingSecurityInsured;
 
     /**
      * 平均月收入

yd-csf-service/src/main/java/com/yd/csf/service/dto/FnaQueryRequest.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -17,6 +18,30 @@ import java.util.List;
 public class FnaQueryRequest extends PageDto implements Serializable {
 
     /**
+     * 创建时间开始
+     */
+    @Schema(description = "创建时间开始")
+    private LocalDateTime startTime;
+
+    /**
+     * 创建时间结束
+     */
+    @Schema(description = "创建时间结束")
+    private LocalDateTime endTime;
+
+    /**
+     * 流程编号
+     */
+    @Schema(description = "流程编号")
+    private String fnaNo;
+
+    /**
+     * 状态
+     */
+    @Schema(description = "状态 UNCOMPLETED-未完成 COMPLETED-已完成")
+    private String status;
+
+    /**
      * 客户姓名
      */
     @Schema(description = "客户姓名")

yd-csf-service/src/main/java/com/yd/csf/service/dto/FnaUpdateRequest.java

@@ -20,10 +20,22 @@ public class FnaUpdateRequest implements Serializable {
     private String fnaBizId;
 
     /**
-     * 预约编号
+     * 客户唯一业务ID
      */
-    @Schema(description = "预约编号")
-    private String appointmentNo;
+    @Schema(description = "客户唯一业务ID")
+    private String customerBizId;
+
+    /**
+     * Fna Form唯一业务ID
+     */
+    @Schema(description = "Fna Form唯一业务ID")
+    private String fnaFormBizId;
+
+    /**
+     * 预约信息唯一业务ID
+     */
+    @Schema(description = "预约信息唯一业务ID")
+    private String appointmentBizId;
 
     /**
      * 新单编号

yd-csf-service/src/main/java/com/yd/csf/service/dto/OwnerAssets.java

 package com.yd.csf.service.dto;
 
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class OwnerAssets {
-    private OwnerProperties primaryResidence1;
-    private OwnerProperties primaryResidence2;
+    private List<OwnerProperties> primaryResidence;
 
-    private InvestmentProperties investment1;
-    private InvestmentProperties investment2;
+    private List<InvestmentProperties> investment;
 }

yd-csf-service/src/main/java/com/yd/csf/service/dto/OwnerProperties.java

@@ -8,6 +8,8 @@ import lombok.Data;
 public class OwnerProperties {
     @Schema(description = "地址")
     private String address;
-    @Schema(description = "市值(HKD)")
+    @Schema(description = "市值")
     private String marketValue;
+    @Schema(description = "币种")
+    private String currency;
 }

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/FnaServiceImpl.java

@@ -16,6 +16,7 @@ import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -54,15 +55,22 @@ public class FnaServiceImpl extends ServiceImpl<FnaMapper, Fna> implements FnaSe
         if (fnaQueryRequest == null) {
             return queryWrapper;
         }
-        // 客户姓名
         String customerName = fnaQueryRequest.getCustomerName();
-        // 预约编号
         String appointmentNo = fnaQueryRequest.getAppointmentNo();
-        // 新单编号
         String policyId = fnaQueryRequest.getPolicyId();
-        // 保单号
         String policyNo = fnaQueryRequest.getPolicyNo();
-
+        LocalDateTime startTime = fnaQueryRequest.getStartTime();
+        LocalDateTime endTime = fnaQueryRequest.getEndTime();
+        String fnaNo = fnaQueryRequest.getFnaNo();
+        String status = fnaQueryRequest.getStatus();
+        // 流程编号
+        queryWrapper.like(StringUtils.isNotBlank(fnaNo), "fna_no", fnaNo);
+        // 状态
+        queryWrapper.eq(StringUtils.isNotBlank(status), "status", status);
+        // 创建时间开始
+        queryWrapper.ge(ObjectUtils.isNotEmpty(startTime), "create_time", startTime);
+        // 创建时间结束
+        queryWrapper.le(ObjectUtils.isNotEmpty(endTime), "create_time", endTime);
         // 客户姓名
         queryWrapper.like(StringUtils.isNotBlank(customerName), "customer_name", customerName);
         // 预约编号