From 4f381357981972011de8b14ebf2b5902fdbe9226 Mon Sep 17 00:00:00 2001
From: haozq <1611483981@qq.com>
Date: Mon, 20 Jan 2025 16:31:07 +0800
Subject: [PATCH] =?UTF-8?q?bug=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/HomeIndexServiceImpl.java         |  3 --
 .../business/backstage/HomeIndexMapper.xml    | 44 ++++++++++++++++++-
 2 files changed, 43 insertions(+), 4 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 79bf63e..e913e55 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
@@ -457,10 +457,7 @@ public class HomeIndexServiceImpl implements HomeIndexService {
         }
         try {
             list = mapper.getDispatchDetails(dto);
-            for (HomeDispatchDetailVo vo : list) {
 
-                // 金额待计算
-            }
         } catch (Exception e) {
             log.error(e.toString(), e);
         }
diff --git a/src/main/resources/mappers/business/backstage/HomeIndexMapper.xml b/src/main/resources/mappers/business/backstage/HomeIndexMapper.xml
index d3e1235..8f1571e 100644
--- a/src/main/resources/mappers/business/backstage/HomeIndexMapper.xml
+++ b/src/main/resources/mappers/business/backstage/HomeIndexMapper.xml
@@ -251,8 +251,50 @@
     <!--首页-二级页面-派车详情-->
     <select id="getDispatchDetails"
             resultType="com.bonus.gzcar.business.backstage.entity.HomeDispatchDetailVo">
+        select cpod.id,  cpod.out_id outId, cpod.apply_id planId,
+               cpod. model_id modelId,  cpod.plan_type typeName,  cpod.contract_id contractId,
+               cpod.sup_id supId,  cpod.car_id carId,cpod.goods_name goodsName, cpod.gls,
+               cpod.start_address startAddress, cpod.end_address endAddress,
+               cpod.price_id priceId,cpod.gls_price glsPrice,  cpod.gls_money glsMoney,  cpod.use_address useAddress,
+               cpod.use_day planDay,cpod.driver_id driverUserId,  cpod.czy_id operaUserId,
+               cpod.day_price dayPrice,  cpod.month_price monthPrice,   cpod.jc_gls jcGls,
+               cpod.jc_price jcMoney,   cpod.dc_money dcMoney,   cpod.dc_unit dcUnit,
+               cmti.unit,cpa.code,pro.`name` proName,cs.`name` supName,cpo.out_time dispatchDay,
+               cpod.es_cost money,  cpod.car_out_id carOutId,cmti.model,cmti.type,cmti.name,cpod.car_num carNum,csi.ton,
+               day_or_m isDayOrMonth,cpod.remark,cpd.need_day needDay,
+               cpa.code planCode,cpa.pro_id proId,
+               if(csp.id is null,'未支付','已支付')  payStatus
+        from car_plan_out_details cpod
+                 LEFT JOIN car_plan_out cpo on cpod.out_id=cpo.id
+                 left join car_plan_details cpd on cpd.apply_id=cpod.apply_id and cpd.model_id=cpod.model_id
+                 LEFT JOIN car_ma_type_info cmti on cmti.id=cpod.model_id
+                 left join car_plan_apply cpa on cpa.id =cpod.apply_id
+                 left join bm_project pro on pro.bid_id=cpa.pro_id
+                 left join car_supplier_info  csi   on csi.id= cpod.car_id
+                 left join car_plan_apply_sup cpas on cpd.apply_id=cpas.apply_id
+                 LEFT JOIN car_supplier cs on cs.id=cpas.sup_id
+                 LEFT JOIN car_slt_plan csp on csp.plan_id=cpa.id
+        where cpo.`status`=1
+            <if test="type!=null and type!=''">
+                 and cpod.plan_type=#{type}
+            </if>
+            <if test="name!=null and name!=''">
+                and cmti.`name` like concat('%',#{name},'%')
+            </if>
+            <if test="model!=null and model!=''">
+                and cmti.`model` like concat('%',#{model},'%')
+            </if>
+            <if test="code!=null and code!=''">
+                and cpa.code like concat('%',#{code},'%')
+            </if>
+            <if test="supName!=null and supName!=''">
+                and cs.`name`  like concat('%',#{supName},'%')
+            </if>
+            <if test="proName!=null and proName!=''">
+                and pro.`name` like concat('%',#{proName},'%')
+            </if>
 
-    </select>
+        </select>
     <select id="getPayMoney" resultType="com.bonus.gzcar.business.backstage.entity.IndexVo">
         SELECT count(csp.plan_id) num,sum(csp.money) money
         from car_slt_plan csp