diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelVo.java index 87afa45e5a..4a554593b8 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelVo.java +++ b/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 vehicleModelUrls; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVo.java index 8723c13189..65a5e9a28e 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVo.java +++ b/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("简述配置名称") diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.java index 6234c6434b..80861b06c6 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.java +++ b/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 { List 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); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml index f3e65676ff..9eaf0177ca 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml @@ -622,4 +622,8 @@ ORDER BY nowCarNum DESC + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java index 118451b71b..1d1fe9593e 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java +++ b/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("修改失败"); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java index 7bb54383f9..30673a1dfe 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java +++ b/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 { IPage listPageByVehmodel(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); + int checkByModelName(String modelName); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml index e150528c6a..b806b39515 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml +++ b/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 ${ew.sqlSegment} @@ -403,4 +404,8 @@ ${ew.sqlSegment} + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java index 70b7b81ce3..2dfcc890fb 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java +++ b/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 0){ + return rb.setMsg("该车型信息已存在"); + } boolean isSave = save(entity); if (!isSave) { return rb.setMsg("车型信息保存失败"); @@ -530,9 +535,14 @@ public class BaseVehicleModelService extends MybatisBaseService 0){ + return rb.setMsg("该车型信息已存在"); + } + updateBySid(dto.toMap(), sid); baseVehicleModelAppendixService.deleteByVehModelSid(sid); List baseVehicleModelAppendixDtos = dto.getBaseVehicleModelAppendixDtos(); for (BaseVehicleModelAppendixDto baseVehicleModelAppendixDto : baseVehicleModelAppendixDtos) { diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml index 603be2eebe..0becc8b52d 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml @@ -198,7 +198,7 @@