From 856858c002dcf540b40f21c798013f1109a27476 Mon Sep 17 00:00:00 2001
From: ty <1577900710@qq.com>
Date: Fri, 12 Apr 2024 14:26:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=A1=A3=E6=A1=88bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D-ysj?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../access/mapper/OperAccessTaskMapper.xml         | 23 +++++++++-------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/mapper/OperAccessTaskMapper.xml b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/mapper/OperAccessTaskMapper.xml
index 9e60267..9806a10 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/mapper/OperAccessTaskMapper.xml
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/mapper/OperAccessTaskMapper.xml
@@ -218,24 +218,19 @@
     </select>
 
     <select id="getRepairBill" resultType="com.hnac.hzims.operational.access.vo.RepairBillVO">
-        SELECT t.EM_CODE AS emCode,p.`GRADE_CODE`,count(t.ID) AS frequency,
-        sum(m.NUMBER) AS amount,sum(t.ACT_HOURS) actHours,max(t.PLAN_START_TIME) AS recently
-        FROM hzims_oper_access_task t
-        LEFT JOIN hzims_oper_access_plan p ON t.PLAN_ID = p.ID
-        LEFT JOIN hzims_oper_access_material m ON t.ID = m.TASK_ID
+        SELECT T.EM_CODE AS EMCODE,P.`GRADE_CODE`,COUNT(DISTINCT T.ID) AS FREQUENCY, IFNULL(SUM(M.NUMBER),0) AS AMOUNT,
+        SUM(T.ACT_HOURS) ACTHOURS,MAX(T.PLAN_START_TIME) AS RECENTLY
+        FROM HZIMS_OPER_ACCESS_TASK T
+        LEFT JOIN HZIMS_OPER_ACCESS_PLAN P ON T.PLAN_ID = P.ID
+        LEFT JOIN (select TASK_ID,sum(NUMBER) NUMBER from HZIMS_OPER_ACCESS_MATERIAL where IS_DELETED = 0 GROUP BY TASK_ID) M ON T.ID = M.TASK_ID
         <where>
+            T.IS_DELETED = 0
             <if test="deviceCodes != null">
                 and t.EM_CODE in
-                <foreach collection="deviceCodes" item="code" index="index" open="(" close=")" separator=",">
-                    #{code}
-                </foreach>
-            </if>
-            <if test="startTime != null">
-                and t.PLAN_START_TIME &gt;= #{startTime}
-            </if>
-            <if test="endTime != null">
-                and t.PLAN_START_TIME &lt;= #{endTime}
+                <foreach collection="deviceCodes" item="code" index="index" open="(" close=")" separator=","> #{code} </foreach>
             </if>
+            <if test="startTime != null"> and t.PLAN_START_TIME >= #{startTime} </if>
+            <if test="endTime != null"> and t.PLAN_START_TIME &lt;= #{endTime} </if>
         </where>
         GROUP BY t.EM_CODE,p.`GRADE_CODE`
     </select>