From 3dc714284a95fe9677a964ec039b2b547547e30d Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 05 十一月 2024 11:20:37 +0800
Subject: [PATCH] 工单异步获取图片、工单导出时间参数bug

---
 ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
index 85f8c3d..655bd26 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
@@ -105,7 +105,7 @@
         camera_dept, hybm, lxbm,d.dept_id, d.dept_name from t_monitor m
         left join t_yw_point p on m.serial_number = p.serial_number
         left join sys_dept d on p.dept_id = d.dept_id
-        where m.serial_number in
+        where p.examine_status = 1 and  m.serial_number in
         <foreach collection="list" separator="," item="id" open="(" close=")">
             #{id}
         </foreach>
@@ -369,7 +369,8 @@
         IFNULL(SUM(IF(p.online = 1, 1, 0)), 0) AS totalMembers,
         IFNULL(SUM(IF(p.online = -1, 1, 0)), 0) AS postsPercentage,
         IFNULL(SUM(IF(p.online = 0, 1, 0)), 0) AS unknownNumbers,
-        IFNULL(ROUND(SUM(IF(p.online = 1 , 1, 0)) / count(*) * 100, 2), 0) as viewsPercentage FROM t_monitor m
+        IFNULL(ROUND(SUM(IF(p.online = 1 , 1, 0)) / count(*) * 100, 2), 0) as viewsPercentage
+        FROM t_monitor m
         left join t_yw_point p on m.serial_number = p.serial_number
         left join sys_dept d on p.dept_id = d.dept_id and d.del_flag = 0
         <where>
@@ -385,12 +386,13 @@
     </select>
 
     <select id="recoveryException" resultType="java.util.Map">
-        SELECT count(*)                                                          AS totalPosts,
-               IFNULL(SUM(IF(p.online = 1, 1, 0)), 0)                            AS totalMembers,
-               IFNULL(SUM(IF(p.online = 0, 1, 0)), 0)                            AS postsPercentage,
-               IFNULL(ROUND(SUM(IF(p.online = 1, 1, 0)) / count(*) * 100, 2), 0) as viewsPercentage
-        FROM t_monitor t
-        LEFT JOIN t_yw_point p ON t.serial_number = p.serial_number
+        SELECT count(*) AS totalPosts,
+        IFNULL(SUM(IF(p.online = 1, 1, 0)), 0) AS totalMembers,
+        IFNULL(SUM(IF(p.online = -1, 1, 0)), 0) AS postsPercentage,
+        IFNULL(SUM(IF(p.online = 0, 1, 0)), 0) AS unknownNumbers,
+        IFNULL(ROUND(SUM(IF(p.online = 1 , 1, 0)) / count(*) * 100, 2), 0) as viewsPercentage
+        FROM t_monitor m
+        left join t_yw_point p on m.serial_number = p.serial_number
         left join sys_dept d on p.dept_id = d.dept_id and d.del_flag = 0
         <where>
             p.examine_status = 1
@@ -398,6 +400,9 @@
              <if test="provinceTag!=null">
                 and p.province_tag = #{provinceTag}
              </if>
+            <if test="deptTag!=null">
+                and p.dept_tag = #{deptTag}
+            </if>
         ${params.dataScope}
         </where>
     </select>

--
Gitblit v1.8.0