push

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

@@ -491,9 +491,9 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol
                 .set(PolicyFollow::getNextStatusList, getNextStatus(policyFollowStatusEnum))
                 .set(PolicyFollow::getNextStatusList, getNextStatus(policyFollowStatusEnum))
                 .set(PolicyFollow::getUpdaterId, loginUserId)
                 .set(PolicyFollow::getUpdaterId, loginUserId)
                 //冷静期结束日期
                 //冷静期结束日期
-                .set(PolicyFollow::getCoolingOffEndDate, changePolicyFollowStatusRequest.getCoolingOffEndDate())
+                .set(PolicyFollow::getCoolingOffEndDate, changePolicyFollowStatusRequest.getCoolingOffEndDate() != null ? changePolicyFollowStatusRequest.getCoolingOffEndDate() : policyFollow.getCoolingOffEndDate())
                 //保单截止日期
                 //保单截止日期
-                .set(PolicyFollow::getPolicyExpirationDate, changePolicyFollowStatusRequest.getPolicyExpirationDate())
+                .set(PolicyFollow::getPolicyExpirationDate, changePolicyFollowStatusRequest.getPolicyExpirationDate() != null ? changePolicyFollowStatusRequest.getPolicyExpirationDate() : policyFollow.getPolicyExpirationDate())
                 .eq(PolicyFollow::getId, policyFollow.getId())
                 .eq(PolicyFollow::getId, policyFollow.getId())
                 .update();
                 .update();
 
 
@@ -527,7 +527,7 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol
             policy.setUnderwritingDate(changePolicyFollowStatusRequest.getUnderwritingDate());
             policy.setUnderwritingDate(changePolicyFollowStatusRequest.getUnderwritingDate());
             policy.setEffectiveDate(changePolicyFollowStatusRequest.getEffectiveDate());
             policy.setEffectiveDate(changePolicyFollowStatusRequest.getEffectiveDate());
             //冷静期结束日期
             //冷静期结束日期
-            policy.setCoolingOffEndDate(changePolicyFollowStatusRequest.getCoolingOffEndDate());
+            policy.setCoolingOffEndDate(changePolicyFollowStatusRequest.getCoolingOffEndDate() != null ? changePolicyFollowStatusRequest.getCoolingOffEndDate() : policy.getCoolingOffEndDate());
 
 
             if (ObjectUtils.isEmpty(policy.getInsuranceCompany()) || ObjectUtils.isEmpty(policy.getInsuranceCompany())) {
             if (ObjectUtils.isEmpty(policy.getInsuranceCompany()) || ObjectUtils.isEmpty(policy.getInsuranceCompany())) {
                 // 获取保单产品信息，填充对账公司相关字段
                 // 获取保单产品信息，填充对账公司相关字段