问题修改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelVo.java

@@ -54,6 +54,8 @@ public class BaseVehicleModelVo implements Vo {
     private String vehicleTypeCode;
     @ApiModelProperty(value = "车辆版本")
     private String vehicleVersion;
+    @ApiModelProperty(value = "车型别名")
+    private String vehicleAlias;
     @ApiModelProperty(value = "车型图片")
     private List<String> vehicleModelUrls;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVo.java

@@ -55,8 +55,8 @@ public class BaseVehmodelConfigVo implements Vo {
 	private String sid; // 车型与简述配置关联sid
 	@ApiModelProperty("车型sid")
     private String modelSid; // 车型sid
-	@ApiModelProperty("车型名称")
-	private String modelName; // 车型名称
+	@ApiModelProperty("车型别名")
+	private String vehicleAlias; // 车型别名
 	@ApiModelProperty("简述配置sid")
     private String configurationItemsSid; // 简述配置sid
 	@ApiModelProperty("简述配置名称")

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.java

@@ -192,4 +192,6 @@ public interface BaseModelConfigMapper extends BaseMapper<BaseModelConfig> {
     List<AppMoreConfigVo> getCompanyModelList(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("useOrg") String useOrg);
 
     AppModelConfigListVo getCarConfigSummary(@Param("modelSid") String modelSid, @Param("configSid") String configSid);
+
+    int checkByConfigName(String configName);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml

@@ -622,4 +622,8 @@
         ORDER BY
         nowCarNum DESC
     </select>
+
+    <select id="checkByConfigName" resultType="int">
+        SELECT COUNT(*) FROM base_model_config WHERE configName = #{configName} and isDelete = 0
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java

@@ -85,8 +85,12 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
         BaseModelConfig entity = new BaseModelConfig();
         dto.fillEntity(entity);
         String configName = "";
-        configName += dto.getCarColor() + "+" + dto.getSpecification() + "+" + dto.getFuelTank() + "+" + dto.getBaffleModel() + "+" + dto.getIndependentSources() + "+" + dto.getTireCover() + "+" + dto.getSaddle() + "+" + dto.getAirConditioner() + "+" + dto.getRearAxleRatio() + "+" + dto.getTireSize() + "+" + dto.getSlowMachine() + "+" + dto.getRearViewMirror() + "+" + dto.getWheelbase() + "+" + dto.getSuspension() + "+" + dto.getPackingCase() + "+" + dto.getSeat() + "+" + dto.getHubMaterial() + "+" + dto.getConfiguringBao() + "+" + dto.getMultimedia() + "+" + dto.getBumper();
+        configName += dto.getCarColor() + "/" + dto.getSpecification() + "/" + dto.getFuelTank() + "/" + dto.getBaffleModel() + "/" + dto.getIndependentSources() + "/" + dto.getTireCover() + "/" + dto.getSaddle() + "/" + dto.getAirConditioner() + "/" + dto.getRearAxleRatio() + "/" + dto.getTireSize() + "/" + dto.getSlowMachine() + "/" + dto.getRearViewMirror() + "/" + dto.getWheelbase() + "/" + dto.getSuspension() + "/" + dto.getPackingCase() + "/" + dto.getSeat() + "/" + dto.getHubMaterial() + "/" + dto.getConfiguringBao() + "/" + dto.getMultimedia() + "/" + dto.getBumper();
         entity.setConfigName(configName);
+        int i = baseModelConfigService.checkByConfigName(configName);
+        if (i > 0){
+            return rb.setMsg("该常用配置已存在");
+        }
         boolean isSave = baseModelConfigService.save(entity);
         if (!isSave) {
             return rb.setMsg("保存失败");
@@ -111,8 +115,12 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
             return rb.setMsg("该车型已存在该车型配置代码的车型配置信息");
         }*/
         String configName = "";
-        configName += dto.getCarColor() + "+" + dto.getSpecification() + "+" + dto.getFuelTank() + "+" + dto.getBaffleModel() + "+" + dto.getIndependentSources() + "+" + dto.getTireCover() + "+" + dto.getSaddle() + "+" + dto.getAirConditioner() + "+" + dto.getRearAxleRatio() + "+" + dto.getTireSize() + "+" + dto.getSlowMachine() + "+" + dto.getRearViewMirror() + "+" + dto.getWheelbase() + "+" + dto.getSuspension() + "+" + dto.getPackingCase() + "+" + dto.getSeat() + "+" + dto.getHubMaterial() + "+" + dto.getConfiguringBao() + "+" + dto.getMultimedia() + "+" + dto.getBumper();
+        configName += dto.getCarColor() + "/" + dto.getSpecification() + "/" + dto.getFuelTank() + "/" + dto.getBaffleModel() + "/" + dto.getIndependentSources() + "/" + dto.getTireCover() + "/" + dto.getSaddle() + "/" + dto.getAirConditioner() + "/" + dto.getRearAxleRatio() + "/" + dto.getTireSize() + "/" + dto.getSlowMachine() + "/" + dto.getRearViewMirror() + "/" + dto.getWheelbase() + "/" + dto.getSuspension() + "/" + dto.getPackingCase() + "/" + dto.getSeat() + "/" + dto.getHubMaterial() + "/" + dto.getConfiguringBao() + "/" + dto.getMultimedia() + "/" + dto.getBumper();
         dto.setConfigName(configName);
+        int i1 = baseModelConfigService.checkByConfigName(configName);
+        if (i1 > 0){
+            return rb.setMsg("该常用配置已存在");
+        }
         int i = baseModelConfigService.updateBySid(dto.toMap(), sid);
         if (i == 0) {
             return rb.setMsg("修改失败");

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java

@@ -748,4 +748,8 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
         AppModelConfigListVo vo = baseMapper.getCarConfigSummary(modelSid, configSid);
         return vo;
     }
+
+    public int checkByConfigName(String configName) {
+        return baseMapper.checkByConfigName(configName);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.java

@@ -148,4 +148,5 @@ public interface BaseVehicleModelMapper extends BaseMapper<BaseVehicleModel> {
 
     IPage<VehModelVo> listPageByVehmodel(IPage<VehModelVo> page,@Param(Constants.WRAPPER) QueryWrapper<VehModelVo> qw);
 
+    int checkByModelName(String modelName);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml

@@ -15,7 +15,8 @@
         bvm.modelName,
         bvm.engineTypeValue,
         bvm.`vehicleVersionValue` vehicleVersion,
-        bvm.`vehicleTypeCode`
+        bvm.`vehicleTypeCode`,
+        bvm.vehicleAlias
         FROM base_vehicle_model bvm
         <where>
             ${ew.sqlSegment}
@@ -403,4 +404,8 @@
             ${ew.sqlSegment}
         </where>
     </select>
+
+    <select id="checkByModelName" resultType="int">
+        SELECT COUNT(*) FROM base_vehicle_model WHERE modelName = #{modelName} and isDelete = 0
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java

@@ -506,8 +506,13 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
             String sid1 = entity.getSid();
             BeanUtil.copyProperties(dto, entity);
             entity.setSid(sid1);
-            entity.setModelName(entity.getVehicleTypeValue()+entity.getDriveFormValue()+entity.getGearboxTypeValue()+entity.getVehicleVersionValue()+entity.getProductLineValue()+entity.getPowerValue()+entity.getFuelTypeValue());
+            entity.setModelName(entity.getVehicleTypeValue()+entity.getProductLineValue()+entity.getDriveFormValue()+entity.getGearboxTypeValue()+entity.getVehicleVersionValue()+entity.getPowerValue()+entity.getFuelTypeValue()+entity.getEngineTypeValue()+entity.getEmissionStandardValue()+entity.getMarketSegmentsValue()+entity.getSpecifications()+entity.getDepartmentValue());
             entity.setVehicleAlias(dto.getProductLineValue() + " " + dto.getDriveFormValue() + " " + dto.getVehicleTypeValue() + " " + dto.getPowerValue());
+            String modelName = entity.getModelName();
+            int i = baseMapper.checkByModelName(modelName);
+            if (i > 0){
+                return rb.setMsg("该车型信息已存在");
+            }
             boolean isSave = save(entity);
             if (!isSave) {
                 return rb.setMsg("车型信息保存失败");
@@ -530,9 +535,14 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
         if (baseVehicleModel == null) {
             return rb.setMsg("该车型信息不存在");
         }
-        dto.setModelName(dto.getVehicleTypeValue()+dto.getDriveFormValue()+dto.getGearboxTypeValue()+dto.getVehicleVersionValue()+dto.getProductLineValue()+dto.getPowerValue()+dto.getFuelTypeValue());
+        dto.setModelName(dto.getVehicleTypeValue()+dto.getProductLineValue()+dto.getDriveFormValue()+dto.getGearboxTypeValue()+dto.getVehicleVersionValue()+dto.getPowerValue()+dto.getFuelTypeValue()+dto.getEngineTypeValue()+dto.getEmissionStandardValue()+dto.getMarketSegmentsValue()+dto.getSpecifications()+dto.getDepartmentValue());
         dto.setVehicleAlias(dto.getProductLineValue() + " " + dto.getDriveFormValue() + " " + dto.getVehicleTypeValue() + " " + dto.getPowerValue());
-        int i = updateBySid(dto.toMap(), sid);
+        String modelName = dto.getModelName();
+        int i = baseMapper.checkByModelName(modelName);
+        if (i > 0){
+            return rb.setMsg("该车型信息已存在");
+        }
+        updateBySid(dto.toMap(), sid);
         baseVehicleModelAppendixService.deleteByVehModelSid(sid);
         List<BaseVehicleModelAppendixDto> baseVehicleModelAppendixDtos = dto.getBaseVehicleModelAppendixDtos();
         for (BaseVehicleModelAppendixDto baseVehicleModelAppendixDto : baseVehicleModelAppendixDtos) {

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml

@@ -198,7 +198,7 @@
     </select>
 
     <select id="fetchAllBySid" resultType="com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigVo">
-        SELECT bvm.`modelName`,
+        SELECT bvm.`vehicleAlias`,
                bmc.`configName`,
                bmc.`otherConfig`,
                bvc.`manufactorSettlementPrice`,