Merge remote-tracking branch 'origin/master'

tenant/organization/src/main/java/com/jzg/organization/service/impl/PtlSchemeServiceImpl.java

@@ -109,6 +109,9 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
     @Autowired
     jyxSettingMapper jyxSettingMapper;
 
+    @Autowired
+    PtlAreaLicenseService ptlAreaLicenseService;
+
     /**
      * 添加方案
      *
@@ -594,6 +597,7 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
         ValidateSchemeRuleVo validateSchemeRuleVo = new ValidateSchemeRuleVo();
         validateSchemeRuleVo.builderQuoteVo(schemeRuleFilterVo, redissonClient);
         validateSchemeRuleVo.setAttrLinks(ptlSchemeRulesAttrLinks);
+        validateSchemeRuleVo.getQuoteVo().getCarInfoVo().setLicenseNo(ptlAreaLicenseService.convertLicense2AreaNumber(validateSchemeRuleVo.getQuoteVo().getCarInfoVo().getLicenseNo().substring(0, 2)));
         HttpResult<List<String>> esmInsCompanyHttpResult = costsRuleClient.validateSchemeRule(validateSchemeRuleVo);
         List<String> insSchemeIds = esmInsCompanyHttpResult.getData();
         if (CollUtil.isEmpty(insSchemeIds)) {
@@ -790,6 +794,7 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
         ValidateSchemeRuleVo validateSchemeRuleVo = new ValidateSchemeRuleVo();
         validateSchemeRuleVo.builderQuoteVo(schemeRuleFilterVo, redissonClient);
         validateSchemeRuleVo.setAttrLinks(ptlSchemeRulesAttrLinks);
+        validateSchemeRuleVo.getQuoteVo().getCarInfoVo().setLicenseNo(ptlAreaLicenseService.convertLicense2AreaNumber(validateSchemeRuleVo.getQuoteVo().getCarInfoVo().getLicenseNo().substring(0, 2)));
         HttpResult<List<String>> esmInsCompanyHttpResult = costsRuleClient.validateSchemeRule(validateSchemeRuleVo);
         List<String> insSchemeIds = esmInsCompanyHttpResult.getData();
         newSchemeList.removeIf(x -> !insSchemeIds.contains(x.getId()));