From 2d5119747aa143063072fa9863bb76aa3da93b3c Mon Sep 17 00:00:00 2001
From: hanlinghao <2969694837@qq.com>
Date: Wed, 25 May 2022 19:18:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E8=AE=A2=E5=8D=95=E8=BD=A6?=
 =?UTF-8?q?=E5=9E=8B=E6=8A=A5=E4=BB=B7=E6=8E=A5=E5=8F=A3bug=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basemodelconfig/BaseModelConfigMapper.xml |  7 +++-
 .../BaseModelConfigService.java               |  5 ++-
 .../biz/basevehicle/BaseVehicleMapper.xml     | 38 ++++++++++++-------
 .../biz/basevehicle/BaseVehicleService.java   |  8 +++-
 .../BusDepositVehicleMapper.xml               |  2 +-
 .../busmaindeposit/BusMainDepositMapper.java  |  2 +-
 .../busmaindeposit/BusMainDepositMapper.xml   | 37 ++++++++++++++++++
 .../busmaindeposit/BusMainDepositService.java |  9 +----
 8 files changed, 83 insertions(+), 25 deletions(-)

diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml
index 37c762c2a2..ef7a965647 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml
@@ -519,7 +519,8 @@
         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(bvad.quantity) FROM bus_vehicle_apply_detail bvad WHERE bvad.vehicleSid = bvc.modelSid
+        ( 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
@@ -527,6 +528,10 @@
         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
         </where>
         ORDER BY
         nowCarNum DESC
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java
index e702c96aba..efdefdde01 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java
@@ -491,7 +491,7 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
         }
         String modelSid = pagerQuery.getParams().getModelSid();
         String useOrgSid = data.getSid();
-        AppModelConfigVo vo = baseMapper.getModelConfigList(modelSid,useOrgSid);
+        AppModelConfigVo vo = baseMapper.getModelConfigList(modelSid, useOrgSid);
         String type = "0002";
         String path = fileUploadComponent.getUrlPrefix();
         List<String> modelImages = baseVehicleAppendixService.selectBySid(type, modelSid, path);
@@ -523,6 +523,9 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
         vo.setPages((int) pages);
         //分公司配置列表查询
         for (AppModelConfigListVo appModelConfigListVo : appModelConfigListVos) {
+            if (StringUtils.isBlank(appModelConfigListVo.getProduceCarNum())) {
+                appModelConfigListVo.setProduceCarNum("0");
+            }
             String useOrg = data.getSid();
             List<AppMoreConfigVo> moreConfigVos = baseMapper.getCompanyModelList(appModelConfigListVo.getModelSid(), appModelConfigListVo.getConfigSid(), useOrg);
             for (AppMoreConfigVo moreConfigVo : moreConfigVos) {
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
index 13d37aeaee..4fedc8072f 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
@@ -481,21 +481,21 @@
     </select>
 
     <select id="getModelList" resultType="com.yxt.anrui.base.api.basevehicle.AppVehicleModelPriceVo">
-        SELECT bvm.sid AS modelSid,
+        SELECT DISTINCT
+        bvm.sid AS modelSid,
         bvm.vehicleAlias AS modelName,
         bvm.carBrand AS brandSid,
         bvm.brandName,
         bvm.vehicleVersionValue AS versionValue,
         bvm.fuelTypeValue,
         bvm.gearboxTypeValue,
-        bvc.priceValidity,
         (SELECT CONCAT(MIN(bvc.guidedPrice), '-', MAX(bvc.guidedPrice)) FROM base_vehmodel_config bvc WHERE bvc.modelSid
         = bvm.sid AND bvc.useOrgSid = #{useOrgSid}) AS guidedPrice,
         (SELECT count(*) FROM base_vehmodel_config bvc WHERE bvc.modelSid = bvm.sid AND bvc.useOrgSid = #{useOrgSid}) AS
         configNum,
         (SELECT count(*) FROM base_vehicle bv WHERE bv.modelSid = bvm.sid AND lockedState = '03' AND bv.useOrg =
         #{useOrgSid}) AS nowCarNum,
-        (SELECT SUM(bvad.quantity)
+        (SELECT SUM(cast(bvad.quantity as signed)) as quantity
         FROM bus_vehicle_apply_detail bvad
         WHERE bvad.vehicleSid = bvm.sid) AS produceCarNum
         FROM base_vehicle_model bvm
@@ -545,16 +545,25 @@
     </select>
 
     <select id="getNowModelList" resultType="com.yxt.anrui.base.api.basevehicle.AppBaseVehicleNowModelVo">
-        SELECT bvm.sid                                                                                   AS modelSid,
-               bvm.vehicleAlias                                                                          AS modelName,
+        SELECT bvm.sid                                                                                         AS modelSid,
+               bvm.vehicleAlias                                                                                AS modelName,
                bvm.brandName,
-               bvm.carBrand                                                                              AS brandSid,
-               bvm.vehicleVersionValue                                                                   AS versionValue,
+               bvm.carBrand                                                                                    AS brandSid,
+               bvm.vehicleVersionValue                                                                         AS versionValue,
                bvm.fuelTypeValue,
                bvm.gearboxTypeValue,
-               ( SELECT CONCAT(MIN(bv.guidedPrice), '-', MAX(bv.guidedPrice)) FROM base_vehicle bv  WHERE bv.modelSid = bvm.sid AND bv.useOrg = #{useOrgSid})                             AS guidedPrice,
-               (SELECT count(*) FROM base_vehicle bv WHERE bv.modelSid = bvm.sid AND bv.useOrg =  #{useOrgSid})      AS configNum,
-               (SELECT count(*) FROM base_vehicle bv WHERE bv.modelSid = bvm.sid AND lockedState = '03') AS nowCarNum
+               (SELECT CONCAT(MIN(bv.guidedPrice), '-', MAX(bv.guidedPrice))
+                FROM base_vehicle bv
+                WHERE bv.modelSid = bvm.sid
+                  AND bv.useOrg = #{useOrgSid})                                                                AS guidedPrice,
+               (SELECT count(*)
+                FROM base_vehicle bv
+                WHERE bv.modelSid = bvm.sid
+                  AND bv.useOrg = #{useOrgSid})                                                                AS configNum,
+               (SELECT count(*)
+                FROM base_vehicle bv
+                WHERE bv.modelSid = bvm.sid
+                  AND lockedState = '03')                                                                      AS nowCarNum
         FROM base_vehicle bv
                  LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
             ${ew.customSqlSegment}
@@ -712,14 +721,17 @@
           AND bvc.useOrgSid = #{useOrg}
     </select>
     <select id="getModelOrderCarList" resultType="com.yxt.anrui.base.api.basevehicle.AppBaseNowProduceCarVo">
-        select bvo.orderNo AS orderId,
+        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,
-        bvo.platformNo AS `number`
-        from bus_vehicle_order bvo
+        bvad.quantity as `number`
+        FROM
+        bus_vehicle_order bvo
+        left join bus_vehicle_apply_detail bvad on bvo.purchaseApplyMediumModelSid = bvad.sid
         <where>
             ${ew.sqlSegment}
         </where>
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
index 89e498a4c9..03b0871dcb 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
@@ -824,7 +824,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         }
         IPage<AppBaseVehicleNowModelQuery> page = PagerUtil.queryToPage(pagerQuery);
         QueryWrapper<AppBaseVehicleNowModelVo> qw = nowModelQueryWrapper(pagerQuery.getParams());
-        IPage<AppBaseVehicleNowModelVo> nowModelList = baseMapper.getNowModelList(page, qw ,data.getSid());
+        IPage<AppBaseVehicleNowModelVo> nowModelList = baseMapper.getNowModelList(page, qw, data.getSid());
         List<AppBaseVehicleNowModelVo> records = nowModelList.getRecords();
         for (AppBaseVehicleNowModelVo record : records) {
             record.setModelImage("www.baidu.com");
@@ -1315,6 +1315,12 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             if (StringUtils.isNotBlank(query.getNames())) {
                 qw.like("bvo.orderNo", query.getNames());// 订单编号
             }
+            if (StringUtils.isNotBlank(query.getModelSid())) {
+                qw.eq("bvad.vehicleSid", query.getModelSid());// 订单编号
+            }
+            if (StringUtils.isNotBlank(query.getConfigSid())) {
+                qw.eq("bvad.configSid", query.getConfigSid());// 订单编号
+            }
             if (StringUtils.isNotBlank(query.getUseOrg())) {//分公司
                 qw.eq("bvo.useOrg", query.getUseOrg());
             }
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleMapper.xml
index 0074c29027..5d4058a40f 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleMapper.xml
@@ -51,7 +51,7 @@
         SELECT bdv.brandName                                                                   AS brand,
                bdv.modelName                                                                   AS carName,
                bdv.remarks,
-               bdv.reserve_deposit_date                                                        AS depositDate,
+               bdv.reserve_deposit_date                                                        AS reserveDate,
                bdv.reserve_position                                                            AS location,
                bdv.reserve_price                                                               AS price,
                bdv.modelSid,
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.java
index 2d6b87163f..046fea7052 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.java
@@ -72,7 +72,7 @@ public interface BusMainDepositMapper extends BaseMapper<BusMainDeposit> {
      * @param qw
      * @return
      */
-    IPage<AppBusMainDepositVo> getVirtualOrders(IPage<AppBusMainDepositQuery> page, @Param(Constants.WRAPPER) Wrapper<AppBusMainDepositVo> qw);
+    IPage<AppBusMainDepositVo> getVirtualOrders(IPage<AppBusMainDepositQuery> page, @Param(Constants.WRAPPER) Wrapper<AppBusMainDepositVo> qw, @Param("name") String name);
 
     int selectCountByOrgSid(@Param("billsType") String billsType, @Param("date") String date, @Param("orgSid") String orgSid);
 
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml
index 2bcfbe9703..e7889cd06d 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml
@@ -46,7 +46,44 @@
         LEFT JOIN bus_deposit bd ON bmd.sid = bd.billSid
         <where>
             ${ew.sqlSegment}
+            <if test="name != '' and name != null ">
+                and bmd.billNo LIKE concat('%', #{name}, '%')
+            </if>
         </where>
+        <if test="name != '' and name != null ">
+            UNION ALL
+            SELECT bmd.sid AS virtualOrderSid,
+            bmd.billNo AS virtualOrderId,
+            bmd.createDate AS virtualOrderDate,
+            bmd.depositBillTypeKey as virtualOrderType,
+            bmd.staffName AS sellerName,
+            bmd.remarks
+            FROM bus_main_deposit bmd
+            LEFT JOIN bus_deposit_vehicle_customer bdvc ON bmd.sid = bdvc.billSid
+            LEFT JOIN bus_deposit bd ON bmd.sid = bd.billSid
+            <where>
+                ${ew.sqlSegment}
+                <if test="name != '' and name != null ">
+                    and bdvc.customerName LIKE concat('%', #{name}, '%')
+                </if>
+            </where>
+            UNION ALL
+            SELECT bmd.sid AS virtualOrderSid,
+            bmd.billNo AS virtualOrderId,
+            bmd.createDate AS virtualOrderDate,
+            bmd.depositBillTypeKey as virtualOrderType,
+            bmd.staffName AS sellerName,
+            bmd.remarks
+            FROM bus_main_deposit bmd
+            LEFT JOIN bus_deposit_vehicle_customer bdvc ON bmd.sid = bdvc.billSid
+            LEFT JOIN bus_deposit bd ON bmd.sid = bd.billSid
+            <where>
+                ${ew.sqlSegment}
+                <if test="name != '' and name != null ">
+                    and bd.draweeName LIKE concat('%', #{name}, '%')
+                </if>
+            </where>
+        </if>
     </select>
 
     <delete id="deleteVirtualOrder">
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
index 9b51fd5bbe..f2a276bc77 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
@@ -586,7 +586,8 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         String staffSid = userOrgInfoByUser.getData().getStaffSid();
         pagerQuery.getParams().setStaffSid(staffSid);
         QueryWrapper<AppBusMainDepositVo> qw = aaQueryWrapper(pagerQuery.getParams());
-        IPage<AppBusMainDepositVo> iPage = baseMapper.getVirtualOrders(page, qw);
+        AppBusMainDepositQuery params = pagerQuery.getParams();
+        IPage<AppBusMainDepositVo> iPage = baseMapper.getVirtualOrders(page, qw,params.getName());
         for (AppBusMainDepositVo record : iPage.getRecords()) {
             String virtualOrderSid = record.getVirtualOrderSid();
             int count = baseMapper.selByBillSidCount(virtualOrderSid);
@@ -635,12 +636,6 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         if (StringUtils.isNotBlank(query.getStaffSid())) {
             qw.eq("bmd.staffSid", query.getStaffSid());
         }
-        if (StringUtils.isNotBlank(query.getName())) {
-            qw.like("bd.draweeName", query.getName());
-        }
-        if (StringUtils.isNotBlank(query.getName())) {
-            qw.like("bdvc.customerName", query.getName());
-        }
         if (StringUtils.isNotBlank(query.getType())) {
             qw.eq("bmd.depositBillTypeKey", query.getType());
         }