From c8fa0ca06f17afec6b600f1d37d0aa3c2b278621 Mon Sep 17 00:00:00 2001
From: dongdingding <207595406@qq.com>
Date: Mon, 6 Jan 2025 10:39:44 +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

---
 .../tc/entity/response/AssetdwHcResponse.java |  8 +++----
 .../main/resources/mapper/AssetTaskDao.xml    | 21 ++++++++++++-------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetdwHcResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetdwHcResponse.java
index ed81d69..f5014a3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetdwHcResponse.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetdwHcResponse.java
@@ -41,15 +41,15 @@ public class AssetdwHcResponse {
     /**
      * 待核查
      */
-    @Excel(name = "待核查")
-    @ApiModelProperty("待核查")
+    @Excel(name = "待核查数量")
+    @ApiModelProperty("待核查数量")
     private Integer notChecked;
 
     /**
      * 待审批
      */
-    @Excel(name = "待审批")
-    @ApiModelProperty("待审批")
+    @Excel(name = "待审批数量")
+    @ApiModelProperty("待审批数量")
     private Integer dsp;
     /**
      * 完成状态
diff --git a/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml b/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml
index 11d4040..9ff3ce1 100644
--- a/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml
+++ b/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml
@@ -586,6 +586,8 @@
         b.task_deadline,
         SUM(s.total) AS total,
         SUM(s.checked) AS checked,
+        SUM( s.notChecked ) AS notChecked,
+        SUM( s.dsp ) AS dsp,
         COALESCE(SUM(s.returned), 0) AS shthcs,
         ROUND(
         CASE
@@ -624,6 +626,7 @@
         task_id,
         MAX(create_time) AS latest_create_time,
         SUM(CASE WHEN STATUS = 0 THEN 1 ELSE 0 END) AS notChecked,
+        SUM( CASE WHEN STATUS = 1 THEN 1 ELSE 0 END ) AS dsp,
         SUM(CASE WHEN STATUS = 3 OR STATUS = 5 THEN 1 ELSE 0 END) AS checked,
         SUM(count) AS returned
         FROM
@@ -647,13 +650,14 @@
         task_id,
         MAX(create_time) AS latest_create_time,
         SUM(CASE WHEN STATUS = 0 THEN 1 ELSE 0 END) AS notChecked,
+        SUM( CASE WHEN STATUS = 1 THEN 1 ELSE 0 END ) AS dsp,
         SUM(CASE WHEN STATUS = 3 OR STATUS = 5 THEN 1 ELSE 0 END) AS checked,
         SUM(count) AS returned
         FROM
         asset_mini_programs_cp
         <where>
             <if test="req.dwmc!=null and req.dwmc!='' ">
-                and ssdw like concat('%',#{req.ssdw},'%')
+                and ssdw like concat('%',#{req.dwmc},'%')
             </if>
 
             <if test="req.taskId!=null and req.taskId!='' ">
@@ -670,13 +674,14 @@
         task_id,
         MAX(create_time) AS latest_create_time,
         SUM(CASE WHEN STATUS = 0 THEN 1 ELSE 0 END) AS notChecked,
+        SUM( CASE WHEN STATUS = 1 THEN 1 ELSE 0 END ) AS dsp,
         SUM(CASE WHEN STATUS = 3 OR STATUS = 5 THEN 1 ELSE 0 END) AS checked,
         SUM(count) AS returned
         FROM
         asset_app_cp
         <where>
             <if test="req.dwmc!=null and req.dwmc!='' ">
-                and ssdw like concat('%',#{req.ssdw},'%')
+                and ssdw like concat('%',#{req.dwmc},'%')
             </if>
 
             <if test="req.taskId!=null and req.taskId!='' ">
@@ -684,21 +689,21 @@
             </if>
         </where>
         GROUP BY
-        ssdw ,
-        task_id
+        ssdw ,task_id
         UNION ALL
         SELECT ssdw AS dwmc,
         COUNT(*) AS total,
         task_id,
         MAX(create_time) AS latest_create_time,
         SUM(CASE WHEN STATUS = 0 THEN 1 ELSE 0 END) AS notChecked,
+        SUM( CASE WHEN STATUS = 1 THEN 1 ELSE 0 END ) AS dsp,
         SUM(CASE WHEN STATUS = 3 OR STATUS = 5 THEN 1 ELSE 0 END) AS checked,
         SUM(count) AS returned
         FROM
         asset_official_account_cp
         <where>
             <if test="req.dwmc!=null and req.dwmc!='' ">
-                and ssdw like concat('%',#{req.ssdw},'%')
+                and ssdw like concat('%',#{req.dwmc},'%')
             </if>
 
             <if test="req.taskId!=null and req.taskId!='' ">
@@ -715,13 +720,14 @@
         task_id,
         MAX(create_time) AS latest_create_time,
         SUM(CASE WHEN STATUS = 0 THEN 1 ELSE 0 END) AS notChecked,
+        SUM( CASE WHEN STATUS = 1 THEN 1 ELSE 0 END ) AS dsp,
         SUM(CASE WHEN STATUS = 3 OR STATUS = 5 THEN 1 ELSE 0 END) AS checked,
         SUM(count) AS returned
         FROM
         asset_email_cp
         <where>
             <if test="req.dwmc!=null and req.dwmc!='' ">
-                and ssdw like concat('%',#{req.ssdw},'%')
+                and ssdw like concat('%',#{req.dwmc},'%')
             </if>
 
             <if test="req.taskId!=null and req.taskId!='' ">
@@ -739,8 +745,7 @@
         </where>
         GROUP BY
         s.dwmc ,
-        s.task_id,
-        s.latest_create_time
+        s.task_id
     </select>
     <select id="dwHcBl" resultType="com.ruoyi.tc.entity.response.AssetdwHcBlResponse"
             parameterType="com.ruoyi.tc.entity.request.AssetdwHcRequest">