From 6e908e6b45a22fde0ded5893d9fd1a91e1f4c976 Mon Sep 17 00:00:00 2001
From: dongdingding <207595406@qq.com>
Date: Tue, 7 Jan 2025 13:34:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E4=BA=A7=E5=AF=BC=E5=87=BA=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/AssetTaskDao.xml      | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml b/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml
index 8dbccfa..626910e 100644
--- a/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml
+++ b/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml
@@ -243,10 +243,13 @@
           and id = #{assetId}
     </select>
     <select id="dwHc" resultType="com.ruoyi.tc.entity.response.AssetdwHcResponse">
+        select
+        h.dwmc,h.task_id,h.latest_create_time,h.task_deadline,h.total,h.checked,h.notChecked,h.dsp,h.shthcs,h.taskStatus
+        from(
         SELECT
         s.dwmc,
         s.task_id,
-        CURRENT_TIMESTAMP AS latest_create_time,  -- 使用当前时间
+        CURRENT_TIMESTAMP AS latest_create_time, -- 使用当前时间
         b.task_deadline,
         SUM(s.total) AS total,
         SUM(s.checked) AS checked,
@@ -402,14 +405,14 @@
         ssdw,
         task_id
         ) AS s left join asset_task b on s.task_id=b.id
+        GROUP BY
+        s.dwmc ,
+        s.task_id)h
         <where>
             <if test="req.taskStatus != null and  req.taskStatus != ''">
-                b.task_status = #{req.taskStatus}
+                h.taskStatus = #{req.taskStatus}
             </if>
         </where>
-        GROUP BY
-        s.dwmc ,
-        s.task_id
 
 
     </select>