From dae090e4e521a65a50414e1fc0fd89f7786892cc Mon Sep 17 00:00:00 2001 From: 15036302109 Date: Mon, 25 Mar 2024 16:35:11 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E6=82=A3=E6=95=B0=E6=8D=AE=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E5=88=86=E6=9E=90=EF=BC=9A=E6=9C=AC=E6=9C=88=E4=B8=8A?= =?UTF-8?q?=E6=8A=A5=E9=9A=90=E6=82=A3=E6=8E=92=E5=90=8D,=E9=9A=90?= =?UTF-8?q?=E6=82=A3=E6=95=B0=E9=87=8F=E4=B8=8D=E6=AD=A3=E7=A1=AE=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/ehs/EhsIndexStatisticsMapper.xml | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/ruoyi-system/src/main/resources/mapper/ehs/EhsIndexStatisticsMapper.xml b/ruoyi-system/src/main/resources/mapper/ehs/EhsIndexStatisticsMapper.xml index 4950ad3..d0f2247 100644 --- a/ruoyi-system/src/main/resources/mapper/ehs/EhsIndexStatisticsMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/ehs/EhsIndexStatisticsMapper.xml @@ -153,15 +153,22 @@ SELECT s.* FROM ( - SELECT - d.dept_name 'areaName', - count(r.dept_id) 'reportHiddenNum' + SELECT + d.dept_name 'areaName', + IFNULL(SUM( hd_count ),0) 'reportHiddenNum' + FROM + sys_dept d + LEFT JOIN ( + SELECT + * FROM - sys_dept d left join (select * from ehs_hidden_danger where - DATE_FORMAT(NOW(), '%Y-%m') = DATE_FORMAT( check_time, '%Y-%m')) r on r.dept_id = d.dept_id - GROUP BY - d.dept_id,d.dept_name - ) s + ehs_hidden_danger + WHERE + DATE_FORMAT( NOW(), '%Y-%m' ) = DATE_FORMAT( check_time, '%Y-%m' )) r ON r.dept_id = d.dept_id + GROUP BY + d.dept_id, + d.dept_name + ) s ORDER BY s.reportHiddenNum DESC