From 18dd550878eb5dedf379d1ac97edd299a2d4646a Mon Sep 17 00:00:00 2001
From: LokerL <loker80@qq.com>
Date: Wed, 4 Dec 2024 20:13:38 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix:=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=9C=88=E6=8A=A5=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=EF=BC=8C?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=AF=A6=E6=83=85=E5=92=8C=E6=B8=AF=E5=8C=BA?=
 =?UTF-8?q?=E5=AF=B9=E6=AF=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/oil/ThDeviceReportMapper.xml      | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 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 c71cb0c..244e2f2 100644
--- a/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/ThDeviceReportMapper.xml
+++ b/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/ThDeviceReportMapper.xml
@@ -128,9 +128,9 @@
     <select id="monthReportDataOverviewDeviceDs" parameterType="map" resultType="map">
         SELECT d.sn,
                p.dept_name,
-               pp.dept_name                   as "gang_qu",
-               ROUND(AVG(TO_NUMBER(d.ds)), 8) AS avg_ds
-        FROM th_device_report d
+               pp.dept_name AS "gang_qu",
+               d.avg_value  AS avg_ds
+        FROM th_device_report_month1 d
                  LEFT JOIN th_device td ON d.sn = td.sn
                  LEFT JOIN sys_dept p ON td.dept_id = p.dept_id
                  LEFT JOIN sys_dept pp ON p.parent_id = pp.dept_id
@@ -140,17 +140,15 @@
                        WHERE d.dept_id IN (SELECT dept_id
                                            FROM sys_dept START WITH dept_id = #{deptId}
                                                CONNECT BY PRIOR dept_id = parent_id))
-          AND TO_CHAR(d.report_time, 'YYYY-MM') = #{month}
-        GROUP BY d.sn, p.dept_name, pp.dept_name
+          AND TO_CHAR(TO_DATE(d.year || '-' || d.month, 'YYYY-MM'), 'YYYY-MM') = #{month}
         ORDER BY pp.dept_name, p.dept_name
     </select>
 
     <select id="monthReportDataOverviewGangQuCompare" parameterType="map" resultType="map">
-        SELECT
-               pp.dept_name                   as "gang_qu",
-               ppp.dept_name                  as "gang_kou",
-               ROUND(AVG(TO_NUMBER(d.ds)), 8) AS avg_ds
-        FROM th_device_report d
+        SELECT pp.dept_name  as "gang_qu",
+               ppp.dept_name as "gang_kou",
+               ROUND(AVG(TO_NUMBER(d.avg_value)), 2) AS avg_ds
+        FROM th_device_report_month1 d
                  LEFT JOIN th_device td ON d.sn = td.sn
                  LEFT JOIN sys_dept p ON td.dept_id = p.dept_id
                  LEFT JOIN sys_dept pp ON p.parent_id = pp.dept_id
@@ -162,7 +160,7 @@
                        WHERE d.dept_id IN (SELECT dept_id
                                            FROM sys_dept START WITH dept_id = #{deptId}
                                                CONNECT BY PRIOR dept_id = parent_id))
-          AND TO_CHAR(d.report_time, 'YYYY-MM') = #{month}
+          AND TO_CHAR(TO_DATE(d.year || '-' || d.month, 'YYYY-MM'), 'YYYY-MM') = #{month}
         GROUP BY pp.dept_name, ppp.dept_name
         ORDER BY ppp.dept_name, pp.dept_name
     </select>