新旧车添加 车辆类型

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

@@ -2793,7 +2793,7 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
         //获取所有费用属性
         List<PtlAgreementUndwrtRulesAttr> undwrtRulesAttrList = ptlAgreementUndwrtRulesAttrService.getUndwrtRulesAttrList();
         //获取新旧车信息
-        PtlNewCarJudgeRules carJudgeRule = getCarJudgeRule(insAreaCompany.getCompanyId());
+        PtlNewCarJudgeRules carJudgeRule = getCarJudgeRule(insAreaCompany.getCompanyId(), insOrders.getCarinfo().getString("cimodelclass"));
         //获取所有费用属性关联
         List<RuleAttrMappingVo> ruleAttrMappingVoList = RuleAttrMappingVo.getRuleAttrMappingVoList(quoteRespVo, insAreaCompany, insOrders,
                 undwrtRulesAttrList, carJudgeRule);
@@ -2826,7 +2826,7 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
         List<PtlAgreementUndwrtRulesAttr> undwrtRulesAttrList = ptlAgreementUndwrtRulesAttrService.getUndwrtRulesAttrList();
         //获取所有费用属性关联
         List<RuleAttrMappingVo> ruleAttrMappingVoList = RuleAttrMappingVo.getRuleAttrMappingVoList(null,insAreaCompany, insOrders,
-                undwrtRulesAttrList, getCarJudgeRule(insAreaCompany.getCompanyId()));
+                undwrtRulesAttrList, getCarJudgeRule(insAreaCompany.getCompanyId(),insOrders.getCarinfo().getString("cimodelclass")));
 
 
         for (int i = 0; i < ptlAgreementUndwrtRulesNews.size(); i++) {
@@ -3524,11 +3524,12 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
      * @param companyId
      * @return
      */
-    private PtlNewCarJudgeRules getCarJudgeRule(String companyId) {
+    private PtlNewCarJudgeRules getCarJudgeRule(String companyId, String vehicleType) {
         //获取车辆新旧车信息
         List<PtlNewCarJudgeRules> list =
                 ptlNewCarJudgeRulesService.list(new LambdaQueryWrapper<PtlNewCarJudgeRules>()
-                        .eq(PtlNewCarJudgeRules::getCompanyId,companyId));
+                        .eq(PtlNewCarJudgeRules::getCompanyId,companyId)
+                        .eq(PtlNewCarJudgeRules::getVehicleType,vehicleType));
         if (list.size() > 0) {
             return list.get(0);
         }

src/main/java/com/ydtech/modules/order/service/impl/InsCrawlerOrderServiceImpl.java

@@ -654,8 +654,8 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
         insAreaCompanyService.insertCompanyAndOrders(insAreaCompany, insAreaCompanyAccidentalDriving);
         //清空驾意险信息 重新复制
 //        quoteRespVo.getAccident().clear();
-
         quoteRespVo.setCompanyId(insAreaCompany.getId());
+
         return quoteRespVo;
     }
 

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

@@ -31,6 +31,12 @@ public class PtlNewCarJudgeRules implements Serializable {
     @TableField(value = "company_id")
     private String companyId;
 
+    /**
+     * 车辆类型
+     */
+    @TableField(value = "vehicle_type")
+    private String vehicleType;
+
     /**
      * 单位  month-月 day-天
      */

src/main/java/com/ydtech/modules/protocol/entity/vo/PtlNewCarJudgeRulesVo.java

@@ -14,8 +14,13 @@ public class PtlNewCarJudgeRulesVo extends BasePageVO {
 
     @ApiModelProperty(value = "保险公司")
     private String companyId;
+
+    @ApiModelProperty(value = "车辆类型")
+    private String vehicleType;
+
     @ApiModelProperty(value = "单位")
     private String unitTypeCode;
+
     @ApiModelProperty(value = "单位值")
     private String unitTypeValue;