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

---
 .../service/HomeIndexServiceImpl.java         |  4 ++--
 .../business/backstage/HomeIndexMapper.xml    | 22 ++++++++++++++++---
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/bonus/gzcar/business/backstage/service/HomeIndexServiceImpl.java b/src/main/java/com/bonus/gzcar/business/backstage/service/HomeIndexServiceImpl.java
index e61f138..3cd8535 100644
--- a/src/main/java/com/bonus/gzcar/business/backstage/service/HomeIndexServiceImpl.java
+++ b/src/main/java/com/bonus/gzcar/business/backstage/service/HomeIndexServiceImpl.java
@@ -109,8 +109,8 @@ public class HomeIndexServiceImpl implements HomeIndexService {
                 log.info("数据概览-应付款金额{}", Thread.currentThread().getName());
                 IndexVo  indexVo = mapper.getNoPayMoney(dto);
                 List<Object> dataList = new ArrayList<>(2);
-                dataList.add(0, 0.0);
-                dataList.add(1, 0);
+                dataList.add(0, indexVo.getMoney());
+                dataList.add(1, indexVo.getNum());
                 return dataList;
             });
             fList = future.get();
diff --git a/src/main/resources/mappers/business/backstage/HomeIndexMapper.xml b/src/main/resources/mappers/business/backstage/HomeIndexMapper.xml
index 5752781..14ed22e 100644
--- a/src/main/resources/mappers/business/backstage/HomeIndexMapper.xml
+++ b/src/main/resources/mappers/business/backstage/HomeIndexMapper.xml
@@ -205,13 +205,29 @@
         SELECT count(csp.plan_id) num,sum(csp.money) money
         from car_slt_plan csp
         left join car_slt_apply sla on csp.slt_id=sla.id
-        <where>
+        where sla.id is not null
             <if test="startTime!=null and startTime!='' and  endTime!=null and endTime!=''">
                 AND DATE_FORMAT(sla.create_time,'%Y-%m-%d') BETWEEN #{params.startTime} AND #{params.endTime}
             </if>
-        </where>
     </select>
     <select id="getNoPayMoney" resultType="com.bonus.gzcar.business.backstage.entity.IndexVo">
-
+        SELECT sum(a.money),sum(a.num)
+            from (
+               SELECT sum(cpo.money) money ,0 num
+                  from car_plan_out cpo
+                  left join car_slt_details csd on csd.out_id=cpo.id
+                  where csd.id is null  AND cpo.status=1
+                    <if test="startTime!=null and startTime!='' and  endTime!=null and endTime!=''">
+                        AND DATE_FORMAT(cpo.create_time,'%Y-%m-%d') BETWEEN #{params.startTime} AND #{params.endTime}
+                    </if>
+                  union ALL
+                  SELECT 0,count(DISTINCT cpo.apply_id) num
+                  from car_plan_out  cpo
+                  left join car_slt_details csp on cpo.id=csp.out_id
+                  where  csp.id is null AND cpo.status=1
+                    <if test="startTime!=null and startTime!='' and  endTime!=null and endTime!=''">
+                        AND DATE_FORMAT(cpo.create_time,'%Y-%m-%d') BETWEEN #{params.startTime} AND #{params.endTime}
+                    </if>
+             )a
     </select>
 </mapper>
\ No newline at end of file