车型调价导入校验逻辑调整

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java

@@ -237,8 +237,8 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
                 BaseVehicleModel baseVehicleModel = baseVehicleModelService.fetchBySid(modelSid);
                 vos.setCarDetailPage(appVehicleVersionVo);
                 vos.setVehicleAlias(baseVehicleModel.getModelName());
-                vos.setGuidedPrice(vos.getGuidedPrice()+"调到"+vos.getTzhGuidedPrice());
-                vos.setManufactorSettlementPrice(vos.getManufactorSettlementPrice()+"调到"+vos.getTzhManufactorSettlementPrice());
+                vos.setGuidedPrice(vos.getGuidedPrice() + "调到" + vos.getTzhGuidedPrice());
+                vos.setManufactorSettlementPrice(vos.getManufactorSettlementPrice() + "调到" + vos.getTzhManufactorSettlementPrice());
             });
         }
         baseModelModpriceDetailVo.setBaseModelModpriceModels(baseModelModpriceModelVos);
@@ -783,12 +783,18 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
                 }
             } else {
                 if (!(vehTypeMap.containsKey(importVo.getVehicleTypeCode())) && StringUtils.isNotBlank(importVo.getVehicleTypeCode())) {
-                    stringBuilder.append("第" + importVo.getRankNo() + "行车型编码不存在").append(";");
+                    if (!importVo.getVehicleTypeCode().contains(".")) {
+                        stringBuilder.append("第" + importVo.getRankNo() + "行车型编码不存在").append(";");
+                    }
                 }
                 if (!(configCodeMap.containsKey(importVo.getConfigCode())) && StringUtils.isNotBlank(importVo.getConfigCode())) {
-                    stringBuilder.append("第" + importVo.getRankNo() + "行配置编码不存在").append(";");
+                    if (!importVo.getConfigCode().contains(".")) {
+                        stringBuilder.append("第" + importVo.getRankNo() + "行配置编码不存在").append(";");
+                    }
                 } else if (vehTypeMap.containsKey(importVo.getVehicleTypeCode()) && StringUtils.isNotBlank(importVo.getVehicleTypeCode()) && StringUtils.isNotBlank(importVo.getConfigCode())) {
-                    stringBuilder.append("第" + importVo.getRankNo() + "行车型编码与配置编码记录不存在").append(";");
+                    if (!importVo.getVehicleTypeCode().contains(".") && !importVo.getConfigCode().contains(".")) {
+                        stringBuilder.append("第" + importVo.getRankNo() + "行车型编码与配置编码记录不存在").append(";");
+                    }
                 }
             }
         }