移动端-修改部分车型配置代码及销售订单调式意向车型列表

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/VehicleState.java

@@ -0,0 +1,120 @@
+package com.yxt.anrui.base.common.enums;
+
+import lombok.Getter;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/13 11:57
+ * @Description 车辆台账状态
+ */
+public class VehicleState {
+
+    @Getter
+    public static enum LockEnum {
+        /**
+         * 未锁定
+         */
+        UN_LOCK("0", "未锁定"),
+        /**
+         * 虚拟订单-预定1
+         */
+        LOCK("1", "虚拟订单-预定1"),
+        /**
+         * 销售订单-锁定2
+         */
+        ORDER_LOCK("2", "销售订单-锁定2");
+
+        /**
+         * code值
+         */
+        private final String code;
+        /**
+         * 备注
+         */
+        private final String remarks;
+
+        /**
+         * 构造器
+         *
+         * @param code    code值
+         * @param remarks 备注
+         */
+        private LockEnum(String code, String remarks) {
+            this.code = code;
+            this.remarks = remarks;
+        }
+    }
+
+    @Getter
+    public static enum BuyoutEnum {
+        /**
+         * 未买断
+         */
+        UN_BUYOUT("0", "未买断"),
+        /**
+         * 预买断
+         */
+        PRE_BUYOUT("1", "预买断"),
+        /**
+         * 已买断
+         */
+        BUYOUT("2", "已买断"),
+        ;
+        /**
+         * code值
+         */
+        private final String code;
+        /**
+         * 备注
+         */
+        private final String remarks;
+
+        /**
+         * 构造器
+         *
+         * @param code    code值
+         * @param remarks 备注
+         */
+        private BuyoutEnum(String code, String remarks) {
+            this.code = code;
+            this.remarks = remarks;
+        }
+    }
+
+    @Getter
+    public static enum StockEnum {
+        /**
+         * 库存
+         */
+        STOCK("0", "库存"),
+        /**
+         * 出库
+         */
+        OUT_STOCK("1", "出库"),
+        /**
+         * 退库
+         */
+        RETURN_STOCK("2", "退库");
+
+        /**
+         * code值
+         */
+        private final String code;
+        /**
+         * 备注
+         */
+        private final String remarks;
+
+        /**
+         * 构造器
+         *
+         * @param code    code值
+         * @param remarks 备注
+         */
+        private StockEnum(String code, String remarks) {
+            this.code = code;
+            this.remarks = remarks;
+        }
+
+    }
+}

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

@@ -145,7 +145,7 @@ public interface BaseModelConfigMapper extends BaseMapper<BaseModelConfig> {
      * @param configSid
      * @return
      */
-    AppModelConfigDetailsVo getAppModelConfigDetailsVo(@Param("modelSid") String modelSid, @Param("configSid") String configSid ,@Param("useOrg") String useOrg);
+    AppModelConfigDetailsVo getAppModelConfigDetailsVo(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("useOrg") String useOrg);
 
     /**
      * 车型配置分页列表(新)
@@ -183,9 +183,9 @@ public interface BaseModelConfigMapper extends BaseMapper<BaseModelConfig> {
     AppModelConfigDetailsVo getAppProductionSchedulingDetailsVo(@Param("modelSid") String modelSid, @Param("configSid") String configSid);
 
     //查询车型信息
-    AppModelConfigVo getModelConfigList(@Param("modelSid") String modelSid,@Param("useOrgSid") String useOrgSid);
+    AppModelConfigVo getModelConfigList(@Param("modelSid") String modelSid, @Param("useOrgSid") String useOrgSid);
 
-    List<AppModelConfigListVo> getModelConfigPageList(IPage<AppModelConfigListQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppModelConfigListVo> qw);
+    List<AppModelConfigListVo> getModelConfigPageList(IPage<AppModelConfigListQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppModelConfigListVo> qw, @Param("lockedStateKey") String lockedStateKey);
 
     List<AppModelConfigListVo> getNowConfigList(IPage<AppModelConfigListQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppModelConfigListVo> qw);
 
@@ -195,5 +195,5 @@ public interface BaseModelConfigMapper extends BaseMapper<BaseModelConfig> {
 
     int checkByConfigName(String configName);
 
-    int checkByCreateOrgSidAndConfigSid(@Param("sid1") String sid1,@Param("sid") String sid);
+    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

@@ -170,7 +170,7 @@
     <select id="selectDown" resultType="com.yxt.anrui.base.api.basemodelconfig.BaseVehicleModelConfigDownVo">
         SELECT bmc.sid<!--, bmc.vehicleCode-->
         FROM base_model_config bmc
-        ${ew.customSqlSegment}
+            ${ew.customSqlSegment}
     </select>
 
     <select id="getAppChooseListByModelSid"
@@ -188,7 +188,7 @@
         bmc.otherConfig,
         bmc.remarks
         FROM base_model_config bmc
-        ${ew.customSqlSegment}
+            ${ew.customSqlSegment}
     </select>
 
     <select id="selectAppConfigListByModelSid"
@@ -340,23 +340,30 @@
         ORDER BY
             bvc.priceValidity ASC,
             nowCarNum,
-            productionCarNum DESC
+            productionCarNum
+        DESC
     </select>
 
     <select id="notTheCompanyConfigPageList" resultType="com.yxt.anrui.base.api.basemodelconfig.BaseModelConfigListVo">
-        SELECT
-        ( SELECT count( * ) FROM base_vehicle bv WHERE bv.modelSid = bvc.modelSid AND bv.modelConfigSid =
-        bvc.configurationItemsSid and bv.useOrg = bvc.useOrg ) AS nowCarNum,
-        ( SELECT count( * ) FROM bus_vehicle_apply_detail bvad WHERE bvad.vehicleSid = bvc.modelSid AND bvad.configSid =
-        bvc.configurationItemsSid and bvad.useOrg = bvc.useOrg ) AS productionCarNum
+        SELECT (SELECT count(*)
+                FROM base_vehicle bv
+                WHERE bv.modelSid = bvc.modelSid
+                  AND bv.modelConfigSid =
+                      bvc.configurationItemsSid
+                  and bv.useOrg = bvc.useOrg)   AS nowCarNum,
+               (SELECT count(*)
+                FROM bus_vehicle_apply_detail bvad
+                WHERE bvad.vehicleSid = bvc.modelSid
+                  AND bvad.configSid =
+                      bvc.configurationItemsSid
+                  and bvad.useOrg = bvc.useOrg) AS productionCarNum
         FROM base_model_config bc
-        LEFT JOIN base_vehmodel_config bvc ON bvc.configurationItemsSid = bc.sid
+                 LEFT JOIN base_vehmodel_config bvc ON bvc.configurationItemsSid = bc.sid
         <where>
             ${ew.customSqlSegment}
         </where>
-        ORDER BY
-        nowCarNum DESC,
-        productionCarNum DESC
+        ORDER BY nowCarNum DESC,
+                 productionCarNum DESC
     </select>
 
     <select id="selectDetails" resultType="com.yxt.anrui.base.api.basemodelconfig.BaseModelConfigDetailsVo">
@@ -432,9 +439,10 @@
         <!-- 更多配置-->
         bc.otherConfig
         from base_model_config bc
-        left join base_vehmodel_config bv on bv.configurationItemsSid = bc.sid
-        left join base_vehicle_model bm on bm.sid = bv.modelSid
-        where bc.sid = #{sid} and bm.sid = #{modelSid}
+                 left join base_vehmodel_config bv on bv.configurationItemsSid = bc.sid
+                 left join base_vehicle_model bm on bm.sid = bv.modelSid
+        where bc.sid = #{sid}
+          and bm.sid = #{modelSid}
     </select>
     <select id="getAppProductionSchedulingDetailsVo"
             resultType="com.yxt.anrui.base.api.basemodelconfig.AppModelConfigDetailsVo">
@@ -490,47 +498,50 @@
 
     <select id="getModelConfigPageList"
             resultType="com.yxt.anrui.base.api.basemodelconfig.AppModelConfigListVo">
-        SELECT
-        bmc.sid as configSid,
-        bmc.carColor,
-        bmc.slowMachine,
-        bmc.rearViewMirror,
-        bmc.tireSize,
-        bmc.specification,
-        bmc.rearAxleRatio,
-        bmc.airConditioner,
-        bmc.hubMaterial,
-        bmc.baffleModel,
-        bmc.suspension,
-        bmc.seat,
-        bmc.tireCover,
-        bmc.saddle,
-        bmc.wheelbase,
-        bmc.bumper,
-        bmc.configuringBao,
-        bmc.independentSources,
-        bmc.fuelTank,
-        bmc.multimedia,
-        bvc.guidedPrice as price,
-        bvc.priceValidity,
-        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,
-        ( 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
+        SELECT bmc.sid                                 as configSid,
+               bmc.carColor,
+               bmc.slowMachine,
+               bmc.rearViewMirror,
+               bmc.tireSize,
+               bmc.specification,
+               bmc.rearAxleRatio,
+               bmc.airConditioner,
+               bmc.hubMaterial,
+               bmc.baffleModel,
+               bmc.suspension,
+               bmc.seat,
+               bmc.tireCover,
+               bmc.saddle,
+               bmc.wheelbase,
+               bmc.bumper,
+               bmc.configuringBao,
+               bmc.independentSources,
+               bmc.fuelTank,
+               bmc.multimedia,
+               bvc.guidedPrice                         as price,
+               bvc.priceValidity,
+               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,
+               (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
         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
+                 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}
         </where>
-        ORDER BY
-        nowCarNum DESC
+        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,
@@ -576,62 +587,69 @@
           AND bmc.sid = #{configSid}
     </select>
     <select id="getNowConfigList" resultType="com.yxt.anrui.base.api.basemodelconfig.AppModelConfigListVo">
-        SELECT
-        bmc.sid as configSid,
-        bmc.carColor,
-        bmc.slowMachine,
-        bmc.rearViewMirror,
-        bmc.tireSize,
-        bmc.specification,
-        bmc.rearAxleRatio,
-        bmc.airConditioner,
-        bmc.hubMaterial,
-        bmc.baffleModel,
-        bmc.suspension,
-        bmc.seat,
-        bmc.tireCover,
-        bmc.saddle,
-        bmc.wheelbase,
-        bmc.bumper,
-        bmc.configuringBao,
-        bmc.independentSources,
-        bmc.fuelTank,
-        bmc.multimedia,
-        bvc.guidedPrice as price,
-        bvc.priceValidity,
-        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,
-        ( 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
+        SELECT bmc.sid                    as configSid,
+               bmc.carColor,
+               bmc.slowMachine,
+               bmc.rearViewMirror,
+               bmc.tireSize,
+               bmc.specification,
+               bmc.rearAxleRatio,
+               bmc.airConditioner,
+               bmc.hubMaterial,
+               bmc.baffleModel,
+               bmc.suspension,
+               bmc.seat,
+               bmc.tireCover,
+               bmc.saddle,
+               bmc.wheelbase,
+               bmc.bumper,
+               bmc.configuringBao,
+               bmc.independentSources,
+               bmc.fuelTank,
+               bmc.multimedia,
+               bvc.guidedPrice            as price,
+               bvc.priceValidity,
+               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,
+               (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
         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
+                 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
+              and (SELECT count(*)
+                   FROM base_vehicle bv
+                   WHERE bv.modelSid = bvc.modelSid
+                     AND bv.modelConfigSid = bmc.sid
+                     AND lockedState = '03') > 0
         </where>
+
         ORDER BY
         nowCarNum DESC
     </select>
 
     <select id="checkByConfigName" resultType="int">
-        SELECT COUNT(*) FROM base_model_config WHERE configName = #{configName} and isDelete = 0
+        SELECT COUNT(*)
+        FROM base_model_config
+        WHERE configName = #{configName}
+          and isDelete = 0
     </select>
 
     <select id="checkByCreateOrgSidAndConfigSid" resultType="int">
-        SELECT
-                COUNT(*)
-        FROM
-                base_model_config
+        SELECT COUNT(*)
+        FROM base_model_config
         WHERE createOrgSId = #{sid1}
           AND sid = #{sid}
           AND isDelete = 0

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

@@ -3,17 +3,16 @@ package com.yxt.anrui.base.biz.basemodelconfig;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basemodelconfig.*;
-import com.yxt.anrui.base.api.basevehicle.*;
-import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendix;
+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.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
-import com.yxt.common.core.vo.PagerVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -132,13 +131,13 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
                 qw.like("bmc.multimediaKey", pagerQuery.getMultimediaKey());
             }
             if (StringUtils.isNotBlank(pagerQuery.getConfigName())) {//简述配置名称
-                qw.like("bmc.configName", pagerQuery.getConfigName()).or().like("bmc.otherConfig",pagerQuery.getConfigName());
+                qw.like("bmc.configName", pagerQuery.getConfigName()).or().like("bmc.otherConfig", pagerQuery.getConfigName());
             }
             String configSid = pagerQuery.getConfigSid();
-            if (StringUtils.isNotBlank(configSid)){
+            if (StringUtils.isNotBlank(configSid)) {
                 String[] configSids = configSid.split(",");
                 for (String sid : configSids) {
-                    qw.ne("bmc.sid",sid);
+                    qw.ne("bmc.sid", sid);
                 }
             }
         }
@@ -525,7 +524,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);
+        List<AppModelConfigListVo> appModelConfigListVos = baseMapper.getModelConfigPageList(page, qw, VehicleState.LockEnum.UN_LOCK.getCode());
         long pages = page.getPages();
         vo.setPages((int) pages);
         //分公司配置列表查询
@@ -544,6 +543,7 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
         vo.setModelConfigList(appModelConfigListVos);
         return vo;
     }
+
     public AppModelConfigVo getNowConfigList(PagerQuery<AppModelConfigListQuery> pagerQuery) {
 
         String userSid = pagerQuery.getParams().getUserSid();
@@ -601,6 +601,7 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
         vo.setModelConfigList(appModelConfigListVos);
         return vo;
     }
+
     /**
      * 拼接常用车型字段（configName）
      *
@@ -609,41 +610,60 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
      */
     public List<AppModelConfigListVo> addDonfigName(List<AppModelConfigListVo> appModelConfigListVos) {
         for (AppModelConfigListVo appModelConfigListVo : appModelConfigListVos) {
-            String slowMachine = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getSlowMachine()) ? (appModelConfigListVo.getSlowMachine() + "/") : "";
-
-            String rearViewMirror = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getRearViewMirror()) ? (appModelConfigListVo.getRearViewMirror() + "/") : "";
-
-            String tireSize = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getTireSize()) ? (appModelConfigListVo.getTireSize() + "/") : "";
-
-            String specification = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getSpecification()) ? (appModelConfigListVo.getSpecification() + "/") : "";
-
-            String rearAxleRatio = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getRearAxleRatio()) ? (appModelConfigListVo.getRearAxleRatio() + "/") : "";
-
-            String airConditioner = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getAirConditioner()) && com.yxt.common.base.utils.StringUtils.equals(appModelConfigListVo.getAirConditioner(), "有") ? ("空调" + "/") : "";
+            //缓速器
+            String slowMachine = StringUtils.isNotBlank(appModelConfigListVo.getSlowMachine())
+                    && "有".equals(appModelConfigListVo.getSlowMachine()) ? ("缓速器" + "/") : "";
+            //后视镜
+            String rearViewMirror = StringUtils.isNotBlank(appModelConfigListVo.getRearViewMirror())
+                    ? (appModelConfigListVo.getRearViewMirror() + "/") : "";
+            //轮胎规格
+            String tireSize = StringUtils.isNotBlank(appModelConfigListVo.getTireSize())
+                    ? (appModelConfigListVo.getTireSize() + "/") : "";
+            //驾驶室规格
+            String specification = StringUtils.isNotBlank(appModelConfigListVo.getSpecification())
+                    ? (appModelConfigListVo.getSpecification() + "/") : "";
+            //后桥速比
+            String rearAxleRatio = StringUtils.isNotBlank(appModelConfigListVo.getRearAxleRatio())
+                    ? (appModelConfigListVo.getRearAxleRatio() + "/") : "";
+            //空调
+            String airConditioner = StringUtils.isNotBlank(appModelConfigListVo.getAirConditioner())
+                    && "有".equals(appModelConfigListVo.getAirConditioner()) ? ("空调" + "/") : "";
 
-            String hubMaterial = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getHubMaterial()) ? (appModelConfigListVo.getHubMaterial() + "/") : "";
+            String hubMaterial = StringUtils.isNotBlank(appModelConfigListVo.getHubMaterial())
+                    ? (appModelConfigListVo.getHubMaterial() + "/") : "";
 
-            String baffleModel = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getBaffleModel()) && com.yxt.common.base.utils.StringUtils.equals(appModelConfigListVo.getBaffleModel(), "有") ? ("导流罩" + "/") : "";
+            String baffleModel = StringUtils.isNotBlank(appModelConfigListVo.getBaffleModel())
+                    && "有".equals(appModelConfigListVo.getBaffleModel()) ? ("导流罩" + "/") : "";
 
-            String suspension = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getSuspension()) ? (appModelConfigListVo.getSuspension() + "/") : "";
+            String suspension = StringUtils.isNotBlank(appModelConfigListVo.getSuspension())
+                    ? (appModelConfigListVo.getSuspension() + "/") : "";
 
-            String seat = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getSeat()) ? (appModelConfigListVo.getSeat() + "/") : "";
+            String seat = StringUtils.isNotBlank(appModelConfigListVo.getSeat())
+                    ? (appModelConfigListVo.getSeat() + "/") : "";
 
-            String tireCover = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getTireCover()) && com.yxt.common.base.utils.StringUtils.equals(appModelConfigListVo.getTireCover(), "有") ? ("护轮罩" + "/") : "";
+            String tireCover = StringUtils.isNotBlank(appModelConfigListVo.getTireCover())
+                    && "有".equals(appModelConfigListVo.getTireCover()) ? ("护轮罩" + "/") : "";
 
-            String saddle = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getSaddle()) ? (appModelConfigListVo.getSaddle() + "/") : "";
+            String saddle = StringUtils.isNotBlank(appModelConfigListVo.getSaddle())
+                    ? (appModelConfigListVo.getSaddle() + "/") : "";
 
-            String wheelbase = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getWheelbase()) ? (appModelConfigListVo.getWheelbase() + "/") : "";
+            String wheelbase = StringUtils.isNotBlank(appModelConfigListVo.getWheelbase())
+                    ? (appModelConfigListVo.getWheelbase() + "/") : "";
 
-            String bumper = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getBumper()) ? (appModelConfigListVo.getBumper() + "/") : "";
+            String bumper = StringUtils.isNotBlank(appModelConfigListVo.getBumper())
+                    ? (appModelConfigListVo.getBumper() + "/") : "";
 
-            String configuringBao = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getConfiguringBao()) ? (appModelConfigListVo.getConfiguringBao() + "/") : "";
+            String configuringBao = StringUtils.isNotBlank(appModelConfigListVo.getConfiguringBao())
+                    ? (appModelConfigListVo.getConfiguringBao() + "/") : "";
 
-            String independentSources = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getIndependentSources()) && com.yxt.common.base.utils.StringUtils.equals(appModelConfigListVo.getIndependentSources(), "有") ? ("独立热源" + "/") : "";
+            String independentSources = StringUtils.isNotBlank(appModelConfigListVo.getIndependentSources())
+                    && "有".equals(appModelConfigListVo.getIndependentSources()) ? ("独立热源" + "/") : "";
 
-            String fuelTank = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getFuelTank()) ? (appModelConfigListVo.getFuelTank() + "/") : "";
+            String fuelTank = StringUtils.isNotBlank(appModelConfigListVo.getFuelTank())
+                    ? (appModelConfigListVo.getFuelTank() + "/") : "";
 
-            String multimedia = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getMultimedia()) && com.yxt.common.base.utils.StringUtils.equals(appModelConfigListVo.getMultimedia(), "有") ? ("多媒体") : "";
+            String multimedia = StringUtils.isNotBlank(appModelConfigListVo.getMultimedia())
+                    && "有".equals(appModelConfigListVo.getMultimedia()) ? ("多媒体") : "";
 
             String configName = slowMachine + rearViewMirror + tireSize + specification + rearAxleRatio + airConditioner + hubMaterial +
                     baffleModel + suspension + seat + tireCover + saddle + wheelbase + bumper + configuringBao + independentSources + fuelTank + multimedia;
@@ -754,6 +774,6 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
     }
 
     public int checkByCreateOrgSidAndConfigSid(String sid1, String sid) {
-        return baseMapper.checkByCreateOrgSidAndConfigSid(sid1,sid);
+        return baseMapper.checkByCreateOrgSidAndConfigSid(sid1, sid);
     }
 }

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

@@ -231,7 +231,7 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
      * @param qw
      * @return
      */
-    IPage<AppVehicleModelPriceVo> getModelList(IPage<AppVehicleModelPriceQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppVehicleModelPriceVo> qw, @Param("useOrgSid") String useOrgSid);
+    IPage<AppVehicleModelPriceVo> getModelList(IPage<AppVehicleModelPriceQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppVehicleModelPriceVo> qw, @Param("useOrgSid") String useOrgSid, @Param("lockedStateKey") String lockedStateKey);
 
     /**
      * 手机端查询不本公司的现车，排产车

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

@@ -491,7 +491,7 @@
                         (SELECT count(*)
                          FROM base_vehicle bv
                          WHERE bv.modelSid = bvm.sid
-                           AND lockedState = '03'
+                           AND lockedState = #{lockedStateKey}
                            AND bv.useOrg =
                                #{useOrgSid})                 AS nowCarNum,
                         (SELECT SUM(cast(bvad.quantity as signed)) as quantity
@@ -642,28 +642,28 @@
         DATE_FORMAT(bv.priceDate, '%Y-%m-%d') as priceDate,
         bv.priced
         FROM base_vehicle bv
-                 LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
-                 LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
-            ${ew.customSqlSegment}
+        LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
+        LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
+        ${ew.customSqlSegment}
     </select>
     <!--根据车架号查询现车详情-->
     <select id="getPurchaseDetails" resultType="com.yxt.anrui.base.api.basevehicle.AppPurchaseDetailsVo">
         select bv.sid,
-               bv.vinNo,
-               bv.vehicleStateValue,
-               bv.location,
-               bv.priceDate,
-               bv.guidedPrice
+        bv.vinNo,
+        bv.vehicleStateValue,
+        bv.location,
+        bv.priceDate,
+        bv.guidedPrice
         from base_vehicle bv
         where bv.vinNo = #{vinNo}
     </select>
 
     <select id="selectVo" resultType="com.yxt.anrui.base.api.basevehicle.PcBaseVehicleOrderVo">
-        select bv.vinNo    linkNo,
-               bv.location linkText,
-               bv.sid      linkSid,
-               if(bv.lockedState = 1, 1, 0)
-                   as      isFictitious
+        select bv.vinNo linkNo,
+        bv.location linkText,
+        bv.sid linkSid,
+        if(bv.lockedState = 1, 1, 0)
+        as isFictitious
         from base_vehicle bv
         <where>
             ${ew.sqlSegment}
@@ -677,70 +677,70 @@
     </select>
 
     <select id="getModelNowCarList" resultType="com.yxt.anrui.base.api.basevehicle.AppBaseVinNowCarVo">
-        SELECT vinNo             AS vin,
-               vehicleStateValue AS `state`,
-               carColor          AS color,
-               location          AS address
+        SELECT vinNo AS vin,
+        vehicleStateValue AS `state`,
+        carColor AS color,
+        location AS address
         FROM base_vehicle bv
-                 LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid
-            ${ew.customSqlSegment}
+        LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid
+        ${ew.customSqlSegment}
     </select>
 
     <select id="selectVehicleCount" resultType="java.lang.Integer">
         select count(*)
         from base_vehicle bv
-            ${ew.customSqlSegment}
+        ${ew.customSqlSegment}
     </select>
 
     <select id="selectByModelSidAndConfigSid"
             resultType="com.yxt.anrui.base.api.basevehicle.AppBaseConfigNowCarVo">
         select bvm.vehicleAlias AS modelName,
-               bv.guidedPrice   AS price,
-               bmc.configName   AS commonlyConfig
+        bv.guidedPrice AS price,
+        bmc.configName AS commonlyConfig
         from base_vehicle bv
-                 LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
-                 LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
+        LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
+        LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
         where bv.modelSid = #{modelSid}
-          AND bv.modelConfigSid = #{configSid}
-          AND bv.useOrg = #{useOrg}
+        AND bv.modelConfigSid = #{configSid}
+        AND bv.useOrg = #{useOrg}
     </select>
 
     <select id="getModelSidAndConfigSid"
             resultType="com.yxt.anrui.base.api.basevehicle.AppBaseConfigOrderCarVo">
         select bvm.vehicleAlias AS modelName,
-               bvc.guidedPrice  AS price,
-               bmc.configName   AS commonlyConfig
+        bvc.guidedPrice AS price,
+        bmc.configName AS commonlyConfig
         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 bvc.modelSid = #{modelSid}
-          AND bvc.configurationItemsSid = #{configSid}
-          AND bvc.useOrgSid = #{useOrg}
+        AND bvc.configurationItemsSid = #{configSid}
+        AND bvc.useOrgSid = #{useOrg}
     </select>
     <select id="getModelOrderCarList" resultType="com.yxt.anrui.base.api.basevehicle.AppBaseNowProduceCarVo">
-        SELECT bvo.orderNo          AS orderId,
-               bvo.orderStatus      AS state,
-               bvo.orderDate        AS `date`,
-               bvo.expectLaunchDate AS forecastDate,
-               bvo.launchDate       AS `upDate`,
-               bvo.offlineDate      AS downDate,
-               bvad.quantity        as `number`
+        SELECT bvo.orderNo AS orderId,
+        bvo.orderStatus AS state,
+        bvo.orderDate AS `date`,
+        bvo.expectLaunchDate AS forecastDate,
+        bvo.launchDate AS `upDate`,
+        bvo.offlineDate AS downDate,
+        bvad.quantity as `number`
         FROM bus_vehicle_order bvo
-                 left join bus_vehicle_apply_detail bvad on bvo.purchaseApplyMediumModelSid = bvad.sid
+        left join bus_vehicle_apply_detail bvad on bvo.purchaseApplyMediumModelSid = bvad.sid
         <where>
             ${ew.sqlSegment}
         </where>
     </select>
 
     <select id="selectAppList" resultType="com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo">
-        select bv.vinNo    vin,
-               bv.location address,
-               bv.sid      carSid,
-               if(bv.lockedState = 1, 1, 0)
-                   as      isFictitious
+        select bv.vinNo vin,
+        bv.locationName address,
+        bv.sid carSid,
+        if(bv.lockedState = 1, 1, 0)
+        as isFictitious
         from base_vehicle bv
         where bv.modelSid = #{modelSid}
-          and bv.modelConfigSid = #{configSid}
+        and bv.modelConfigSid = #{configSid}
         order by isFictitious desc
     </select>
 
@@ -748,7 +748,7 @@
         select filePath
         from base_vehicle_appendix
         where linkSid = #{vehicleSid}
-          and attachType = '0001'
+        and attachType = '0001'
         limit 1
     </select>
 </mapper>

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

@@ -11,6 +11,7 @@ import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService;
 import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService;
 import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService;
 import com.yxt.anrui.base.biz.busvehicleinquiry.BusVehicleInquiryService;
+import com.yxt.anrui.base.common.enums.VehicleState;
 import com.yxt.common.base.utils.ExportExcelUtils;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.base.utils.StringUtils;
@@ -99,16 +100,16 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         }
         BaseVehicle baseVehicle = new BaseVehicle();
         dto.fillEntity(baseVehicle);
+        //锁定状态
+        String lockedStateKey = VehicleState.LockEnum.UN_LOCK.getCode();
+        String lockedStateValue = VehicleState.LockEnum.UN_LOCK.getRemarks();
+        baseVehicle.setLockedState(lockedStateKey);
+        baseVehicle.setLockedStateValue(lockedStateValue);
+        baseVehicle.setVehicleState(VehicleState.StockEnum.STOCK.getCode());
+        baseVehicle.setVehicleStateValue(VehicleState.StockEnum.STOCK.getRemarks());
+        baseVehicle.setSettlementStatus(VehicleState.BuyoutEnum.UN_BUYOUT.getCode());
         boolean isSave = baseVehicleService.save(baseVehicle);
-        /*if (isSave) {
-            List<String> list = dto.getVehiclePhoto();
-            if (list.size() > 0) {
-                int i = baseVehicleAppendixService.saveAppendixFile(list, baseVehicle.getSid(), type);
-                if (i == 0) {
-                    return rb.fail().setMsg("附件保存失败");
-                }
-            }
-        }*/
+
         return rb.success().setData(baseVehicle.getSid()).setMsg("保存成功");
     }
 

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

@@ -14,6 +14,7 @@ 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.commonappendix.CommonAppendixService;
+import com.yxt.anrui.base.common.enums.VehicleState;
 import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositFeign;
 import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVehicleQuery;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
@@ -730,7 +731,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         }
         IPage<AppVehicleModelPriceQuery> page = PagerUtil.queryToPage(pagerQuery);
         QueryWrapper<AppVehicleModelPriceVo> qw = appExistingCarBuildQW(pagerQuery.getParams());
-        IPage<AppVehicleModelPriceVo> iPage = baseMapper.getModelList(page, qw, data.getSid());
+        IPage<AppVehicleModelPriceVo> iPage = baseMapper.getModelList(page, qw, data.getSid(), VehicleState.LockEnum.UN_LOCK.getCode());
         // 3、 查询更多配置（其它分公司）
         for (AppVehicleModelPriceVo record : iPage.getRecords()) {
             String sid = record.getModelSid();

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

@@ -494,41 +494,42 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
      */
     public AppCarConfigSummaryVo addConfigName(AppModelConfigListVo appModelConfigListVo) {
         AppCarConfigSummaryVo vo = new AppCarConfigSummaryVo();
-        String slowMachine = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getSlowMachine()) ? (appModelConfigListVo.getSlowMachine() + "/") : "";
+        //缓速器
+        String slowMachine = StringUtils.isNotBlank(appModelConfigListVo.getSlowMachine()) && "有".equals(appModelConfigListVo.getSlowMachine()) ? ("缓速器" + "/") : "";
 
-        String rearViewMirror = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getRearViewMirror()) ? (appModelConfigListVo.getRearViewMirror() + "/") : "";
+        String rearViewMirror = StringUtils.isNotBlank(appModelConfigListVo.getRearViewMirror()) ? (appModelConfigListVo.getRearViewMirror() + "/") : "";
 
-        String tireSize = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getTireSize()) ? (appModelConfigListVo.getTireSize() + "/") : "";
+        String tireSize = StringUtils.isNotBlank(appModelConfigListVo.getTireSize()) ? (appModelConfigListVo.getTireSize() + "/") : "";
 
-        String specification = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getSpecification()) ? (appModelConfigListVo.getSpecification() + "/") : "";
+        String specification = StringUtils.isNotBlank(appModelConfigListVo.getSpecification()) ? (appModelConfigListVo.getSpecification() + "/") : "";
 
-        String rearAxleRatio = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getRearAxleRatio()) ? (appModelConfigListVo.getRearAxleRatio() + "/") : "";
+        String rearAxleRatio = StringUtils.isNotBlank(appModelConfigListVo.getRearAxleRatio()) ? (appModelConfigListVo.getRearAxleRatio() + "/") : "";
+        //空调
+        String airConditioner = StringUtils.isNotBlank(appModelConfigListVo.getAirConditioner()) && "有".equals(appModelConfigListVo.getAirConditioner()) ? ("空调" + "/") : "";
 
-        String airConditioner = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getAirConditioner()) && com.yxt.common.base.utils.StringUtils.equals(appModelConfigListVo.getAirConditioner(), "有") ? ("空调" + "/") : "";
+        String hubMaterial = StringUtils.isNotBlank(appModelConfigListVo.getHubMaterial()) ? (appModelConfigListVo.getHubMaterial() + "/") : "";
+        //导流罩
+        String baffleModel = StringUtils.isNotBlank(appModelConfigListVo.getBaffleModel()) && "有".equals(appModelConfigListVo.getBaffleModel()) ? ("导流罩" + "/") : "";
 
-        String hubMaterial = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getHubMaterial()) ? (appModelConfigListVo.getHubMaterial() + "/") : "";
+        String suspension = StringUtils.isNotBlank(appModelConfigListVo.getSuspension()) ? (appModelConfigListVo.getSuspension() + "/") : "";
 
-        String baffleModel = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getBaffleModel()) && com.yxt.common.base.utils.StringUtils.equals(appModelConfigListVo.getBaffleModel(), "有") ? ("导流罩" + "/") : "";
+        String seat = StringUtils.isNotBlank(appModelConfigListVo.getSeat()) ? (appModelConfigListVo.getSeat() + "/") : "";
+        //护轮罩
+        String tireCover = StringUtils.isNotBlank(appModelConfigListVo.getTireCover()) && "有".equals(appModelConfigListVo.getTireCover()) ? ("护轮罩" + "/") : "";
 
-        String suspension = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getSuspension()) ? (appModelConfigListVo.getSuspension() + "/") : "";
+        String saddle = StringUtils.isNotBlank(appModelConfigListVo.getSaddle()) ? (appModelConfigListVo.getSaddle() + "/") : "";
 
-        String seat = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getSeat()) ? (appModelConfigListVo.getSeat() + "/") : "";
+        String wheelbase = StringUtils.isNotBlank(appModelConfigListVo.getWheelbase()) ? (appModelConfigListVo.getWheelbase() + "/") : "";
 
-        String tireCover = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getTireCover()) && com.yxt.common.base.utils.StringUtils.equals(appModelConfigListVo.getTireCover(), "有") ? ("护轮罩" + "/") : "";
+        String bumper = StringUtils.isNotBlank(appModelConfigListVo.getBumper()) ? (appModelConfigListVo.getBumper() + "/") : "";
 
-        String saddle = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getSaddle()) ? (appModelConfigListVo.getSaddle() + "/") : "";
+        String configuringBao = StringUtils.isNotBlank(appModelConfigListVo.getConfiguringBao()) ? (appModelConfigListVo.getConfiguringBao() + "/") : "";
 
-        String wheelbase = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getWheelbase()) ? (appModelConfigListVo.getWheelbase() + "/") : "";
+        String independentSources = StringUtils.isNotBlank(appModelConfigListVo.getIndependentSources()) && "有".equals(appModelConfigListVo.getIndependentSources()) ? ("独立热源" + "/") : "";
 
-        String bumper = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getBumper()) ? (appModelConfigListVo.getBumper() + "/") : "";
-
-        String configuringBao = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getConfiguringBao()) ? (appModelConfigListVo.getConfiguringBao() + "/") : "";
-
-        String independentSources = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getIndependentSources()) && com.yxt.common.base.utils.StringUtils.equals(appModelConfigListVo.getIndependentSources(), "有") ? ("独立热源" + "/") : "";
-
-        String fuelTank = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getFuelTank()) ? (appModelConfigListVo.getFuelTank() + "/") : "";
-
-        String multimedia = com.yxt.common.base.utils.StringUtils.isNotBlank(appModelConfigListVo.getMultimedia()) && com.yxt.common.base.utils.StringUtils.equals(appModelConfigListVo.getMultimedia(), "有") ? ("多媒体") : "";
+        String fuelTank = StringUtils.isNotBlank(appModelConfigListVo.getFuelTank()) ? (appModelConfigListVo.getFuelTank() + "/") : "";
+        //多媒体
+        String multimedia = StringUtils.isNotBlank(appModelConfigListVo.getMultimedia()) && "有".equals(appModelConfigListVo.getMultimedia()) ? ("多媒体") : "";
 
         String configName = slowMachine + rearViewMirror + tireSize + specification + rearAxleRatio + airConditioner + hubMaterial +
                 baffleModel + suspension + seat + tireCover + saddle + wheelbase + bumper + configuringBao + independentSources + fuelTank + multimedia;
@@ -543,8 +544,8 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
         return baseMapper.getListByConfigSid(sid);
     }
 
-    public List<BaseVehmodelConfigVo> getVehModByModelSid(String sid,String useOrgSid) {
-        return baseMapper.getVehModByModelSid(sid,useOrgSid);
+    public List<BaseVehmodelConfigVo> getVehModByModelSid(String sid, String useOrgSid) {
+        return baseMapper.getVehModByModelSid(sid, useOrgSid);
     }
 
     public int checkByConfigSid(String sid) {

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java

@@ -460,6 +460,8 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
         if (query != null) {
             qw.eq("cv.customerSid", query.getCustomerSid());
         }
+        //是否意向：0非意向，1意向
+        qw.eq("states",1);
         return qw;
     }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/virtualOrders/AppBusMainDepositService.java

@@ -35,7 +35,6 @@ import com.yxt.anrui.buscenter.api.busdepositvehicle.*;
 import com.yxt.anrui.buscenter.api.busmaindeposit.*;
 import com.yxt.anrui.buscenter.api.busmaindeposit.AppBusDepositBuscenterDto;
 import com.yxt.anrui.buscenter.api.bussalesorder.*;
-import com.yxt.anrui.buscenter.api.bussalesorder.app.*;
 import com.yxt.anrui.terminal.api.autoservice.virtualOrders.AppBusMainDepositPageQuery;
 import com.yxt.anrui.terminal.config.CoverUtils;
 import com.yxt.common.core.query.PagerQuery;