移动端车型报价车型列表接口部分调整、pc修复车型关联不同分公司不允许关联的情况

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/AppModelConfigVo.java

@@ -10,6 +10,7 @@ import java.util.List;
 @Data
 public class AppModelConfigVo implements Vo {
 
+    private static final long serialVersionUID = 5814288614943073790L;
     @ApiModelProperty("车型图片")
     private List<String> modelImage;
 

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppMoreConfigVo.java

@@ -22,4 +22,6 @@ public class AppMoreConfigVo {
 
     @ApiModelProperty(value = "排产数量")
     private String produceCarNum;
+    @ApiModelProperty(value = "分公司sid:车型及配置关联中的后端内部使用")
+    private String useOrgSid;
 }

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

@@ -189,7 +189,7 @@ public interface BaseModelConfigMapper extends BaseMapper<BaseModelConfig> {
 
     List<AppModelConfigListVo> getNowConfigList(IPage<AppModelConfigListQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppModelConfigListVo> qw);
 
-    List<AppMoreConfigVo> getCompanyModelList(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("useOrg") String useOrg);
+    List<AppMoreConfigVo> getCompanyModelList(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("useOrg") String useOrg,@Param("state")String state);
 
     AppModelConfigListVo getCarConfigSummary(@Param("modelSid") String modelSid, @Param("configSid") String configSid);
 

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

@@ -544,10 +544,13 @@
         ORDER BY nowCarNum DESC
     </select>
     <select id="getCompanyModelList" resultType="com.yxt.anrui.base.api.basevehicle.AppMoreConfigVo">
-        SELECT (SELECT count(*) FROM base_vehicle bv WHERE bv.modelSid = bvc.sid AND lockedState = '03') AS nowCarNum,
+        SELECT bvc.useOrgSid,
+               (SELECT count(*)
+                FROM base_vehicle bv
+                WHERE bv.modelSid = bvc.sid AND lockedState = #{state}) AS nowCarNum,
                (SELECT count(*)
                 FROM bus_vehicle_apply_detail bvad
-                WHERE bvad.vehicleSid = bvc.modelSid)                                                    AS produceCarNum
+                WHERE bvad.vehicleSid = bvc.modelSid)                   AS produceCarNum
         FROM base_vehmodel_config bvc
         WHERE bvc.modelSid = #{modelSid}
           AND bvc.configurationItemsSid = #{configSid}
@@ -636,6 +639,8 @@
                      AND lockedState = '03') > 0
         </where>
 
+
+
         ORDER BY
         nowCarNum DESC
     </select>

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

@@ -415,8 +415,11 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
         ResultBean<AppModelConfigVo> rb = ResultBean.fireFail();
         String modelSid = pagerQuery.getParams().getModelSid();
         String userSid = pagerQuery.getParams().getUserSid();
-        if (StringUtils.isNull(modelSid) || StringUtils.isNull(userSid)) {
-            return rb.fail().setMsg("用户sid或用户sid为空");
+        if (StringUtils.isBlank(modelSid)) {
+            return rb.setMsg("参数错误：车型sid不允许为空");
+        }
+        if (StringUtils.isBlank(userSid)) {
+            return rb.setMsg("参数错误，用户sid不允许为空");
         }
         AppModelConfigVo vo = baseModelConfigService.getModelConfigList(pagerQuery);
         return rb.success().setData(vo);

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

@@ -6,9 +6,11 @@ import com.yxt.anrui.base.api.basemodelconfig.*;
 import com.yxt.anrui.base.api.basevehicle.AppMoreConfigVo;
 import com.yxt.anrui.base.api.basevehicle.ConfigInfo;
 import com.yxt.anrui.base.biz.basevehicleappendix.BaseVehicleAppendixService;
+import com.yxt.anrui.base.biz.basevehiclemodelappendix.BaseVehicleModelAppendixService;
 import com.yxt.anrui.base.common.enums.VehicleState;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -44,6 +46,10 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
 
     @Autowired
     private FileUploadComponent fileUploadComponent;
+    @Autowired
+    private SysStaffOrgFeign sysStaffOrgFeign;
+    @Autowired
+    private BaseVehicleModelAppendixService baseVehicleModelAppendixService;
 
     /**
      * 车型配置信息分页列表
@@ -487,21 +493,24 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
     }
 
     public AppModelConfigVo getModelConfigList(PagerQuery<AppModelConfigListQuery> pagerQuery) {
-
         String userSid = pagerQuery.getParams().getUserSid();
-        // 1、根据业务员部门sid查询分公司 查询orgSidPath（部门路径）
-        SysOrganizationVo data = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData();
-        if (data != null) {
-            // 2) 根据orgSidPath（部门路径）判断分公司sid
-            pagerQuery.getParams().setUseOrg(data.getSid());
+        // 1、根据业务员部门sid查询分公司sid
+        String orgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        if (StringUtils.isNotBlank(orgSid)) {
+            pagerQuery.getParams().setUseOrg(orgSid);
         }
         String modelSid = pagerQuery.getParams().getModelSid();
-        String useOrgSid = data.getSid();
-        AppModelConfigVo vo = baseMapper.getModelConfigList(modelSid, useOrgSid);
-        String type = "0002";
-        String path = fileUploadComponent.getUrlPrefix();
-        List<String> modelImages = baseVehicleAppendixService.selectBySid(type, modelSid, path);
-        vo.setModelImage(modelImages);
+        AppModelConfigVo vo = baseMapper.getModelConfigList(modelSid, orgSid);
+        List<String> modelImages = baseVehicleModelAppendixService.selectImageList(modelSid);
+        List<String> modelImagesList = new ArrayList<>();
+        if (!modelImages.isEmpty()) {
+            for (int i = 0; i < modelImages.size(); i++) {
+                if (!modelImages.get(i).contains(fileUploadComponent.getUrlPrefix())) {
+                    modelImagesList.add(fileUploadComponent.getUrlPrefix() + modelImages.get(i));
+                }
+            }
+        }
+        vo.setModelImage(modelImagesList);
 
         //基础配置拼接
         List<ConfigInfo> list = new ArrayList<>();
@@ -532,10 +541,11 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
             if (StringUtils.isBlank(appModelConfigListVo.getProduceCarNum())) {
                 appModelConfigListVo.setProduceCarNum("0");
             }
-            String useOrg = data.getSid();
-            List<AppMoreConfigVo> moreConfigVos = baseMapper.getCompanyModelList(appModelConfigListVo.getModelSid(), appModelConfigListVo.getConfigSid(), useOrg);
+            List<AppMoreConfigVo> moreConfigVos = baseMapper.getCompanyModelList(appModelConfigListVo.getModelSid(), appModelConfigListVo.getConfigSid(), orgSid, VehicleState.LockEnum.UN_LOCK.getCode());
             for (AppMoreConfigVo moreConfigVo : moreConfigVos) {
-                moreConfigVo.setCompanyName(data.getName());
+                String sid = moreConfigVo.getUseOrgSid();
+                SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(sid).getData();
+                moreConfigVo.setCompanyName(sysOrganization.getName());
             }
             appModelConfigListVo.setMoreList(moreConfigVos);
         }
@@ -591,7 +601,7 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
                 appModelConfigListVo.setProduceCarNum("0");
             }
             String useOrg = data.getSid();
-            List<AppMoreConfigVo> moreConfigVos = baseMapper.getCompanyModelList(appModelConfigListVo.getModelSid(), appModelConfigListVo.getConfigSid(), useOrg);
+            List<AppMoreConfigVo> moreConfigVos = baseMapper.getCompanyModelList(appModelConfigListVo.getModelSid(), appModelConfigListVo.getConfigSid(), useOrg, VehicleState.LockEnum.UN_LOCK.getCode());
             for (AppMoreConfigVo moreConfigVo : moreConfigVos) {
                 moreConfigVo.setCompanyName(data.getName());
             }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -13,6 +13,7 @@ import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService;
 import com.yxt.anrui.base.biz.basevehicleappendix.BaseVehicleAppendixService;
 import com.yxt.anrui.base.biz.basevehiclecertificate.BaseVehicleCertificateService;
 import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService;
+import com.yxt.anrui.base.biz.basevehiclemodelappendix.BaseVehicleModelAppendixService;
 import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService;
 import com.yxt.anrui.base.common.enums.VehicleState;
 import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositFeign;
@@ -70,6 +71,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
     private PcBusMainDepositFeign pcBusMainDepositFeign;
     @Autowired
     private BaseVehicleCertificateService baseVehicleCertificateService;
+    @Autowired
+    private BaseVehicleModelAppendixService baseVehicleModelAppendixService;
 
     /**
      * 车辆信息分页列表
@@ -723,31 +726,26 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
      */
     public IPage<AppVehicleModelPriceVo> getModelList(PagerQuery<AppVehicleModelPriceQuery> pagerQuery) {
         String userSid = pagerQuery.getParams().getUserSid();
-        // 1、根据业务员部门sid查询分公司 查询orgSidPath（部门路径）
-        SysOrganizationVo data = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData();
-        if (data != null) {
-            // 2) 根据orgSidPath（部门路径）判断分公司sid
-            pagerQuery.getParams().setUseOrg(data.getSid());
+        // 1、根据业务员部门sid查询分公司sid
+        String data = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        if (StringUtils.isNotBlank(data)) {
+            pagerQuery.getParams().setUseOrg(data);
         }
         IPage<AppVehicleModelPriceQuery> page = PagerUtil.queryToPage(pagerQuery);
         QueryWrapper<AppVehicleModelPriceVo> qw = appExistingCarBuildQW(pagerQuery.getParams());
-        IPage<AppVehicleModelPriceVo> iPage = baseMapper.getModelList(page, qw, data.getSid(), VehicleState.LockEnum.UN_LOCK.getCode());
+        IPage<AppVehicleModelPriceVo> iPage = baseMapper.getModelList(page, qw, data, VehicleState.LockEnum.UN_LOCK.getCode());
         // 3、 查询更多配置（其它分公司）
         for (AppVehicleModelPriceVo record : iPage.getRecords()) {
-            String sid = record.getModelSid();
-            String type = "0002";
-            String path = fileUploadComponent.getUrlPrefix();
-            List<String> list = baseVehicleAppendixService.selectBySid(type, sid, path);
-            if (list.size() > 0) {
-                String s = list.get(0);
-                record.setModelImage(s);
-            } else {
-                record.setModelImage("");
+            String modelSid = record.getModelSid();
+            ResultBean image = baseVehicleModelAppendixService.selectImage(modelSid);
+            if (image.getSuccess()) {
+                record.setModelImage(image.getData().toString());
             }
-            String useOrg = data.getSid();
-            List<AppMoreConfigVo> moreConfigVos = baseMapper.getCompanyModelList(record.getModelSid(), useOrg);
+            String sid = data;
+            List<AppMoreConfigVo> moreConfigVos = baseMapper.getCompanyModelList(record.getModelSid(), sid);
             for (AppMoreConfigVo moreConfigVo : moreConfigVos) {
-                moreConfigVo.setCompanyName(data.getName());
+                SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(sid).getData();
+                moreConfigVo.setCompanyName(sysOrganization.getName());
             }
             record.setMoreList(moreConfigVos);
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodelappendix/BaseVehicleModelAppendixMapper.java

@@ -44,5 +44,5 @@ public interface BaseVehicleModelAppendixMapper extends BaseMapper<BaseVehicleMo
 	@Select("select * from base_vehicle_model_appendix where modelSid = #{sid}")
 	List<BaseVehicleModelAppendixVo> fetchByVehModelSid(String sid);
 
-    String selectImage(String modelSid);
+    List<String> selectImage(String modelSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodelappendix/BaseVehicleModelAppendixMapper.xml

@@ -24,6 +24,5 @@
         select filePath
         FROM base_vehicle_model_appendix
         where modelSid = #{modelSid}
-        limit 1
     </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodelappendix/BaseVehicleModelAppendixService.java

@@ -109,8 +109,9 @@ public class BaseVehicleModelAppendixService extends MybatisBaseService<BaseVehi
 
     public ResultBean selectImage(String modelSid) {
         ResultBean rb = ResultBean.fireFail();
-        String image = baseMapper.selectImage(modelSid);
-        if (StringUtils.isNotBlank(image)) {
+        List<String> imageList = baseMapper.selectImage(modelSid);
+        if (!imageList.isEmpty()) {
+            String image = imageList.get(0);
             if (!image.contains(fileUploadComponent.getUrlPrefix())) {
                 image = fileUploadComponent.getUrlPrefix() + image;
             }
@@ -118,4 +119,8 @@ public class BaseVehicleModelAppendixService extends MybatisBaseService<BaseVehi
         }
         return rb;
     }
+
+    public List<String> selectImageList(String modelSid) {
+        return baseMapper.selectImage(modelSid);
+    }
 }

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

@@ -108,7 +108,7 @@ public interface BaseVehmodelConfigMapper extends BaseMapper<BaseVehmodelConfig>
      */
     ExiCarConfigDetailVo getModelAndConfigDetails(@Param("modelSid") String modelSid, @Param("configSid") String configSid);
 
-    BaseVehmodelConfigVo checkSave(@Param("modelSid") String modelSid, @Param("configurationItemsSid") String configurationItemsSid);
+    BaseVehmodelConfigVo checkSave(@Param("modelSid") String modelSid, @Param("configurationItemsSid") String configurationItemsSid, @Param("useOrgSid") String useOrgSid);
 
     AppModelVeDetailVo getAppIntentionVehicleVo(@Param("useOrg") String useOrg, @Param("modelSid") String modelSid, @Param("configSid") String configSid);
 
@@ -123,11 +123,11 @@ public interface BaseVehmodelConfigMapper extends BaseMapper<BaseVehmodelConfig>
 
     List<BaseVehmodelConfigVo> getListByConfigSid(String sid);
 
-    List<BaseVehmodelConfigVo> getVehModByModelSid(@Param("sid") String sid,@Param("useOrgSid") String useOrgSid);
+    List<BaseVehmodelConfigVo> getVehModByModelSid(@Param("sid") String sid, @Param("useOrgSid") String useOrgSid);
 
     int checkByConfigSid(String sid);
 
     int checkByModelSid(String sid);
 
-    List<BaseVehmodelConfigVo> getListByConfigSidAndUseOrgSid(@Param("configSid") String configSid,@Param("createOrgSId") String createOrgSId);
+    List<BaseVehmodelConfigVo> getListByConfigSidAndUseOrgSid(@Param("configSid") String configSid, @Param("createOrgSId") String createOrgSId);
 }

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

@@ -181,6 +181,7 @@
         FROM base_vehmodel_config
         WHERE modelSid = #{modelSid}
           and configurationItemsSid = #{configurationItemsSid}
+          and useOrgSid = #{useOrgSid}
     </select>
 
     <select id="getAppIntentionVehicleVo"
@@ -263,23 +264,19 @@
         SELECT *
         FROM base_vehmodel_config
         WHERE modelSid = #{sid}
-        AND useOrgSid = #{useOrgSid}
+          AND useOrgSid = #{useOrgSid}
     </select>
 
     <select id="checkByConfigSid" resultType="int">
-        SELECT
-                COUNT(*)
-        FROM
-                base_vehmodel_config
+        SELECT COUNT(*)
+        FROM base_vehmodel_config
         WHERE configurationItemsSid = #{sid}
           AND isDelete = 0
     </select>
 
     <select id="checkByModelSid" resultType="int">
-        SELECT
-                COUNT(*)
-        FROM
-                base_vehmodel_config
+        SELECT COUNT(*)
+        FROM base_vehmodel_config
         WHERE modelSid = #{sid}
           AND isDelete = 0
     </select>
@@ -289,6 +286,6 @@
         SELECT *
         FROM base_vehmodel_config
         WHERE configurationItemsSid = #{configSid}
-        AND useOrgSid = #{createOrgSId}
+          AND useOrgSid = #{createOrgSId}
     </select>
 </mapper>

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

@@ -409,7 +409,11 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
         for (BaseVehmodelConfigDto baseVehmodelConfigDto : dto) {
             String modelSid = baseVehmodelConfigDto.getModelSid();
             String configurationItemsSid = baseVehmodelConfigDto.getConfigurationItemsSid();
-            BaseVehmodelConfigVo vo = baseMapper.checkSave(modelSid, configurationItemsSid);
+            ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(baseVehmodelConfigDto.getUserSid());
+            if ("0".equals(resultBean.getData())) {
+                return rb.setMsg("该用户无分公司，不允许操作");
+            }
+            BaseVehmodelConfigVo vo = baseMapper.checkSave(modelSid, configurationItemsSid, resultBean.getData());
             if (vo != null) {
                 return rb.setMsg("当前常用配置信息已关联当前车型，请重新选择");
             }
@@ -432,7 +436,12 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
         for (Map<String, String> map : maps) {
             String modelSid = map.get("modelSid");
             String configurationItemsSid = map.get("configurationItemsSid");
-            BaseVehmodelConfigVo vo = baseMapper.checkSave(modelSid, configurationItemsSid);
+            String userSid = map.get("userSid");
+            ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid);
+            if ("0".equals(resultBean.getData())) {
+                return rb.setMsg("该用户无分公司，不允许操作");
+            }
+            BaseVehmodelConfigVo vo = baseMapper.checkSave(modelSid, configurationItemsSid, resultBean.getData());
             if (vo == null) {
                 return rb.setMsg("当前常用配置信息未关联当前车型，请重新选择");
             }