协议费用匹配车牌号因子添加包含暂未上牌标志

src/main/java/com/ydtech/modules/fee/service/impl/FeeRuleSchemeServiceImpl.java

@@ -505,10 +505,10 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
         if(factorCost.getLicenseNumber()!=null&&!"".equals(factorCost.getLicenseNumber())){
             factor17.setNeedMatch(true);
             String matchStr=factorCost.getLicenseNumber();
-//            //考虑是否含暂未上牌标志--待加字段后完善
-//            if(factorCost.暂未上牌标志){
-//                matchStr=matchStr+",暂未上牌";
-//            }
+            //考虑是否含暂未上牌标志
+            if(factorCost.getContainNoLicense()!=null&&"1".equals(factorCost.getContainNoLicense())){
+                matchStr=matchStr+",暂未上牌";
+            }
             factor17.setMultipleSelectVal(matchStr);
         }else{
             //如果方案中未录入，则不校验该项因子
@@ -605,8 +605,11 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
         feeSchemeReqDto.setJqDiscount("");//交强险折扣
         // feeSchemeReqDto.setInsuranceScore(quotedPriceResponse.getPlatMain().getZmScore());//保司评分 这里直接取中煤分
         feeSchemeReqDto.setExpectedLossRate("");//预期赔付率
-        feeSchemeReqDto.setLicenseNo(carInfoVo.getLicenseNo());//车牌号
-
+        if(carInfoVo.getLicenseNo()!=null&&!"".equals(carInfoVo.getLicenseNo())&&!"暂未上牌".equals(carInfoVo.getLicenseNo())){
+            feeSchemeReqDto.setLicenseNo(carInfoVo.getLicenseNo().substring(0,2));//车牌号
+        }else{
+            feeSchemeReqDto.setLicenseNo("暂未上牌");//车牌号
+        }
         return feeSchemeReqDto;
     }
 }

src/main/java/com/ydtech/modules/protocol/entity/dto/PtlAgreementProductCostsSaveDto.java

@@ -164,6 +164,9 @@ public class PtlAgreementProductCostsSaveDto implements Serializable {
     @ApiModelProperty("车牌号")
     private String licenseNumber;
 
+    @ApiModelProperty("是否含暂未上牌")
+    private String containNoLicense;
+
     @ApiModelProperty("费用描述")
     private String costsDescription;
 

src/main/java/com/ydtech/modules/protocol/entity/po/PtlAgreementProductCosts.java

@@ -351,6 +351,12 @@ public class PtlAgreementProductCosts implements Serializable {
     @TableField(value = "license_number")
     private String licenseNumber;
 
+    /**
+     * 车牌因子是否含暂未上牌
+     */
+    @TableField(value = "contain_noLicense")
+    private String containNoLicense;
+
     /**
      * 0 不是 1 是
      */
@@ -446,6 +452,7 @@ public class PtlAgreementProductCosts implements Serializable {
         result = getObjectHashCode(this.costsDescription, result);
         result = getObjectHashCode(this.costsStartDate, result);
         result = getObjectHashCode(this.costsEndDate, result);
+        result = getObjectHashCode(this.containNoLicense, result);
         return result;
     }