费用因子添加投保人被保人地址

阳光修改即时生效时间

commons/src/main/java/com/jzg/commons/entity/vo/RuleAttrMappingVo.java

@@ -107,6 +107,8 @@ public class RuleAttrMappingVo {
             ruleAttrMappingVoList.add(new RuleAttrMappingVo("PolicyHolderInfoAge", policyHolderInfo.getAge().toString()));
             //投保人 性别
             ruleAttrMappingVoList.add(new RuleAttrMappingVo("PolicyHolderInfoSex", policyHolderInfo.getGender().equals("男") ? "1" : "2"));
+            //投保人 地址
+            ruleAttrMappingVoList.add(new RuleAttrMappingVo("PolicyHolderInfoAddress", policyHolderInfo.getAddr()));
         }
         //被保人
         InsOrdersCarUserInfo insuredPersonInfo = insOrdersCarUserInfos.stream()
@@ -118,6 +120,8 @@ public class RuleAttrMappingVo {
             ruleAttrMappingVoList.add(new RuleAttrMappingVo("InsuredPersonInfoAge", insuredPersonInfo.getAge().toString()));
             //被保人 性别
             ruleAttrMappingVoList.add(new RuleAttrMappingVo("InsuredPersonInfoSex", insuredPersonInfo.getGender().equals("男") ? "1" : "2"));
+            //被保人 地址
+            ruleAttrMappingVoList.add(new RuleAttrMappingVo("InsuredPersonInfoAddress", insuredPersonInfo.getAddr()));
         }
         String OPIConsistent = "0";
         if(StringUtils.isNotBlank(ownerInfo.getCerType().toString())){

tenant/insurance/quotation-yangguang/src/main/java/com/jzg/quotation/yangguang/api/entity/request/YangGuangAccuracyCalculateRequest.java

@@ -236,7 +236,7 @@ public class YangGuangAccuracyCalculateRequest extends YangGuangBaseRequest{
                 ciEndTime = ciStartTime.plusYears(1).minusSeconds(1);
             } else {
                 ciStartTime = LocalDateTime.parse(ciStartDate, formatter);
-                ciEndTime = ciStartTime.plusYears(1).minusDays(1).minusSeconds(1);
+                ciEndTime = ciStartTime.plusYears(1);
             }
             this.CiStartDate = ciStartTime.format(formatter);
             this.CiEndDate = ciEndTime.format(formatter);
@@ -252,7 +252,7 @@ public class YangGuangAccuracyCalculateRequest extends YangGuangBaseRequest{
                 biEndTime = biStartTime.plusYears(1).minusSeconds(1);
             } else {
                 biStartTime = LocalDateTime.parse(biStartDate, formatter);
-                biEndTime = biStartTime.plusYears(1).minusDays(1).minusSeconds(1);
+                biEndTime = biStartTime.plusYears(1);
             }
             this.BiStartDate = biStartTime.format(formatter);
             this.BiEndDate = biEndTime.format(formatter);