From 5f3c1150cfd65ea028c5412a2a293f387f7ea2bf Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 2 Jun 2022 14:04:19 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/basemodelconfig/BaseModelConfig.java | 6 +++ .../basemodelconfig/BaseModelConfigDto.java | 9 +++++ .../basemodelconfig/BaseModelConfigFeign.java | 2 +- .../BaseModelConfigFeignFallback.java | 2 +- .../BaseModelConfigSelectVo.java | 6 +++ .../basevehiclemodel/BaseVehicleModelDto.java | 3 ++ .../BaseVehicleModelFeign.java | 2 +- .../BaseVehicleModelFeignFallback.java | 2 +- .../BaseModelConfigMapper.java | 2 + .../basemodelconfig/BaseModelConfigMapper.xml | 10 +++++ .../basemodelconfig/BaseModelConfigRest.java | 39 ++++++++++++++----- .../BaseModelConfigService.java | 6 ++- .../BaseVehicleCertificateRest.java | 15 ++++--- .../BaseVehicleModelMapper.java | 2 + .../BaseVehicleModelMapper.xml | 10 +++++ .../BaseVehicleModelRest.java | 24 ++++++++---- .../BaseVehicleModelService.java | 18 +++++++++ .../BaseVehmodelConfigMapper.java | 4 ++ .../BaseVehmodelConfigMapper.xml | 18 +++++++++ .../BaseVehmodelConfigService.java | 8 ++++ 20 files changed, 158 insertions(+), 30 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfig.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfig.java index 04f7797ff8..524b6fc8e9 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfig.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfig.java @@ -178,4 +178,10 @@ public class BaseModelConfig extends BaseEntity { @ApiModelProperty("多媒体key") private String multimediaKey; + + @ApiModelProperty("创建组织名称") + private String createOrg; + + @ApiModelProperty("创建组织sid") + private String createOrgSId; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigDto.java index c8197099a7..9e6951efab 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigDto.java @@ -31,6 +31,9 @@ public class BaseModelConfigDto implements Dto { /* @ApiModelProperty("车型配置代码(陕汽必须的字段)") private String vehicleCode;*/ + @ApiModelProperty("userSid") + private String userSid; + @ApiModelProperty("车身颜色key") private String carColorKey; @@ -177,4 +180,10 @@ public class BaseModelConfigDto implements Dto { @ApiModelProperty("多媒体key") private String multimediaKey; + + @ApiModelProperty("创建组织名称") + private String createOrg; + + @ApiModelProperty("创建组织sid") + private String createOrgSId; } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigFeign.java index 8fb78193d7..14a21398d2 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigFeign.java @@ -76,7 +76,7 @@ public interface BaseModelConfigFeign { @ApiOperation("删除、批量删除") @DeleteMapping("/deleteBySids") @ApiImplicitParam(name = "sids", value = "车型配置sid，若为多个sid，以逗号分隔") - public ResultBean deleteBySids(@RequestParam("sids") String sids); + public ResultBean deleteBySids(@RequestParam("sids") String sids,@RequestParam("userSid") String userSid); /** * 详情和修改回显 diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigFeignFallback.java index 525050e18d..7fef6e9359 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigFeignFallback.java @@ -41,7 +41,7 @@ public class BaseModelConfigFeignFallback implements BaseModelConfigFeign { } @Override - public ResultBean deleteBySids(String sids) { + public ResultBean deleteBySids(String sids, String userSid) { return null; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigSelectVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigSelectVo.java index 0db23273d6..f91279b320 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigSelectVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigSelectVo.java @@ -162,4 +162,10 @@ public class BaseModelConfigSelectVo implements Vo { @ApiModelProperty(value = "备注") private String remarks; + + @ApiModelProperty("创建组织名称") + private String createOrg; + + @ApiModelProperty("创建组织sid") + private String createOrgSId; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelDto.java index 676f6ae80d..1270905f99 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelDto.java @@ -34,6 +34,9 @@ public class BaseVehicleModelDto implements Dto { @ApiModelProperty(value = "车型sid") private String sid; + @ApiModelProperty(value = "userSid") + private String userSid; + /*@ApiModelProperty(value = "厂商(陕汽必须的字段)", required = true) @NotBlank(message = "厂商不能为空") private String manufacturer;*/ diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeign.java index 92e64234ca..35b41863b3 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeign.java @@ -85,7 +85,7 @@ public interface BaseVehicleModelFeign { @ApiOperation("删除、批量删除") @DeleteMapping("/deleteBySids") @ApiImplicitParam(name = "sids", value = "车型sid，若为多个sid，以逗号分隔") - public ResultBean deleteBySids(@RequestParam("sids") String sids); + public ResultBean deleteBySids(@RequestParam("sids") String sids,@RequestParam("userSid") String userSid); /** * 详情 diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeignFallback.java index c588a43915..af73de0e41 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeignFallback.java @@ -48,7 +48,7 @@ public class BaseVehicleModelFeignFallback implements BaseVehicleModelFeign { } @Override - public ResultBean deleteBySids(String sids) { + public ResultBean deleteBySids(String sids, String userSid) { return null; } 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 80861b06c6..e4b2bbe5c8 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 @@ -194,4 +194,6 @@ public interface BaseModelConfigMapper extends BaseMapper { AppModelConfigListVo getCarConfigSummary(@Param("modelSid") String modelSid, @Param("configSid") String configSid); int checkByConfigName(String configName); + + int checkByCreateOrgSidAndConfigSid(@Param("sid1") String sid1,@Param("sid") String sid); } \ 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 9eaf0177ca..f33cff4bc3 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 @@ -626,4 +626,14 @@ + + \ 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 0431e936e3..b9fe1d1be9 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 @@ -9,6 +9,8 @@ import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigVo; import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderDetailsVo; import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService; import com.yxt.anrui.base.biz.basevehmodelconfig.BaseVehmodelConfigService; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; @@ -48,6 +50,8 @@ public class BaseModelConfigRest implements BaseModelConfigFeign { private BaseVehicleModelService baseVehicleModelService; @Autowired private BaseVehmodelConfigService baseVehmodelConfigService; + @Autowired + private SysOrganizationFeign sysOrganizationFeign; @Override @@ -82,6 +86,8 @@ public class BaseModelConfigRest implements BaseModelConfigFeign { if (count > 0) { return rb.setMsg("该车型已存在该车型配置代码的车型配置信息"); }*/ + String userSid = dto.getUserSid(); + String sid = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid(); BaseModelConfig entity = new BaseModelConfig(); dto.fillEntity(entity); String configName = ""; @@ -91,6 +97,7 @@ public class BaseModelConfigRest implements BaseModelConfigFeign { if (i > 0){ return rb.setMsg("该常用配置已存在"); } + entity.setCreateOrgSId(sid); boolean isSave = baseModelConfigService.save(entity); if (!isSave) { return rb.setMsg("保存失败"); @@ -105,15 +112,17 @@ public class BaseModelConfigRest implements BaseModelConfigFeign { if (baseModelConfig == null) { return rb.setMsg("该车型配置信息不存在"); } - //车型sid - /*String vehicleSid = dto.getVehicleSid();*/ - //车型配置信息 - /*String vehicleCode = dto.getVehicleCode();*/ - //根据车型sid和整车编码查询是否存在 - /*int count = baseModelConfigService.selectByVeSidAndCodeAndSid(vehicleSid, vehicleCode, sid); - if (count > 0) { - return rb.setMsg("该车型已存在该车型配置代码的车型配置信息"); - }*/ + int i2 = baseVehmodelConfigService.checkByConfigSid(sid); + if (i2 > 0){ + return rb.setMsg("该配置已有关联车型，无法修改"); + } + String userSid = dto.getUserSid(); + ResultBean useOrgByUserSid = sysOrganizationFeign.getUseOrgByUserSid(userSid); + String sid1 = useOrgByUserSid.getData().getSid(); + int i3 = baseModelConfigService.checkByCreateOrgSidAndConfigSid(sid1, sid); + if (i3 == 0){ + 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(); dto.setConfigName(configName); @@ -129,13 +138,23 @@ public class BaseModelConfigRest implements BaseModelConfigFeign { } @Override - public ResultBean deleteBySids(String sids) { + public ResultBean deleteBySids(String sids,String userSid) { List sidList = Arrays.asList(sids.split(",")); // int count = baseModelConfigService.deleteBySids(sidList); // if (count != sidList.size()) { // return ResultBean.fireFail().setMsg("删除失败"); // } for (String sid : sidList) { + int i = baseVehmodelConfigService.checkByConfigSid(sid); + if (i > 0){ + return ResultBean.fireFail().setMsg("该配置已有关联车型，无法删除"); + } + ResultBean s = sysOrganizationFeign.getUseOrgByUserSid(userSid); + String sid1 = s.getData().getSid(); + int i1 = baseModelConfigService.checkByCreateOrgSidAndConfigSid(sid1, sid); + if (i1 == 0){ + return ResultBean.fireFail().setMsg("该配置不属于当前分公司，无法删除"); + } int count = baseModelConfigService.updateBySidIsDeletes(sid); if (count == 0) { return ResultBean.fireFail().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 30673a1dfe..8b46e89b4f 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 @@ -132,7 +132,7 @@ public class BaseModelConfigService extends MybatisBaseService list = dto.getCertificatePhoto(); - if (list.size() == 0){ - return rb.setMsg("请上传合格证照片"); - } - String certificatePhoto = ""; - for (int i = 0; i < list.size(); i++) { - certificatePhoto += list.get(i).replace(fileUploadComponent.getUrlPrefix(), "") + ","; + if (list.size() != 0){ + String certificatePhoto = ""; + for (int i = 0; i < list.size(); i++) { + certificatePhoto += list.get(i).replace(fileUploadComponent.getUrlPrefix(), "") + ","; + } + entity.setCertificatePhoto(certificatePhoto.substring(0, certificatePhoto.length()-1)); } - entity.setCertificatePhoto(certificatePhoto.substring(0, certificatePhoto.length()-1)); - String certificationNo = dto.getCertificationNo(); + String certificationNo = dto.getCertificationNo(); int i1 = baseVehicleCertificateService.checkByCertificationNo(certificationNo); if (i1 > 0){ return rb.setMsg("该合格证编码已存在"); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.java index c5c0a6299c..1551605bb4 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.java @@ -155,4 +155,6 @@ public interface BaseVehicleModelMapper extends BaseMapper { int checkUpdateByModelName(@Param("modelName") String modelName,@Param("sid") String sid); int checkUpdateByVehicleTypeCode(@Param("vehicleTypeCode") String vehicleTypeCode,@Param("sid") String sid); + + int checkByCreateOrgAndModelSid(@Param("sid1") String sid1, @Param("sid") String sid); } \ 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 c85e804068..39c5603f1a 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 @@ -432,4 +432,14 @@ ON bmc.sid = bvc.`configurationItemsSid` WHERE bvc.`modelSid` = #{vehicleSid} + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelRest.java index a0baa145d6..ef0582b2da 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelRest.java @@ -11,6 +11,8 @@ import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService; import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService; import com.yxt.anrui.base.biz.basevehiclemodelappendix.BaseVehicleModelAppendixService; import com.yxt.anrui.base.biz.basevehmodelconfig.BaseVehmodelConfigService; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.utils.ExportExcelUtils; import com.yxt.common.base.utils.PagerUtil; @@ -61,9 +63,6 @@ public class BaseVehicleModelRest implements BaseVehicleModelFeign { @Autowired private HttpServletResponse response; - @Autowired - private BaseModelConfigService baseModelConfigService; - @Autowired private BaseVehicleBrandService baseVehicleBrandService; @@ -73,6 +72,9 @@ public class BaseVehicleModelRest implements BaseVehicleModelFeign { @Autowired private BaseVehmodelConfigService baseVehmodelConfigService; + @Autowired + private SysOrganizationFeign sysOrganizationFeign; + @Override public ResultBean> pagerList(@RequestBody PagerQuery pagerQuery) { ResultBean> rb = ResultBean.fireFail(); @@ -124,13 +126,21 @@ public class BaseVehicleModelRest implements BaseVehicleModelFeign { } @Override - public ResultBean deleteBySids(String sids) { + public ResultBean deleteBySids(String sids,String userSid) { List sidList = Arrays.asList(sids.split(",")); for (String sid : sidList) { + int i = baseVehmodelConfigService.checkByModelSid(sid); + if (i > 0){ + return ResultBean.fireFail().setMsg("该车型已有关联配置，无法删除"); + } + ResultBean useOrgByUserSid = sysOrganizationFeign.getUseOrgByUserSid(userSid); + String sid1 = useOrgByUserSid.getData().getSid(); + int i1 = baseVehicleModelService.checkByCreateOrgAndModelSid(sid1, sid); + if (i1 == 0){ + return ResultBean.fireFail().setMsg("该车型不属于当前分公司，无法删除"); + } int count = baseVehicleModelService.updateBySidIsDelete(sid); - //删除或批量删除车型配置信息 - int count_one = baseVehmodelConfigService.delByModelSid(sid); - if (count == 0 && count_one == 0) { + if (count == 0) { return ResultBean.fireFail().setMsg("删除失败"); } } 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 f2f886cb58..2142989b7a 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 @@ -504,6 +504,8 @@ public class BaseVehicleModelService extends MybatisBaseService 0){ return rb.setMsg("该车型信息已存在"); } + entity.setCreateOrg(sid2); boolean isSave = save(entity); if (!isSave) { return rb.setMsg("车型信息保存失败"); @@ -541,6 +544,17 @@ public class BaseVehicleModelService extends MybatisBaseService 0){ + return rb.setMsg("该车型已有关联配置，无法修改"); + } + String userSid = dto.getUserSid(); + ResultBean useOrgByUserSid = sysOrganizationFeign.getUseOrgByUserSid(userSid); + String sid1 = useOrgByUserSid.getData().getSid(); + int i4 = this.checkByCreateOrgAndModelSid(sid1, sid); + if (i4 == 0){ + return rb.setMsg("该车型不属于当前分公司，无法修改"); + } 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()); String modelName = dto.getModelName(); @@ -622,4 +636,8 @@ public class BaseVehicleModelService extends MybatisBaseService List getListByConfigSid(String sid); List getVehModByModelSid(String sid); + + int checkByConfigSid(String sid); + + int checkByModelSid(String sid); } \ No newline at end of file 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 fe10d13d5d..c7fc58706d 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 @@ -264,4 +264,22 @@ FROM base_vehmodel_config WHERE modelSid = #{sid} + + + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java index b4e024ae7c..bd9ead36d1 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java @@ -543,4 +543,12 @@ public class BaseVehmodelConfigService extends MybatisBaseService getVehModByModelSid(String sid) { return baseMapper.getVehModByModelSid(sid); } + + public int checkByConfigSid(String sid) { + return baseMapper.checkByConfigSid(sid); + } + + public int checkByModelSid(String sid) { + return baseMapper.checkByModelSid(sid); + } } \ No newline at end of file