新单跟进v2

yd-csf-service/src/main/java/com/yd/csf/service/enums/PolicyStatusEnum.java

@@ -4,9 +4,10 @@ import org.apache.commons.lang3.ObjectUtils;
 
 
 public enum PolicyStatusEnum {
 public enum PolicyStatusEnum {
 
 
-    INFORCE("生效中", "INFORCE"),
+    INFORCE("生效", "INFORCE"),
     LAPSED("保单失效", "LAPSED"),
     LAPSED("保单失效", "LAPSED"),
-    MATURED("期满终止", "MATURED"),
+    MATURED("退保", "MATURED"),
+    COOLING_PERIOD_MATURED("冷静期退保", "COOLING_PERIOD_MATURED"),
     ;
     ;
     //字典项标签（名称）
     //字典项标签（名称）
     private String itemLabel;
     private String itemLabel;

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

@@ -20,6 +20,7 @@ import com.yd.csf.service.common.ErrorCode;
 import com.yd.csf.service.dto.*;
 import com.yd.csf.service.dto.*;
 import com.yd.csf.service.enums.FnaStatusEnum;
 import com.yd.csf.service.enums.FnaStatusEnum;
 import com.yd.csf.service.enums.PolicyFollowStatusEnum;
 import com.yd.csf.service.enums.PolicyFollowStatusEnum;
+import com.yd.csf.service.enums.PolicyStatusEnum;
 import com.yd.csf.service.model.*;
 import com.yd.csf.service.model.*;
 import com.yd.csf.service.service.*;
 import com.yd.csf.service.service.*;
 import com.yd.csf.service.dao.PolicyFollowMapper;
 import com.yd.csf.service.dao.PolicyFollowMapper;
@@ -483,6 +484,7 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol
         if (PolicyFollowStatusEnum.EFFECTIVE.equals(policyFollowStatusEnum)) {
         if (PolicyFollowStatusEnum.EFFECTIVE.equals(policyFollowStatusEnum)) {
             Policy policy = new Policy();
             Policy policy = new Policy();
             BeanUtils.copyProperties(policyFollow, policy, "id");
             BeanUtils.copyProperties(policyFollow, policy, "id");
+            policy.setStatus(PolicyStatusEnum.INFORCE.getItemValue());
             // 手动映射不同名的字段
             // 手动映射不同名的字段
             policy.setPaymentPremium(policyFollow.getInitialPremium());
             policy.setPaymentPremium(policyFollow.getInitialPremium());
             policy.setCurrency(policyFollow.getPolicyCurrency());
             policy.setCurrency(policyFollow.getPolicyCurrency());