Fna接口46

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

@@ -16,6 +16,7 @@ import com.yd.user.feign.client.sysuser.ApiSysUserFeignClient;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -140,10 +141,11 @@ public class ApiFnaFormController {
         fnaFormService.validFnaFormAdd(fnaUpdateRequest.getPersonalData(), saveType);
         // 转换为数据库实体
         FnaForm fnaForm = fnaFormService.getFnaForm(fnaUpdateRequest);
+        BeanUtils.copyProperties(fnaForm, oldFna, "id", "fnaFormBizId", "userBizId", "agentBizId", "customerBizId", "creatorId", "updaterId");
         // 表单状态
-        fnaForm.setFnaFormStatus("save".equals(saveType)? "COMPLETED" : "UNCOMPLETED");
+        oldFna.setFnaFormStatus("save".equals(saveType)? "1" : "0");
         // 操作数据库
-        boolean result = fnaFormService.updateById(fnaForm);
+        boolean result = fnaFormService.updateById(oldFna);
         if (!result) {
             return Result.fail(ResultCode.FAIL.getCode(), ResultCode.FAIL.getMessage());
         }

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

@@ -18,7 +18,7 @@ public class PolicyFollowQueryRequest extends PageDto implements Serializable {
     /**
      * 新单状态
      */
-    @Schema(description = "新单状态 'CHECKING'-'审核中','UNDERWRITING'-'承保中','FINISHED'-'已完成','DECLINED'-'已拒绝','CANCELLED'-'已取消', 字典值: policy_follow_status")
+    @Schema(description = "新单状态 'CHECKING'-'审核中','UNDERWRITING'-'承保中','FINISHED'-'已完成','DECLINED'-'已拒绝','CANCELLED'-'已取消', 字典值: csf_policy_follow_status")
     private String status;
 
     /**