新增或者编辑选择车型查询接口

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

@@ -10,6 +10,12 @@ public class BaseExistingCarPageQuery implements Query {
     @ApiModelProperty(value = "车架号")
     private String vinNo;
 
+    @ApiModelProperty(value = "车型sid")
+    private String modelSid;
+
+    @ApiModelProperty(value = "常用配置sid")
+    private String modelConfigSid;
+
     @ApiModelProperty(value = "颜色")
     private String carColor;
 

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigQuery.java

@@ -53,4 +53,6 @@ public class BaseVehmodelConfigQuery implements Query {
 
 	@ApiModelProperty("车型sid")
     private String modelSid; // 车型sid
+    @ApiModelProperty(value = "分公司sid")
+    private String useOrgSid;
 }

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

@@ -674,6 +674,12 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         if (StringUtils.isNotBlank(pagerQuery.getVinNo())) { // 车架号
             qw.like("bv.vinNo", pagerQuery.getVinNo());
         }
+        if (StringUtils.isNotBlank(pagerQuery.getModelSid())) { // 车型sid
+            qw.like("bv.modelSid", pagerQuery.getModelSid());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getModelConfigSid())) { // 常用配置sid
+            qw.like("bv.modelConfigSid", pagerQuery.getModelConfigSid());
+        }
         if (StringUtils.isNotBlank(pagerQuery.getLocation())) { // 存放地点
             qw.like("bv.location", pagerQuery.getLocation());
         }

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

@@ -143,15 +143,15 @@
     <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"
@@ -167,9 +167,9 @@
                bmc.`specification`,
                bmc.`fuelTank`
         FROM anrui_base.base_vehicle_model bvm
-                 LEFT JOIN anrui_buscenter.`bus_order_vehicle` bov ON bvm.sid = bov.`vehicleSid`
-                 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
+                     LEFT JOIN anrui_buscenter.`bus_order_vehicle` bov ON bvm.sid = bov.`vehicleSid`
+                     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"
@@ -193,7 +193,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>
 
@@ -222,8 +222,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>
@@ -297,7 +297,7 @@
     <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">
@@ -310,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">
@@ -323,29 +323,47 @@
                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 bm.sid,
+        SELECT DISTINCT
+        bm.sid,
         bm.brandName,
         bm.vehicleAlias,
         bm.vehicleVersionValue,
         bm.fuelTypeValue,
         bm.gearboxTypeValue,
-        (SELECT count(*)
-        FROM base_vehicle bv
+        bvc.manufactorSettlementPrice,
+        (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.useOrg) 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
+        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,
+        ORDER BY bm.brandName,
         bm.productLine,
         bm.vehicleType,
         bm.vehicleVersion,

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

@@ -94,10 +94,12 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
         // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
         QueryWrapper<BaseVehmodelConfig> qw = new QueryWrapper<>();
 
-
         if (StringUtils.isNotBlank(query.getModelSid())) {
             qw.eq("bvm.sid", query.getModelSid());
         }
+        if (StringUtils.isNotBlank(query.getUseOrgSid())) {
+            qw.eq("bvm.useOrgSid", query.getUseOrgSid());
+        }
         return qw;
     }