移动端车型报价车型接口部分调整

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

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.boot.autoconfigure.validation.ValidationAutoConfiguration;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Data
@@ -73,7 +74,7 @@ public class AppModelConfigListVo implements Vo {
     private String produceCarNum;
 
     @ApiModelProperty(value = "更多配置")
-    private List<AppMoreConfigVo> moreList;
+    private List<AppMoreConfigVo> moreList = new ArrayList<>();
 
     @ApiModelProperty(value = "辆(已废弃)")
     private String vehicleQuantity;

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

@@ -1,7 +1,5 @@
 package com.yxt.anrui.base.api.basemodelconfig;
 
-import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelListQuery;
-import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelListVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -76,7 +74,7 @@ public interface BaseModelConfigFeign {
     @ApiOperation("删除、批量删除")
     @DeleteMapping("/deleteBySids")
     @ApiImplicitParam(name = "sids", value = "车型配置sid，若为多个sid，以逗号分隔")
-    public ResultBean deleteBySids(@RequestParam("sids") String sids,@RequestParam("userSid") String userSid);
+    public ResultBean deleteBySids(@RequestParam("sids") String sids, @RequestParam("userSid") String userSid);
 
     /**
      * 详情和修改回显
@@ -111,7 +109,7 @@ public interface BaseModelConfigFeign {
 
     @ApiOperation("PC端根据车型sid查询常用配置信息下拉选")
     @GetMapping("/getListByVeSid")
-    public ResultBean<List<Map<String,String>>> getListByVeSid(@RequestParam("modelSid") String modelSid);
+    public ResultBean<List<Map<String, String>>> getListByVeSid(@RequestParam("modelSid") String modelSid, @RequestParam(value = "userSid") String userSid);
 
     @ApiOperation("PC端根据简述配置sid查询简述配置信息")
     @GetMapping("/getByVeSid")

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

@@ -76,7 +76,7 @@ public class BaseModelConfigFeignFallback implements BaseModelConfigFeign {
     }
 
     @Override
-    public ResultBean<List<Map<String,String>>> getListByVeSid(String vehicleSid) {
+    public ResultBean<List<Map<String,String>>> getListByVeSid(String vehicleSid,String userSid) {
         return null;
     }
 

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

@@ -185,9 +185,9 @@ public interface BaseModelConfigMapper extends BaseMapper<BaseModelConfig> {
     //查询车型信息
     AppModelConfigVo getModelConfigList(@Param("modelSid") String modelSid, @Param("useOrgSid") String useOrgSid);
 
-    List<AppModelConfigListVo> getModelConfigPageList(IPage<AppModelConfigListQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppModelConfigListVo> qw, @Param("lockedStateKey") String lockedStateKey);
+    List<AppModelConfigListVo> getModelConfigPageList(IPage<AppModelConfigListQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppModelConfigListVo> qw, @Param("lockedStateKey") String lockedStateKey,@Param("orgSid")String orgSid);
 
-    List<AppModelConfigListVo> getNowConfigList(IPage<AppModelConfigListQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppModelConfigListVo> qw);
+    List<AppModelConfigListVo> getNowConfigList(IPage<AppModelConfigListQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppModelConfigListVo> qw,@Param("orgSid")String orgSid,@Param("state")String state);
 
     List<AppMoreConfigVo> getCompanyModelList(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("useOrg") String useOrg,@Param("state")String state);
 

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

@@ -498,7 +498,7 @@
 
     <select id="getModelConfigPageList"
             resultType="com.yxt.anrui.base.api.basemodelconfig.AppModelConfigListVo">
-        SELECT bmc.sid                                 as configSid,
+        SELECT bmc.sid                       as configSid,
                bmc.carColor,
                bmc.slowMachine,
                bmc.rearViewMirror,
@@ -518,28 +518,32 @@
                bmc.independentSources,
                bmc.fuelTank,
                bmc.multimedia,
-               bvc.guidedPrice                         as price,
+               bvc.guidedPrice               as price,
                bvc.priceValidity,
-               bvm.sid                                 as modelSid,
-               bvm.vehicleAlias                        as modelName,
-               bvm.brandName                           as brand,
-               bvm.carBrand                            as brandSid,
+               bvm.sid                       as modelSid,
+               bvm.vehicleAlias              as modelName,
+               bvm.brandName                 as brand,
+               bvm.carBrand                  as brandSid,
                (SELECT count(*)
                 FROM base_vehicle bv
                 WHERE bv.modelSid = bvc.modelSid
-                  AND bv.modelConfigSid = bmc.sid
-                  AND lockedState = #{lockedStateKey}) AS nowCarNum,
+                  AND bv.modelConfigSid = bvc.configurationItemsSid
+                  AND bv.lockedState = #{lockedStateKey}
+                  and bv.useOrg = #{orgSid}) AS nowCarNum,
                (SELECT SUM(cast(bvad.quantity as signed)) as quantity
                 FROM bus_vehicle_apply_detail bvad
                 WHERE bvad.vehicleSid
                     = bvc.modelSid
                   and bvad.configSid =
-                      bmc.sid)                         AS produceCarNum
+                      bmc.sid)               AS produceCarNum
         FROM base_vehmodel_config bvc
                  LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
                  LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
         <where>
             ${ew.sqlSegment}
+            <if test="orgSid != null and orgSid != ''">
+                and bvc.useOrgSid = #{orgSid}
+            </if>
         </where>
         ORDER BY nowCarNum DESC
     </select>
@@ -547,10 +551,14 @@
         SELECT bvc.useOrgSid,
                (SELECT count(*)
                 FROM base_vehicle bv
-                WHERE bv.modelSid = bvc.sid AND lockedState = #{state}) AS nowCarNum,
+                WHERE bv.modelSid = #{modelSid}
+                  and bv.modelConfigSid = #{configSid}
+                  AND bv.lockedState = #{state}
+                  and bv.useOrg = bvc.useOrgSid)     AS nowCarNum,
                (SELECT count(*)
                 FROM bus_vehicle_apply_detail bvad
-                WHERE bvad.vehicleSid = bvc.modelSid)                   AS produceCarNum
+                WHERE bvad.vehicleSid = #{modelSid}
+                  and bvad.configSid = #{configSid}) AS produceCarNum
         FROM base_vehmodel_config bvc
         WHERE bvc.modelSid = #{modelSid}
           AND bvc.configurationItemsSid = #{configSid}
@@ -590,7 +598,7 @@
           AND bmc.sid = #{configSid}
     </select>
     <select id="getNowConfigList" resultType="com.yxt.anrui.base.api.basemodelconfig.AppModelConfigListVo">
-        SELECT bmc.sid                    as configSid,
+        SELECT bmc.sid                           as configSid,
                bmc.carColor,
                bmc.slowMachine,
                bmc.rearViewMirror,
@@ -610,39 +618,43 @@
                bmc.independentSources,
                bmc.fuelTank,
                bmc.multimedia,
-               bvc.guidedPrice            as price,
+               bvc.guidedPrice                   as price,
                bvc.priceValidity,
-               bvm.sid                    as modelSid,
-               bvm.vehicleAlias           as modelName,
-               bvm.brandName              as brand,
-               bvm.carBrand               as brandSid,
+               bvm.sid                           as modelSid,
+               bvm.vehicleAlias                  as modelName,
+               bvm.brandName                     as brand,
+               bvm.carBrand                      as brandSid,
                (SELECT count(*)
                 FROM base_vehicle bv
                 WHERE bv.modelSid = bvc.modelSid
-                  AND bv.modelConfigSid = bmc.sid
-                  AND lockedState = '03') AS nowCarNum,
+                  AND bv.modelConfigSid = bvc.configurationItemsSid
+                  AND bv.lockedState = #{state}
+                  and bv.useOrg = #{orgSid})     AS nowCarNum,
                (SELECT SUM(cast(bvad.quantity as signed)) as quantity
                 FROM bus_vehicle_apply_detail bvad
                 WHERE bvad.vehicleSid
                     = bvc.modelSid
                   and bvad.configSid =
-                      bmc.sid)            AS produceCarNum
+                      bvc.configurationItemsSid) AS produceCarNum
         FROM base_vehmodel_config bvc
                  LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
                  LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
         <where>
             ${ew.sqlSegment}
-              and (SELECT count(*)
-                   FROM base_vehicle bv
-                   WHERE bv.modelSid = bvc.modelSid
-                     AND bv.modelConfigSid = bmc.sid
-                     AND lockedState = '03') > 0
+            <if test="orgSid != null and orgSid != ''">
+                and bvc.useOrgSid = #{orgSid}
+            </if>
+            and (SELECT count (*)
+                FROM base_vehicle bv
+                WHERE bv.modelSid = bvc.modelSid
+            AND bv.modelConfigSid = bmc.sid
+            AND lockedState = #{state})
+              > 0
         </where>
 
 
-
         ORDER BY
-        nowCarNum DESC
+            nowCarNum DESC
     </select>
 
     <select id="checkByConfigName" resultType="int">

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

@@ -349,9 +349,9 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
     }
 
     @Override
-    public ResultBean<List<Map<String, String>>> getListByVeSid(String vehicleSid) {
+    public ResultBean<List<Map<String, String>>> getListByVeSid(String vehicleSid,String userSid) {
         ResultBean<List<Map<String, String>>> rb = ResultBean.fireFail();
-        List<Map<String, String>> listByVeSid = baseVehicleModelService.getListByVeSid(vehicleSid);
+        List<Map<String, String>> listByVeSid = baseVehicleModelService.getListByVeSid(vehicleSid,userSid);
         return rb.success().setData(listByVeSid);
     }
 

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

@@ -533,7 +533,7 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
         //配置列表
         IPage<AppModelConfigListQuery> page = PagerUtil.queryToPage(pagerQuery);
         QueryWrapper<AppModelConfigListVo> qw = modelConfigQueryWrapper(pagerQuery.getParams());
-        List<AppModelConfigListVo> appModelConfigListVos = baseMapper.getModelConfigPageList(page, qw, VehicleState.LockEnum.UN_LOCK.getCode());
+        List<AppModelConfigListVo> appModelConfigListVos = baseMapper.getModelConfigPageList(page, qw, VehicleState.LockEnum.UN_LOCK.getCode(), orgSid);
         long pages = page.getPages();
         vo.setPages((int) pages);
         //分公司配置列表查询
@@ -592,11 +592,11 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
         //配置列表
         IPage<AppModelConfigListQuery> page = PagerUtil.queryToPage(pagerQuery);
         QueryWrapper<AppModelConfigListVo> qw = modelConfigQueryWrapper(pagerQuery.getParams());
-        List<AppModelConfigListVo> appModelConfigListVos = baseMapper.getNowConfigList(page, qw);
+        List<AppModelConfigListVo> appModelConfigListVos = baseMapper.getNowConfigList(page, qw, useOrgSid,VehicleState.LockEnum.UN_LOCK.getCode());
         long pages = page.getPages();
         vo.setPages((int) pages);
         //分公司配置列表查询
-        for (AppModelConfigListVo appModelConfigListVo : appModelConfigListVos) {
+        /*for (AppModelConfigListVo appModelConfigListVo : appModelConfigListVos) {
             if (StringUtils.isBlank(appModelConfigListVo.getProduceCarNum())) {
                 appModelConfigListVo.setProduceCarNum("0");
             }
@@ -606,7 +606,7 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
                 moreConfigVo.setCompanyName(data.getName());
             }
             appModelConfigListVo.setMoreList(moreConfigVos);
-        }
+        }*/
         addDonfigName(appModelConfigListVos);
         vo.setModelConfigList(appModelConfigListVos);
         return vo;
@@ -767,9 +767,6 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
             if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getSuspension())) {//悬架
                 qw.eq("bmc.suspension", pagerQuery.getSuspension());
             }
-            if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getUseOrg())) {//分公司
-                qw.eq("bvc.useOrgSid", pagerQuery.getUseOrg());
-            }
         }
         return qw;
     }

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

@@ -240,7 +240,7 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
      * @param sid
      * @return
      */
-    List<AppMoreConfigVo> getCompanyModelList(@Param("modelSid") String modelSid, @Param("useOrg") String useOrg);
+    List<AppMoreConfigVo> getCompanyModelList(@Param("modelSid") String modelSid, @Param("useOrg") String useOrg,@Param("state")String state);
 
     /**
      * 手机端现车详细配置(新)

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

@@ -506,10 +506,15 @@
     </select>
 
     <select id="getCompanyModelList" resultType="com.yxt.anrui.base.api.basevehicle.AppMoreConfigVo">
-        SELECT (SELECT count(*) FROM base_vehicle bv WHERE bv.modelSid = bvm.sid AND lockedState = '0004') AS nowCarNum,
+        SELECT bvc.useOrgSid,
+               (SELECT count(*)
+                FROM base_vehicle bv
+                WHERE bv.modelSid = #{modelSid}
+                  AND bv.lockedState = #{state}
+                  and bv.useOrg = bvc.useOrgSid)        AS nowCarNum,
                (SELECT count(*)
                 FROM bus_vehicle_apply_detail bvad
-                WHERE bvad.vehicleSid = bvm.sid)                                                           AS produceCarNum
+                WHERE bvad.vehicleSid = #{modelSid}) AS produceCarNum
         FROM base_vehicle_model bvm
                  LEFT JOIN base_vehmodel_config bvc ON bvm.sid = bvc.modelSid
         WHERE bvc.modelSid = #{modelSid}

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

@@ -741,9 +741,9 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             if (image.getSuccess()) {
                 record.setModelImage(image.getData().toString());
             }
-            String sid = data;
-            List<AppMoreConfigVo> moreConfigVos = baseMapper.getCompanyModelList(record.getModelSid(), sid);
+            List<AppMoreConfigVo> moreConfigVos = baseMapper.getCompanyModelList(record.getModelSid(), data,VehicleState.LockEnum.UN_LOCK.getCode());
             for (AppMoreConfigVo moreConfigVo : moreConfigVos) {
+                String sid = moreConfigVo.getUseOrgSid();
                 SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(sid).getData();
                 moreConfigVo.setCompanyName(sysOrganization.getName());
             }

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

@@ -99,7 +99,7 @@ public interface BaseVehicleModelMapper extends BaseMapper<BaseVehicleModel> {
 
     List<BaseModelConfigVo> getList();
 
-    List<Map<String,String>> getListByVeSid(String vehicleSid);
+    List<Map<String, String>> getListByVeSid(@Param("modelSid") String vehicleSid, @Param("orgSid") String orgSid);
 
     BaseVehicleModelSelectVo getAll(String sid);
 
@@ -146,15 +146,15 @@ public interface BaseVehicleModelMapper extends BaseMapper<BaseVehicleModel> {
     IPage<BaseVehicleModelListVo> notTheCompanyModelPageList(IPage<BaseVehicleModelListQuery> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehicleModelListVo> qw);
 
 
-    IPage<VehModelVo> listPageByVehmodel(IPage<VehModelVo> page,@Param(Constants.WRAPPER) QueryWrapper<VehModelVo> qw);
+    IPage<VehModelVo> listPageByVehmodel(IPage<VehModelVo> page, @Param(Constants.WRAPPER) QueryWrapper<VehModelVo> qw);
 
     int checkSaveByModelName(String modelName);
 
     int checkSaveByVehicleTypeCode(String vehicleTypeCode);
 
-    int checkUpdateByModelName(@Param("modelName") String modelName,@Param("sid") String sid);
+    int checkUpdateByModelName(@Param("modelName") String modelName, @Param("sid") String sid);
 
-    int checkUpdateByVehicleTypeCode(@Param("vehicleTypeCode") String vehicleTypeCode,@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

@@ -4,23 +4,23 @@
     <!--分页列表-->
     <select id="pagerList" resultType="com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelVo">
         SELECT bvm.sid,
-        bvm.brandName,
-        bvm.vehicleTypeValue,
-        bvm.productLineValue,
-        bvm.driveFormValue,
-        bvm.powerValue,
-        bvm.gearboxTypeValue,
-        bvm.fuelTypeValue,
-        bvm.vehicleVersionValue,
-        bvm.modelName,
-        bvm.engineTypeValue,
-        bvm.`vehicleVersionValue` vehicleVersion,
-        bvm.`vehicleTypeCode`,
-        bvm.`emissionStandardValue`,
-        bvm.vehicleAlias
+               bvm.brandName,
+               bvm.vehicleTypeValue,
+               bvm.productLineValue,
+               bvm.driveFormValue,
+               bvm.powerValue,
+               bvm.gearboxTypeValue,
+               bvm.fuelTypeValue,
+               bvm.vehicleVersionValue,
+               bvm.modelName,
+               bvm.engineTypeValue,
+               bvm.`vehicleVersionValue` vehicleVersion,
+               bvm.`vehicleTypeCode`,
+               bvm.`emissionStandardValue`,
+               bvm.vehicleAlias
         FROM base_vehicle_model bvm
-        LEFT JOIN base_vehicle_brand bvb
-        ON bvm.carBrand = bvb.sid
+                 LEFT JOIN base_vehicle_brand bvb
+                           ON bvm.carBrand = bvb.sid
         <where>
             ${ew.sqlSegment}
         </where>
@@ -28,7 +28,7 @@
     <!--详情-->
     <select id="details" resultType="com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelDetailsVo">
         SELECT
-        -- <!--厂商名称-->
+            -- <!--厂商名称-->
         bm.manufacturerName,
         -- <!--厂商sid-->
         bvm.manufacturer,
@@ -88,8 +88,8 @@
         -- <!--是否可以删除（1是0否）-->
         bvm.isDel
         FROM base_vehicle_model bvm
-        LEFT JOIN base_manufacturer bm ON bm.sid = bvm.manufacturer
-        LEFT JOIN base_vehicle_brand bvb ON bvb.sid = bvm.carBrand
+                 LEFT JOIN base_manufacturer bm ON bm.sid = bvm.manufacturer
+                 LEFT JOIN base_vehicle_brand bvb ON bvb.sid = bvm.carBrand
         where bvm.sid = #{sid}
     </select>
     <!--删除、批量删除-->
@@ -124,8 +124,8 @@
         <!--发动机号-->
         bvm.engineType
         FROM base_vehicle_model bvm
-        left join base_vehicle_brand bvb on bvb.sid = bvm.carBrand
-        ${ew.customSqlSegment}
+                 left join base_vehicle_brand bvb on bvb.sid = bvm.carBrand
+            ${ew.customSqlSegment}
     </select>
     <!--查询车型信息下拉框-->
     <!--    <select id="selectDown" resultType="java.util.List">-->
@@ -145,20 +145,20 @@
         <!--车型sid-->
         bvm.sid
         FROM base_vehicle_model bvm
-        ${ew.customSqlSegment}
+            ${ew.customSqlSegment}
     </select>
     <select id="selectAppPageByOrgSid" resultType="com.yxt.anrui.base.api.basevehiclemodel.AppBaseVehicleModelVo">
         SELECT bvm.sid, bvb.brandName, bm.manufacturerName, bvm.modelName
         FROM base_vehicle_model bvm
-                     LEFT JOIN base_vehicle_brand bvb ON bvb.sid = bvm.carBrand
-                     LEFT JOIN base_manufacturer bm ON bvm.manufacturer = bm.sid
-                ${ew.customSqlSegment}
+                 LEFT JOIN base_vehicle_brand bvb ON bvb.sid = bvm.carBrand
+                 LEFT JOIN base_manufacturer bm ON bvm.manufacturer = bm.sid
+            ${ew.customSqlSegment}
     </select>
     <!--根据车型型号模糊查询下拉款-->
     <select id="selectDownPlus" resultType="java.util.Map">
         select bvm.sid
         from base_vehicle_model bvm
-                ${ew.customSqlSegment}
+            ${ew.customSqlSegment}
     </select>
 
     <select id="getPcChooseListByModelSid"
@@ -171,9 +171,10 @@
                bmc.`specification`,
                bmc.`fuelTank`
         FROM anrui_base.base_vehicle_model bvm
-                     LEFT JOIN anrui_base.base_vehmodel_config bvc ON bvc.modelSid = bvm.sid
-                     LEFT JOIN anrui_base.base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
-        WHERE bvm.sid = #{vehicleSid} LIMIT 1
+                 LEFT JOIN anrui_base.base_vehmodel_config bvc ON bvc.modelSid = bvm.sid
+                 LEFT JOIN anrui_base.base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
+        WHERE bvm.sid = #{vehicleSid}
+        LIMIT 1
     </select>
     <select id="getListByModelSid"
             resultType="com.yxt.anrui.base.api.basemodelconfig.BaseModelConfigVo">
@@ -196,7 +197,7 @@
                bvm.modelName,
                bvm.engineTypeValue
         FROM base_model_config bmc
-                     LEFT JOIN base_vehicle_model bvm ON bmc.vehicleSid = bvm.sid
+                 LEFT JOIN base_vehicle_model bvm ON bmc.vehicleSid = bvm.sid
         WHERE vehicleSid = #{vehicleSid}
     </select>
 
@@ -217,8 +218,8 @@
                bmc.configName AS sketChconfiguration,
                bv.guidedPrice AS vehicleModelOffer
         FROM base_vehicle_model bvm
-                     LEFT JOIN base_vehicle bv ON bv.modelSid = bvm.sid
-                     LEFT JOIN base_model_config bmc ON bvm.sid = bmc.vehicleSid
+                 LEFT JOIN base_vehicle bv ON bv.modelSid = bvm.sid
+                 LEFT JOIN base_model_config bmc ON bvm.sid = bmc.vehicleSid
         WHERE bvm.sid = #{modelSid}
           AND bmc.sid = #{configModelSid}
     </select>
@@ -288,15 +289,15 @@
         <!--是否可以删除（1是0否）-->
         bvm.isDel
         FROM base_vehicle_model bvm
-        LEFT JOIN base_manufacturer bm ON bm.sid = bvm.manufacturer
-        LEFT JOIN base_vehicle_brand bvb ON bvb.sid = bvm.carBrand
+                 LEFT JOIN base_manufacturer bm ON bm.sid = bvm.manufacturer
+                 LEFT JOIN base_vehicle_brand bvb ON bvb.sid = bvm.carBrand
         where bvm.sid = #{sid}
     </select>
 
     <select id="selectDownPlusByModelName" resultType="java.util.Map">
         SELECT bvm.modelName, bvm.sid
         FROM base_vehicle_model bvm
-                ${ew.customSqlSegment}
+            ${ew.customSqlSegment}
     </select>
 
     <select id="selectPageList" resultType="com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelListVo">
@@ -309,9 +310,9 @@
                CONCAT(MIN(salesReferencePrice), '-', MAX(salesReferencePrice)) as salesReferencePrice,
                bv.configurationItemsSid                                        as configSid
         from base_vehicle_model bm
-                     left join base_vehmodel_config bv on bv.modelSid = bm.sid
-                     left join base_model_config bc on bc.sid = bv.configurationItemsSid
-                ${ew.customSqlSegment}
+                 left join base_vehmodel_config bv on bv.modelSid = bm.sid
+                 left join base_model_config bc on bc.sid = bv.configurationItemsSid
+            ${ew.customSqlSegment}
     </select>
 
     <select id="downList" resultType="com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelDownListVo">
@@ -322,125 +323,118 @@
                bvm.`manufacturer`,
                bvm.`carBrand`
         FROM base_vehicle_model bvm
-                     LEFT JOIN base_manufacturer bm
-                ON bvm.`manufacturer` = bm.`sid`
+                 LEFT JOIN base_manufacturer bm
+                           ON bvm.`manufacturer` = bm.`sid`
     </select>
 
     <select id="modelPageList" resultType="com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelListVo">
-        SELECT DISTINCT
-        bm.sid,
-        bm.brandName,
-        bm.carBrand as brandSid,
-        bm.vehicleAlias,
-        bm.vehicleVersionValue,
-        bm.fuelTypeValue,
-        bm.gearboxTypeValue,
-        bvc.manufactorSettlementPrice,
-        bm.modelName,
-        (SELECT
-        CONCAT(
-        MIN(bvc.guidedPrice),
-        '-',
-        MAX(bvc.guidedPrice)
-        )
-        FROM
-        base_vehmodel_config bvc
-        WHERE bvc.modelSid = bm.sid) AS guidedPrice,
-        (SELECT
-        COUNT(*)
-        FROM
-        base_vehicle bv
-        WHERE bv.modelSid = bm.sid
-        AND bv.useOrg = bvc.useOrgSid) AS nowCarNum,
-        (SELECT
-        COUNT(*)
-        FROM
-        bus_vehicle_apply_detail bvad
-        WHERE bvad.vehicleSid = bm.sid) AS productionCarNum
-        FROM
-        base_vehicle_model bm
-        LEFT JOIN base_vehmodel_config bvc
-        ON bvc.modelSid = bm.sid
+        SELECT DISTINCT bm.sid,
+                        bm.brandName,
+                        bm.carBrand                       as brandSid,
+                        bm.vehicleAlias,
+                        bm.vehicleVersionValue,
+                        bm.fuelTypeValue,
+                        bm.gearboxTypeValue,
+                        bvc.manufactorSettlementPrice,
+                        bm.modelName,
+                        (SELECT CONCAT(
+                                        MIN(bvc.guidedPrice),
+                                        '-',
+                                        MAX(bvc.guidedPrice)
+                                    )
+                         FROM base_vehmodel_config bvc
+                         WHERE bvc.modelSid = bm.sid)     AS guidedPrice,
+                        (SELECT COUNT(*)
+                         FROM base_vehicle bv
+                         WHERE bv.modelSid = bm.sid
+                           AND bv.useOrg = bvc.useOrgSid) AS nowCarNum,
+                        (SELECT COUNT(*)
+                         FROM bus_vehicle_apply_detail bvad
+                         WHERE bvad.vehicleSid = bm.sid)  AS productionCarNum
+        FROM base_vehicle_model bm
+                 LEFT JOIN base_vehmodel_config bvc
+                           ON bvc.modelSid = bm.sid
         <where>
             ${ew.sqlSegment}
         </where>
         ORDER BY bm.brandName,
-        bm.productLine,
-        bm.vehicleType,
-        bm.vehicleVersion,
-        nowCarNum,
-        productionCarNum DESC
+                 bm.productLine,
+                 bm.vehicleType,
+                 bm.vehicleVersion,
+                 nowCarNum,
+                 productionCarNum DESC
     </select>
 
     <select id="notTheCompanyModelPageList" resultType="com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelListVo">
-        SELECT
-        ( SELECT count( * ) FROM base_vehicle bv WHERE bv.modelSid = bm.sid and bv.useOrg = bvc.useOrgSid) AS nowCarNum,
-        ( SELECT count( * ) FROM bus_vehicle_apply_detail bvad WHERE bvad.vehicleSid = bm.sid ) AS productionCarNum
-        FROM
-        base_vehicle_model bm
-        LEFT JOIN base_vehmodel_config bvc ON bvc.modelSid = bm.sid
+        SELECT (SELECT count(*)
+                FROM base_vehicle bv
+                WHERE bv.modelSid = bm.sid
+                  and bv.useOrg = bvc.useOrgSid)                                                   AS nowCarNum,
+               (SELECT count(*) FROM bus_vehicle_apply_detail bvad WHERE bvad.vehicleSid = bm.sid) AS productionCarNum
+        FROM base_vehicle_model bm
+                 LEFT JOIN base_vehmodel_config bvc ON bvc.modelSid = bm.sid
         <where>
             ${ew.sqlSegment}
         </where>
-        ORDER BY
-        productionCarNum,
-        nowCarNum DESC
+        ORDER BY productionCarNum,
+                 nowCarNum DESC
     </select>
 
     <select id="listPageByVehmodel" resultType="com.yxt.anrui.base.api.basevehiclemodel.VehModelVo">
-        SELECT bvm.`brandName`,bvm.`modelName`,bmc.`configName`,bmc.otherConfig,bvc.guidedPrice
+        SELECT bvm.`brandName`, bvm.`modelName`, bmc.`configName`, bmc.otherConfig, bvc.guidedPrice
         FROM base_vehmodel_config bvc
-        LEFT JOIN base_vehicle_model bvm
-        ON bvc.`modelSid` = bvm.`sid`
-        LEFT JOIN base_model_config bmc
-        ON bvc.`configurationItemsSid` = bmc.`sid`
+                 LEFT JOIN base_vehicle_model bvm
+                           ON bvc.`modelSid` = bvm.`sid`
+                 LEFT JOIN base_model_config bmc
+                           ON bvc.`configurationItemsSid` = bmc.`sid`
         <where>
             ${ew.sqlSegment}
         </where>
     </select>
 
     <select id="checkSaveByModelName" resultType="int">
-        SELECT COUNT(*) FROM base_vehicle_model
+        SELECT COUNT(*)
+        FROM base_vehicle_model
         WHERE modelName = #{modelName}
           and isDelete = 0
     </select>
 
     <select id="checkUpdateByModelName" resultType="int">
-        SELECT COUNT(*) FROM base_vehicle_model
+        SELECT COUNT(*)
+        FROM base_vehicle_model
         WHERE modelName = #{modelName}
           and sid != #{sid}
           and isDelete = 0
     </select>
 
     <select id="checkSaveByVehicleTypeCode" resultType="int">
-        SELECT COUNT(*) FROM base_vehicle_model
+        SELECT COUNT(*)
+        FROM base_vehicle_model
         WHERE vehicleTypeCode = #{vehicleTypeCode}
           and isDelete = 0
     </select>
 
     <select id="checkUpdateByVehicleTypeCode" resultType="int">
-        SELECT COUNT(*) FROM base_vehicle_model
+        SELECT COUNT(*)
+        FROM base_vehicle_model
         WHERE vehicleTypeCode = #{vehicleTypeCode}
           and sid != #{sid}
           and isDelete = 0
     </select>
 
     <select id="getListByVeSid" resultType="java.util.Map">
-        SELECT
-                bmc.sid,
-                bmc.`configName`
-        FROM
-                base_model_config bmc
-                        LEFT JOIN base_vehmodel_config bvc
-                        ON bmc.sid = bvc.`configurationItemsSid`
-        WHERE bvc.`modelSid` = #{vehicleSid}
+        SELECT bmc.sid,
+               bmc.`configName`
+        FROM base_model_config bmc
+                 LEFT JOIN base_vehmodel_config bvc
+                           ON bmc.sid = bvc.`configurationItemsSid`
+        WHERE bvc.`modelSid` = #{modelSid}
+          and bvc.useOrgSid = #{orgSid}
     </select>
 
     <select id="checkByCreateOrgAndModelSid" resultType="int">
-        SELECT
-                COUNT(*)
-        FROM
-                base_vehicle_model
+        SELECT COUNT(*)
+        FROM base_vehicle_model
         WHERE createOrg = #{sid1}
           AND sid = #{sid}
           AND isDelete = 0

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

@@ -5,30 +5,20 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfig;
-import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfigSelectVo;
 import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfigVo;
 import com.yxt.anrui.base.api.basemodelconfig.PcChooseBaseModelConfigVo;
-import com.yxt.anrui.base.api.basemodelszconfig.BaseModelSzconfigVo;
-import com.yxt.anrui.base.api.basetrailer.BaseTrailerVo;
 import com.yxt.anrui.base.api.basevehiclemodel.*;
 import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendix;
 import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendixDto;
-import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendixQuery;
 import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendixVo;
 import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigVo;
 import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService;
-import com.yxt.anrui.base.biz.basemodelszconfig.BaseModelSzconfigService;
-import com.yxt.anrui.base.biz.basetrailer.BaseTrailerService;
 import com.yxt.anrui.base.biz.basevehiclemodelappendix.BaseVehicleModelAppendixService;
 import com.yxt.anrui.base.biz.basevehmodelconfig.BaseVehmodelConfigService;
-import com.yxt.anrui.crm.api.crmvehicledemand.CrmVehicledemand;
-import com.yxt.anrui.portal.api.sysorganization.SysOrgVo;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
 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.anrui.portal.api.sysuser.SysUserFeign;
-import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -39,7 +29,6 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.validation.constraints.NotBlank;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -71,6 +60,8 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
     private BaseVehmodelConfigService baseVehmodelConfigService;
     @Autowired
     private BaseModelConfigService baseModelConfigService;
+    @Autowired
+    private SysStaffOrgFeign sysStaffOrgFeign;
 
     /**
      * 车型信息分页列表
@@ -287,8 +278,9 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
         return baseMapper.getList();
     }
 
-    public List<Map<String,String>> getListByVeSid(String vehicleSid) {
-        return baseMapper.getListByVeSid(vehicleSid);
+    public List<Map<String,String>> getListByVeSid(String vehicleSid,String userSid) {
+        ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid);
+        return baseMapper.getListByVeSid(vehicleSid,resultBean.getData());
     }
 
     public BaseVehicleModelSelectVo getAll(String sid) {