问题修改

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;
 }

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;
 }

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);
 
     /**
      * 详情和修改回显

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;
     }
 

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;
 }

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;*/

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);
 
     /**
      * 详情

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;
     }
 

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<BaseModelConfig> {
     AppModelConfigListVo getCarConfigSummary(@Param("modelSid") String modelSid, @Param("configSid") String configSid);
 
     int checkByConfigName(String configName);
+
+    int checkByCreateOrgSidAndConfigSid(@Param("sid1") String sid1,@Param("sid") String sid);
 }

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

@@ -626,4 +626,14 @@
     <select id="checkByConfigName" resultType="int">
         SELECT COUNT(*) FROM base_model_config WHERE configName = #{configName} and isDelete = 0
     </select>
+
+    <select id="checkByCreateOrgSidAndConfigSid" resultType="int">
+        SELECT
+                COUNT(*)
+        FROM
+                base_model_config
+        WHERE createOrgSId = #{sid1}
+          AND sid = #{sid}
+          AND isDelete = 0
+    </select>
 </mapper>

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<SysOrganizationVo> 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<String> 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<SysOrganizationVo> 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("删除失败");

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<BaseModelConfigMa
                 qw.like("bmc.multimediaKey", pagerQuery.getMultimediaKey());
             }
             if (StringUtils.isNotBlank(pagerQuery.getConfigName())) {//简述配置名称
-                qw.like("bmc.configName", pagerQuery.getConfigName());
+                qw.like("bmc.configName", pagerQuery.getConfigName()).or().like("bmc.otherConfig",pagerQuery.getConfigName());
             }
             String configSid = pagerQuery.getConfigSid();
             if (StringUtils.isNotBlank(configSid)){
@@ -752,4 +752,8 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
     public int checkByConfigName(String configName) {
         return baseMapper.checkByConfigName(configName);
     }
+
+    public int checkByCreateOrgSidAndConfigSid(String sid1, String sid) {
+        return baseMapper.checkByCreateOrgSidAndConfigSid(sid1,sid);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateRest.java

@@ -106,15 +106,14 @@ public class BaseVehicleCertificateRest implements BaseVehicleCertificateFeign {
         BaseVehicleCertificate entity = new BaseVehicleCertificate();
         dto.fillEntity(entity);
         List<String> 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("该合格证编码已存在");

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<BaseVehicleModel> {
     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);
 }

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}
     </select>
+
+    <select id="checkByCreateOrgAndModelSid" resultType="int">
+        SELECT
+                COUNT(*)
+        FROM
+                base_vehicle_model
+        WHERE createOrg = #{sid1}
+          AND sid = #{sid}
+          AND isDelete = 0
+    </select>
 </mapper>

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<PagerVo<BaseVehicleModelVo>> pagerList(@RequestBody PagerQuery<BaseVehicleModelQuery> pagerQuery) {
         ResultBean<PagerVo<BaseVehicleModelVo>> 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<String> sidList = Arrays.asList(sids.split(","));
         for (String sid : sidList) {
+            int i = baseVehmodelConfigService.checkByModelSid(sid);
+            if (i > 0){
+                return ResultBean.fireFail().setMsg("该车型已有关联配置，无法删除");
+            }
+            ResultBean<SysOrganizationVo> 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("删除失败");
             }
         }

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<BaseVehicleModel
         String sid = dto.getSid();
         if (StringUtils.isBlank(sid)) {
             BaseVehicleModel entity = new BaseVehicleModel();
+            String userSid = dto.getUserSid();
+            String sid2 = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid();
             String sid1 = entity.getSid();
             BeanUtil.copyProperties(dto, entity);
             entity.setSid(sid1);
@@ -519,6 +521,7 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
             if (i > 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<BaseVehicleModel
         if (baseVehicleModel == null) {
             return rb.setMsg("该车型信息不存在");
         }
+        int i3 = baseVehmodelConfigService.checkByModelSid(sid);
+        if (i3 > 0){
+            return rb.setMsg("该车型已有关联配置，无法修改");
+        }
+        String userSid = dto.getUserSid();
+        ResultBean<SysOrganizationVo> 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<BaseVehicleModel
 
         return baseVehicleModelVo;
     }
+
+    public int checkByCreateOrgAndModelSid(String sid1, String sid) {
+        return baseMapper.checkByCreateOrgAndModelSid(sid1,sid);
+    }
 }

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

@@ -124,4 +124,8 @@ public interface BaseVehmodelConfigMapper extends BaseMapper<BaseVehmodelConfig>
     List<BaseVehmodelConfigVo> getListByConfigSid(String sid);
 
     List<BaseVehmodelConfigVo> getVehModByModelSid(String sid);
+
+    int checkByConfigSid(String sid);
+
+    int checkByModelSid(String sid);
 }

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}
     </select>
+
+    <select id="checkByConfigSid" resultType="int">
+        SELECT
+                COUNT(*)
+        FROM
+                base_vehmodel_config
+        WHERE configurationItemsSid = #{sid}
+          AND isDelete = 0
+    </select>
+
+    <select id="checkByModelSid" resultType="int">
+        SELECT
+                COUNT(*)
+        FROM
+                base_vehmodel_config
+        WHERE modelSid = #{sid}
+          AND isDelete = 0
+    </select>
 </mapper>

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<BaseVehmodelCo
     public List<BaseVehmodelConfigVo> 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);
+    }
 }