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