From 10ac11005a08b374bbb5a4965f83814b9b8e6b0c Mon Sep 17 00:00:00 2001
From: LokerL <loker80@qq.com>
Date: Mon, 4 Nov 2024 15:30:34 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix:=20=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E7=94=9F=E6=88=90-=E5=8E=82=E7=95=8C=E5=9C=A8=E7=BA=BF?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8A=A5=E8=AD=A6=E6=AC=A1=E6=95=B0=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/oil/ThDeviceReportMapper.xml      | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/ThDeviceReportMapper.xml b/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/ThDeviceReportMapper.xml
index 695aab0..64b28df 100644
--- a/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/ThDeviceReportMapper.xml
+++ b/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/ThDeviceReportMapper.xml
@@ -212,25 +212,25 @@
     </select>
 
 
-    <!--  选择 某年year，每个deptId下的所有设备的每个月的超限次数(ds不在dbz和gbz范围内的行)  -->
+    <!--  选择 某年year，每个deptId下的所有设备的每个月的报警次数(d.zt = '一级报警' OR d.zt = '二级报警')  -->
     <select id="selectOverLimitCountByYearAndDeptId" parameterType="map" resultType="map">
     SELECT d.sn,
            td.address,
            p.dept_name   as "p",
            pp.dept_name  as "pp",
            ppp.dept_name as "ppp",
-           SUM(CASE WHEN TO_CHAR(d.report_time, 'MM') = '01' AND (TO_NUMBER(d.ds) &gt; TO_NUMBER(d.gbz) OR TO_NUMBER(d.ds) &lt; TO_NUMBER(d.dbz)) THEN 1 ELSE 0 END) AS month1,
-           SUM(CASE WHEN TO_CHAR(d.report_time, 'MM') = '02' AND (TO_NUMBER(d.ds) &gt; TO_NUMBER(d.gbz) OR TO_NUMBER(d.ds) &lt; TO_NUMBER(d.dbz)) THEN 1 ELSE 0 END) AS month2,
-           SUM(CASE WHEN TO_CHAR(d.report_time, 'MM') = '03' AND (TO_NUMBER(d.ds) &gt; TO_NUMBER(d.gbz) OR TO_NUMBER(d.ds) &lt; TO_NUMBER(d.dbz)) THEN 1 ELSE 0 END) AS month3,
-           SUM(CASE WHEN TO_CHAR(d.report_time, 'MM') = '04' AND (TO_NUMBER(d.ds) &gt; TO_NUMBER(d.gbz) OR TO_NUMBER(d.ds) &lt; TO_NUMBER(d.dbz)) THEN 1 ELSE 0 END) AS month4,
-           SUM(CASE WHEN TO_CHAR(d.report_time, 'MM') = '05' AND (TO_NUMBER(d.ds) &gt; TO_NUMBER(d.gbz) OR TO_NUMBER(d.ds) &lt; TO_NUMBER(d.dbz)) THEN 1 ELSE 0 END) AS month5,
-           SUM(CASE WHEN TO_CHAR(d.report_time, 'MM') = '06' AND (TO_NUMBER(d.ds) &gt; TO_NUMBER(d.gbz) OR TO_NUMBER(d.ds) &lt; TO_NUMBER(d.dbz)) THEN 1 ELSE 0 END) AS month6,
-           SUM(CASE WHEN TO_CHAR(d.report_time, 'MM') = '07' AND (TO_NUMBER(d.ds) &gt; TO_NUMBER(d.gbz) OR TO_NUMBER(d.ds) &lt; TO_NUMBER(d.dbz)) THEN 1 ELSE 0 END) AS month7,
-           SUM(CASE WHEN TO_CHAR(d.report_time, 'MM') = '08' AND (TO_NUMBER(d.ds) &gt; TO_NUMBER(d.gbz) OR TO_NUMBER(d.ds) &lt; TO_NUMBER(d.dbz)) THEN 1 ELSE 0 END) AS month8,
-           SUM(CASE WHEN TO_CHAR(d.report_time, 'MM') = '09' AND (TO_NUMBER(d.ds) &gt; TO_NUMBER(d.gbz) OR TO_NUMBER(d.ds) &lt; TO_NUMBER(d.dbz)) THEN 1 ELSE 0 END) AS month9,
-           SUM(CASE WHEN TO_CHAR(d.report_time, 'MM') = '10' AND (TO_NUMBER(d.ds) &gt; TO_NUMBER(d.gbz) OR TO_NUMBER(d.ds) &lt; TO_NUMBER(d.dbz)) THEN 1 ELSE 0 END) AS month10,
-           SUM(CASE WHEN TO_CHAR(d.report_time, 'MM') = '11' AND (TO_NUMBER(d.ds) &gt; TO_NUMBER(d.gbz) OR TO_NUMBER(d.ds) &lt; TO_NUMBER(d.dbz)) THEN 1 ELSE 0 END) AS month11,
-           SUM(CASE WHEN TO_CHAR(d.report_time, 'MM') = '12' AND (TO_NUMBER(d.ds) &gt; TO_NUMBER(d.gbz) OR TO_NUMBER(d.ds) &lt; TO_NUMBER(d.dbz)) THEN 1 ELSE 0 END) AS month12
+           SUM(CASE WHEN TO_CHAR(d.report_time, 'MM') = '01' AND (d.zt = '一级报警' OR d.zt = '二级报警') THEN 1 ELSE 0 END) AS month1,
+           SUM(CASE WHEN TO_CHAR(d.report_time, 'MM') = '02' AND (d.zt = '一级报警' OR d.zt = '二级报警') THEN 1 ELSE 0 END) AS month2,
+           SUM(CASE WHEN TO_CHAR(d.report_time, 'MM') = '03' AND (d.zt = '一级报警' OR d.zt = '二级报警') THEN 1 ELSE 0 END) AS month3,
+           SUM(CASE WHEN TO_CHAR(d.report_time, 'MM') = '04' AND (d.zt = '一级报警' OR d.zt = '二级报警') THEN 1 ELSE 0 END) AS month4,
+           SUM(CASE WHEN TO_CHAR(d.report_time, 'MM') = '05' AND (d.zt = '一级报警' OR d.zt = '二级报警') THEN 1 ELSE 0 END) AS month5,
+           SUM(CASE WHEN TO_CHAR(d.report_time, 'MM') = '06' AND (d.zt = '一级报警' OR d.zt = '二级报警') THEN 1 ELSE 0 END) AS month6,
+           SUM(CASE WHEN TO_CHAR(d.report_time, 'MM') = '07' AND (d.zt = '一级报警' OR d.zt = '二级报警') THEN 1 ELSE 0 END) AS month7,
+           SUM(CASE WHEN TO_CHAR(d.report_time, 'MM') = '08' AND (d.zt = '一级报警' OR d.zt = '二级报警') THEN 1 ELSE 0 END) AS month8,
+           SUM(CASE WHEN TO_CHAR(d.report_time, 'MM') = '09' AND (d.zt = '一级报警' OR d.zt = '二级报警') THEN 1 ELSE 0 END) AS month9,
+           SUM(CASE WHEN TO_CHAR(d.report_time, 'MM') = '10' AND (d.zt = '一级报警' OR d.zt = '二级报警') THEN 1 ELSE 0 END) AS month10,
+           SUM(CASE WHEN TO_CHAR(d.report_time, 'MM') = '11' AND (d.zt = '一级报警' OR d.zt = '二级报警') THEN 1 ELSE 0 END) AS month11,
+           SUM(CASE WHEN TO_CHAR(d.report_time, 'MM') = '12' AND (d.zt = '一级报警' OR d.zt = '二级报警') THEN 1 ELSE 0 END) AS month12
     FROM th_device_report d
              LEFT JOIN th_device td ON d.sn = td.sn
              LEFT JOIN sys_dept p ON td.dept_id = p.dept_id