From d914119d592dcb9df424f8943d2683b924e3a872 Mon Sep 17 00:00:00 2001
From: z <ZhouYu0323@126.com>
Date: Mon, 17 Feb 2025 15:19:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8D=95=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../taskdispatch/TaskDispatchMapper.xml       | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/taskdispatch/TaskDispatchMapper.xml b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/taskdispatch/TaskDispatchMapper.xml
index e6f7a8f..51e79ad 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/taskdispatch/TaskDispatchMapper.xml
+++ b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/taskdispatch/TaskDispatchMapper.xml
@@ -19,16 +19,15 @@
 
 
 
-        select c.code,d.end_time project_end_time,d.name from pro_task_dispatch c,d.name,(SELECT b.*,c.name as name, COALESCE(SUM(a.amount), 0) AS total_amount
-                                                                            FROM pro_task_dispatch_detail b
-                                                                                     LEFT JOIN pro_task_report a ON a.dispatch_detail_id = b.id
-                                                                                     LEFT JOIN base_procedure c ON b.procedure_id=c.id
-                                                                            WHERE b.end_time &lt;= DATE_ADD(CURDATE(), INTERVAL 1 DAY) and b.tenant_id =#{param1} and b.procedure_status!=2
-                                                                            GROUP BY b.id
-                                                                            HAVING COALESCE(SUM(a.amount), 0) &lt; b.amount) d
+        select c.code,d.end_time project_end_time,d.name from pro_task_dispatch c,(SELECT b.*,c.name as name, COALESCE(SUM(a.amount), 0) AS total_amount
+        FROM pro_task_dispatch_detail b
+        LEFT JOIN pro_task_report a ON a.dispatch_detail_id = b.id
+        LEFT JOIN base_procedure c ON b.procedure_id=c.id
+        WHERE b.end_time &lt;= DATE_ADD(CURDATE(), INTERVAL 1 DAY) and b.tenant_id =#{param1} and b.procedure_status!=2
+        GROUP BY b.id
+        HAVING COALESCE(SUM(a.amount), 0) &lt; b.amount) d
         where d.dispatch_id =c.id and c.dispatch_type ='ASSEMBLE'
 
-
     </select>
     <select id="getzplist1"
             parameterType="Long"
@@ -38,7 +37,7 @@
 
 
 
-        select c.code,d.end_time project_end_time from pro_task_dispatch c,(SELECT b.*, COALESCE(SUM(a.amount), 0) AS total_amount
+        select c.code,d.end_time project_end_time,d.creator from pro_task_dispatch c,(SELECT b.*, COALESCE(SUM(a.amount), 0) AS total_amount
                                                                             FROM pro_task_dispatch_detail b
                                                                                      LEFT JOIN pro_task_report a ON a.dispatch_detail_id = b.id
                                                                             WHERE b.end_time &lt;= DATE_ADD(CURDATE(), INTERVAL 1 DAY)
@@ -55,7 +54,7 @@
 
 
 
-        select c.code,d.end_time project_end_time from pro_task_dispatch c,d.name,(SELECT b.*, ,c.name as name,COALESCE(SUM(a.amount), 0) AS total_amount
+        select c.code,d.end_time project_end_time,d.name from pro_task_dispatch c,(SELECT b.*,c.name as name,COALESCE(SUM(a.amount), 0) AS total_amount
         FROM pro_task_dispatch_detail b
         LEFT JOIN pro_task_report a ON a.dispatch_detail_id = b.id
         LEFT JOIN base_procedure c ON b.procedure_id=c.id