From 34db7ce5afb6d78985529ad6d42b90157716a3cf Mon Sep 17 00:00:00 2001
From: liukewei <huamar123>
Date: Thu, 21 Dec 2023 09:47:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=9F=E8=AE=A1=E5=88=86?=
 =?UTF-8?q?=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ehs/EhsIndexStatisticsController.java     |  7 ++++
 .../mapper/EhsIndexStatisticsMapper.java      |  1 +
 .../service/EhsIndexStatisticsService.java    |  2 +-
 .../impl/EhsIndexStatisticsServiceImpl.java   |  5 ++-
 .../mapper/ehs/EhsIndexStatisticsMapper.xml   | 35 +++++++++++++++----
 ruoyi-ui/src/api/ehs/ehsExamples.js           | 10 ++++--
 ruoyi-ui/src/views/ehs/ehsExamples/index.vue  |  7 ++--
 7 files changed, 54 insertions(+), 13 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ehs/EhsIndexStatisticsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ehs/EhsIndexStatisticsController.java
index f737667..b3ca15f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ehs/EhsIndexStatisticsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ehs/EhsIndexStatisticsController.java
@@ -110,6 +110,13 @@ public class EhsIndexStatisticsController extends BaseController {
         List<HiddenDangerRankVo> list = ehsIndexStatisticsService.getHiddenDangerRankVoList();
         return AjaxResult.success(list);
     }
+    @ApiOperation("部门上报隐患排名")
+    @GetMapping("/getHiddenDangerRankVoByDeptIdList")
+    public AjaxResult getHiddenDangerRankVoByDeptIdList()
+    {
+        List<HiddenDangerRankVo> list = ehsIndexStatisticsService.getHiddenDangerRankVoByDeptIdList();
+        return AjaxResult.success(list);
+    }
     /**
      * 行业领域统计数量
      */
diff --git a/ruoyi-system/src/main/java/com/ruoyi/ehsIndexStatistics/mapper/EhsIndexStatisticsMapper.java b/ruoyi-system/src/main/java/com/ruoyi/ehsIndexStatistics/mapper/EhsIndexStatisticsMapper.java
index 89753a9..cdb1a1c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/ehsIndexStatistics/mapper/EhsIndexStatisticsMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/ehsIndexStatistics/mapper/EhsIndexStatisticsMapper.java
@@ -20,6 +20,7 @@ public interface EhsIndexStatisticsMapper {
     List<HiddenDangerStatisticsVo> getHiddenDangerSituationList();
     List<HiddenDangerStatisticsVo> getHiddenDangerSituationByEnterpriseNameList();
     List<HiddenDangerRankVo> getHiddenDangerRankVoList();
+    List<HiddenDangerRankVo> getHiddenDangerRankVoByDeptIdList();
     List<Map<String,Object>> getEnterpriseMapList(@Param("deptId") Long deptId);
     List<Map<String,Object>> geteconomicTypeMapList(@Param("deptId") Long deptId);
     List<Map<String,Object>> getenterpriseScaleMapList(@Param("deptId") Long deptId);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/ehsIndexStatistics/service/EhsIndexStatisticsService.java b/ruoyi-system/src/main/java/com/ruoyi/ehsIndexStatistics/service/EhsIndexStatisticsService.java
index 71c431e..22a5243 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/ehsIndexStatistics/service/EhsIndexStatisticsService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/ehsIndexStatistics/service/EhsIndexStatisticsService.java
@@ -29,7 +29,7 @@ public interface EhsIndexStatisticsService {
      * 上报隐患排名
      */
     List<HiddenDangerRankVo> getHiddenDangerRankVoList();
-
+    List<HiddenDangerRankVo> getHiddenDangerRankVoByDeptIdList();
     List<Map<String,Object>> getEnterpriseMapList();
     List<Map<String,Object>> geteconomicTypeMapList();
     List<Map<String,Object>> getenterpriseScaleMapList();
diff --git a/ruoyi-system/src/main/java/com/ruoyi/ehsIndexStatistics/service/impl/EhsIndexStatisticsServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/ehsIndexStatistics/service/impl/EhsIndexStatisticsServiceImpl.java
index 9338eeb..0f6fbe5 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/ehsIndexStatistics/service/impl/EhsIndexStatisticsServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/ehsIndexStatistics/service/impl/EhsIndexStatisticsServiceImpl.java
@@ -98,7 +98,10 @@ public class EhsIndexStatisticsServiceImpl implements EhsIndexStatisticsService
     public List<HiddenDangerRankVo> getHiddenDangerRankVoList() {
         return mapper.getHiddenDangerRankVoList();
     }
-
+    @Override
+    public List<HiddenDangerRankVo> getHiddenDangerRankVoByDeptIdList() {
+        return mapper.getHiddenDangerRankVoByDeptIdList();
+    }
     @Override
     public List<Map<String,Object>> getEnterpriseMapList() {
         Long deptId = null;
diff --git a/ruoyi-system/src/main/resources/mapper/ehs/EhsIndexStatisticsMapper.xml b/ruoyi-system/src/main/resources/mapper/ehs/EhsIndexStatisticsMapper.xml
index 35e4683..c72558a 100644
--- a/ruoyi-system/src/main/resources/mapper/ehs/EhsIndexStatisticsMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/ehs/EhsIndexStatisticsMapper.xml
@@ -82,8 +82,12 @@
     </select>
     <select id="getHiddenDangerSituationList"
             resultType="com.ruoyi.ehsIndexStatistics.vo.HiddenDangerStatisticsVo">
-        SELECT
-            d.dict_label 'name',
+
+select c.dict_label 'name',ifnull(a.thisUnitNum,0) thisUnitNum,ifnull(a.totalUnitNum,0) totalUnitNum,ifnull(a.thisReportNum,0) thisReportNum,ifnull(a.totalReportNum,0) totalReportNum
+,ifnull(a.thisHaveNum,0)thisHaveNum,ifnull(a.totalHaveNum,0)totalHaveNum,ifnull(a.thisNotNum,0)thisNotNum,ifnull(a.totalNotNum,0)totalNotNum,ifnull(a.thisRate,0)thisRate,ifnull(a.totalRate,0)totalRate
+from  sys_dict_data c  left join(
+SELECT
+          r.area_id ,
                 (select count(1) from ehs_enterprise e where e.area_id = d.dict_value and e.create_time>= DATE_FORMAT( now(), '%Y-%m-01 00:00:00' )) thisUnitNum,
             (select count(1) from ehs_enterprise e where e.area_id = d.dict_value) totalUnitNum,
             sum( CASE WHEN r.hidden_danger_id IS NOT NULL and r.check_time >= DATE_FORMAT( now(), '%Y-%m-01 00:00:00' ) THEN 1 ELSE 0 END ) 'thisReportNum',
@@ -100,12 +104,14 @@
         WHERE
             d.dict_type = 'area_id'
         GROUP BY
-            r.area_id
+            r.area_id) a  on  a.area_id = c.dict_value
+        WHERE
+            c.dict_type = 'area_id'
     </select>
     <select id="getHiddenDangerSituationByEnterpriseNameList"
             resultType="com.ruoyi.ehsIndexStatistics.vo.HiddenDangerStatisticsVo">
         SELECT
-            r.enterprise_name 'name',
+            d.dept_name 'name',
                 sum( CASE WHEN r.hidden_danger_id IS NOT NULL and r.check_time >= DATE_FORMAT( now(), '%Y-%m-01 00:00:00' ) THEN 1 ELSE 0 END ) 'thisReportNum',
                 sum( CASE WHEN r.hidden_danger_id IS NOT NULL THEN 1 ELSE 0 END ) 'totalReportNum',
                 sum( CASE WHEN r.hidden_danger_id IS NOT NULL and r.check_time >= DATE_FORMAT( now(), '%Y-%m-01 00:00:00' ) and r.status = 10 THEN 1 ELSE 0 END ) 'thisHaveNum',
@@ -115,9 +121,9 @@
                 CONCAT(round(ifnull(sum( CASE WHEN r.hidden_danger_id IS NOT NULL and r.check_time >= DATE_FORMAT( now(), '%Y-%m-01 00:00:00' ) and r.status = 10 THEN 1 ELSE 0 END )/sum( CASE WHEN r.hidden_danger_id IS NOT NULL and r.check_time >= DATE_FORMAT( now(), '%Y-%m-01 00:00:00' ) THEN 1 ELSE 0 END ),0)*100,2),'%') 'thisRate',
                 CONCAT(round(ifnull(sum( CASE WHEN r.hidden_danger_id IS NOT NULL and r.status = 10 THEN 1 ELSE 0 END )/sum( CASE WHEN r.hidden_danger_id IS NOT NULL THEN 1 ELSE 0 END ),0)*100,2),'%') 'totalRate'
         FROM
-            ehs_hidden_danger r
+            sys_dept d left join ehs_hidden_danger r on r.dept_id = d.dept_id
         GROUP BY
-            r.enterprise_name
+            d.dept_id,d.dept_name
     </select>
     <select id="getHiddenDangerRankVoList"
             resultType="com.ruoyi.ehsIndexStatistics.vo.HiddenDangerRankVo">
@@ -139,6 +145,23 @@
         ORDER BY
             s.reportHiddenNum DESC
     </select>
+    <select id="getHiddenDangerRankVoByDeptIdList"
+            resultType="com.ruoyi.ehsIndexStatistics.vo.HiddenDangerRankVo">
+        SELECT
+            s.*
+        FROM
+            (
+                   SELECT
+                    d.dept_name 'areaName',
+                        count(r.dept_id) 'reportHiddenNum'
+                FROM
+                   sys_dept d left join  ehs_hidden_danger r on r.dept_id = d.dept_id
+                GROUP BY
+                    d.dept_id,d.dept_name
+                    ) s
+        ORDER BY
+            s.reportHiddenNum DESC
+    </select>
     <select id="getEnterpriseMapList"
             resultType="map">
         SELECT
diff --git a/ruoyi-ui/src/api/ehs/ehsExamples.js b/ruoyi-ui/src/api/ehs/ehsExamples.js
index ca6d9ac..2aa4eae 100644
--- a/ruoyi-ui/src/api/ehs/ehsExamples.js
+++ b/ruoyi-ui/src/api/ehs/ehsExamples.js
@@ -22,7 +22,13 @@ export function getDanger() {
         method: 'get',
     })
 }
-
+// 查询上报隐患数量
+export function getDangerByDeptId() {
+  return request({
+    url: '/ehs/indexStatistics/getHiddenDangerRankVoByDeptIdList',
+    method: 'get',
+  })
+}
 // 查询隐患数据统计分析 柱
 export function getDangerList(year) {
     return request({
@@ -62,4 +68,4 @@ export function getScale(){
         url: '/ehs/indexStatistics/getenterpriseScaleMapList',
         method: 'get',
     })
-}
\ No newline at end of file
+}
diff --git a/ruoyi-ui/src/views/ehs/ehsExamples/index.vue b/ruoyi-ui/src/views/ehs/ehsExamples/index.vue
index 465bc06..bdc4940 100644
--- a/ruoyi-ui/src/views/ehs/ehsExamples/index.vue
+++ b/ruoyi-ui/src/views/ehs/ehsExamples/index.vue
@@ -176,6 +176,7 @@ import {
   getAdministeration,
   getPlace,
   getDanger,
+  getDangerByDeptId,
   getTrade,
   getEconomics,
   getScale,
@@ -217,7 +218,7 @@ export default {
           type: "bar",
           stack: "Ad",
           itemStyle: {
-            color: colors[index % colors.length], 
+            color: colors[index % colors.length],
             borderRadius: [5, 5, 2, 2],
           },
           // emphasis: {
@@ -488,7 +489,7 @@ export default {
       });
 
     // 上报隐患
-    getDanger()
+    getDangerByDeptId()
       .then((response) => {
         if (response.code == 200) {
           response.data.map((item,index)=>{
@@ -573,4 +574,4 @@ export default {
 .scale {
   flex: 1;
 }
-</style>
\ No newline at end of file
+</style>