From cf4c6c29f5ae6fec53aa0d9f52ef0c5a7520390f Mon Sep 17 00:00:00 2001
From: haozq <1611483981@qq.com>
Date: Fri, 17 Jan 2025 12:28:59 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E7=AE=97=E7=BB=9F=E8=AE=A1=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SupDispatchCarController.java  |  2 +-
 .../backstage/CarStatisticsMapper.xml         | 27 +++++++++++++++----
 .../backstage/SupDispatchCarMapper.xml        |  2 +-
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/bonus/gzcar/business/backstage/controller/SupDispatchCarController.java b/src/main/java/com/bonus/gzcar/business/backstage/controller/SupDispatchCarController.java
index b8cd5a1..366f747 100644
--- a/src/main/java/com/bonus/gzcar/business/backstage/controller/SupDispatchCarController.java
+++ b/src/main/java/com/bonus/gzcar/business/backstage/controller/SupDispatchCarController.java
@@ -150,7 +150,7 @@ public class SupDispatchCarController {
      * @return
      */
     @GetMapping("getOutPageList")
-    @DecryptAndVerify(decryptedClass = CarPlanOutVo.class)
+    @DecryptAndVerify(decryptedClass = CarNeedPlanVo.class)
     public PageInfo<CarNeedPlanVo> getOutPageList(EncryptedReq<CarNeedPlanVo> dto) {
         String userId= Objects.requireNonNull(UserUtil.getLoginUser()).getUserId().toString();
         dto.getData().setCreator(userId);dto.getData().setUserId(userId);
diff --git a/src/main/resources/mappers/business/backstage/CarStatisticsMapper.xml b/src/main/resources/mappers/business/backstage/CarStatisticsMapper.xml
index c7b68b3..a24141d 100644
--- a/src/main/resources/mappers/business/backstage/CarStatisticsMapper.xml
+++ b/src/main/resources/mappers/business/backstage/CarStatisticsMapper.xml
@@ -8,7 +8,11 @@
         if(csp.id is null,'未付','已付') status,pro.name proName ,cs.name supName ,cpo.type,
         sum(cpo.money)-sum(IFNULL(csp.money,0))  noPayMoney,cpo.manager ,cpo.create_time jbTime ,csa.create_time fkTime
         from car_plan_out cpo
-        left join car_slt_plan  csp on csp.plan_id=cpo.apply_id
+        LEFT JOIN (
+        SELECT sum(money) money,csd.out_id id,csd.slt_id
+        from car_slt_details csd
+        GROUP BY csd.out_id
+        ) csp  on csp.id=cpo.id
         left join car_slt_apply csa on csa.id=csp.slt_id
         left join car_plan_apply cpa on cpo.apply_id=cpa.id
         LEFT JOIN car_supplier cs on cpo.sup_id=cs.id
@@ -60,14 +64,19 @@
     <select id="getSltPageListByCompany" resultType="com.bonus.gzcar.business.backstage.entity.CarBalanceVo">
         SELECT count(1) porNum ,pro.bmname ,IFNULL(info.planNum,0) planNum,
         IFNULL(info.carnum,0) carNum,IFNULL(info.needNum ,0) needNum,IFNULL(info.payMoney,0) payMoney
-        ,IFNULL(info.money,0) money,IFNULL(info.noPayMoney,0) noPayMoney
+        ,IFNULL(info.money,0) money,IFNULL(info.noPayMoney,0) noPayMoney,
+        IFNULL(info.needNum ,0)- IFNULL(info.carnum,0) dpcNum
         FROM   bm_project pro
         left join(
         select  count(1) planNum ,pro.bmname,sum(cpa.dispatch_num)carnum ,sum(cpa.need_num) needNum,sum(IFNULL( csp.money,0)) payMoney,
         sum(IFNULL( cpo.money,0)) money,sum(IFNULL( cpo.money,0)) - sum(IFNULL( csp.money,0)) noPayMoney
         FROM  car_plan_apply cpa
         left join car_plan_apply_sup cpas on cpas.apply_id=cpa.id
-        left join car_plan_out cpo on cpo.apply_id=cpas.apply_id
+        left join(
+        SELECT sum(money) money, cpo.apply_id
+        from  car_plan_out cpo
+        GROUP BY  cpo.apply_id
+        )	cpo on cpo.apply_id=cpas.apply_id
         left join car_slt_plan csp on csp.plan_id=cpas.apply_id
         left join bm_project pro on pro.bid_id=cpa.pro_id
         where   cpa.status_type=1
@@ -91,7 +100,11 @@
         IFNULL(sum(cpo.money),0)-IFNULL(sum(csp.money),0) noPayMoney
         from car_plan_apply cpa
         left join car_plan_out cpo on cpo.apply_id=cpa.id
-        LEFT JOIN car_slt_plan csp on csp.plan_id=cpa.id
+        LEFT JOIN (
+        SELECT sum(money) money,csd.out_id id,csd.slt_id
+        from car_slt_details csd
+        GROUP BY csd.out_id
+        ) csp  on csp.id=cpo.id
         left join bm_project pro on pro.bid_id=cpa.pro_id
         WHERE pro.bmname=#{bmname}  and  cpa.status_type=1
         <if test="proName!=null and proName!=''">
@@ -106,7 +119,11 @@
         IFNULL( sum(cpo.money)-sum(IFNULL(csp.money,0)),0)  noPayMoney,cpa.need_num needNum
         from   car_plan_apply  cpa
         left join car_plan_out cpo on cpo.apply_id=cpa.id
-        left join car_slt_plan  csp on csp.plan_id=cpo.apply_id
+        LEFT JOIN (
+        SELECT sum(money) money,csd.out_id id,csd.slt_id
+        from car_slt_details csd
+        GROUP BY csd.out_id
+        ) csp  on csp.id=cpo.id
         LEFT JOIN car_supplier cs on cpo.sup_id=cs.id
         left join bm_project pro on pro.bid_id=cpa.pro_id
         where cpa.pro_id=#{proId}  and  cpa.status_type=1
diff --git a/src/main/resources/mappers/business/backstage/SupDispatchCarMapper.xml b/src/main/resources/mappers/business/backstage/SupDispatchCarMapper.xml
index 342754d..b4c19c3 100644
--- a/src/main/resources/mappers/business/backstage/SupDispatchCarMapper.xml
+++ b/src/main/resources/mappers/business/backstage/SupDispatchCarMapper.xml
@@ -231,7 +231,7 @@
         where model_table='car_plan_out'   AND type='到货确认单'
         GROUP BY  own_id
         )file on file.id=cpo.id
-        where 1=1
+        where 1=1 and  cpo.status=1
         <if test="keyWord!=null and keyWord!=''">
             and  (
                  cpa.code like concat('%',#{keyWord},'%')  or