Browse Source

获取应急工作情况(按机构、部门统计应急工作情况)

bihuisong 5 months ago
parent
commit
9ae66cd99f

+ 1 - 1
src/main/java/com/sooka/sponest/data/digitalemergency/controller/CentereventTEmergencyInspectionrecordController.java

@@ -143,7 +143,7 @@ public class CentereventTEmergencyInspectionrecordController extends BaseControl
     }
 
     /**
-     * 获取应急工作情况
+     * 获取应急工作情况(按机构、部门统计应急工作情况)
      *
      * @param emergencyInspectionrecordSelectBody
      * @return

+ 2 - 1
src/main/java/com/sooka/sponest/data/digitalemergency/mapper/CentereventTEmergencyInspectionrecordMapper.java

@@ -5,6 +5,7 @@ import com.sooka.sponest.data.digitalemergency.domain.CentereventTEmergencyInspe
 import com.sooka.sponest.data.digitalemergency.domain.EmergencyInspectionrecordSelectBody;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 巡检记录Mapper接口
@@ -66,5 +67,5 @@ public interface CentereventTEmergencyInspectionrecordMapper
      public List<CentereventTEmergencyInspectionrecordBdody>  selectCentereventTEmergencyInspectionrecordMessageList(EmergencyInspectionrecordSelectBody emergencyInspectionrecordSelectBody);
 
 
-    public List  selectEmergencyList(EmergencyInspectionrecordSelectBody emergencyInspectionrecordSelectBody);
+    public List<Map<String,String>> selectEmergencyList(EmergencyInspectionrecordSelectBody emergencyInspectionrecordSelectBody);
 }

+ 2 - 1
src/main/java/com/sooka/sponest/data/digitalemergency/service/ICentereventTEmergencyInspectionrecordService.java

@@ -5,6 +5,7 @@ import com.sooka.sponest.data.digitalemergency.domain.EmergencyInspectionrecordS
 import com.sooka.sponest.data.digitalemergency.domain.CentereventTEmergencyInspectionrecord;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 巡检记录Service接口
@@ -71,5 +72,5 @@ public interface ICentereventTEmergencyInspectionrecordService
      * @param emergencyInspectionrecordSelectBody
      * @return
      */
-    public List  selectEmergencyList(EmergencyInspectionrecordSelectBody emergencyInspectionrecordSelectBody);
+    public List<Map<String,String>> selectEmergencyList(EmergencyInspectionrecordSelectBody emergencyInspectionrecordSelectBody);
 }

+ 2 - 1
src/main/java/com/sooka/sponest/data/digitalemergency/service/impl/CentereventTEmergencyInspectionrecordServiceImpl.java

@@ -26,6 +26,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 巡检记录Service业务层处理
@@ -213,7 +214,7 @@ public class CentereventTEmergencyInspectionrecordServiceImpl extends BaseServic
 
     @DataScopeMutiDept(deptAlias = "d", userAlias = "u")
     @Override
-    public List selectEmergencyList(EmergencyInspectionrecordSelectBody emergencyInspectionrecordSelectBody) {
+    public List<Map<String,String>> selectEmergencyList(EmergencyInspectionrecordSelectBody emergencyInspectionrecordSelectBody) {
         emergencyInspectionrecordSelectBody.setId(SecurityUtils.getLoginUser().getSysUser().getDeptId().toString());
         setSookaDataBase(emergencyInspectionrecordSelectBody);
         return centereventTEmergencyInspectionrecordMapper.selectEmergencyList(emergencyInspectionrecordSelectBody);

+ 6 - 31
src/main/resources/mapper/digitalemergency/CentereventTEmergencyInspectionrecordMapper.xml

@@ -161,37 +161,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 </select>
     <select id="selectEmergencyList" parameterType="EmergencyInspectionrecordSelectBody" resultType="java.util.Map">
         SELECT
-            d.dept_name as name,
-            COUNT(a.id) AS value
+            count(*) value,
+	        sd.dept_name name
         FROM
-            ${database_event}.centerevent_t_emergency_inspectionrecord a
-            LEFT JOIN 	${database_system}.sys_user u ON u.user_id= a.user_id
-            RIGHT JOIN ${database_system}.sys_user_dept ud ON ud.user_id = u.user_id
-            RIGHT JOIN ${database_system}.sys_dept d ON d.dept_id = ud.dept_id
-        WHERE
-            u.del_flag = '0'
-          AND (
-            d.dept_id = #{id}
-           OR d.dept_id IN ( SELECT t.dept_id FROM ${database_system}.sys_dept t WHERE find_in_set( #{id}, ancestors ) ))
-           ${params.dataScope}
-        GROUP BY
-            d.dept_name
-        UNION
-        SELECT
-            d.dept_name,
-            COUNT(a.id)
-        FROM
-            ${database_event}.centerevent_t_emergency_inspectionrecord a
-                RIGHT JOIN 	${database_system}.sys_user u ON u.user_id= a.user_id
-                RIGHT JOIN ${database_system}.sys_user_dept ud ON ud.user_id = u.user_id
-                RIGHT JOIN ${database_system}.sys_dept d ON d.dept_id = ud.dept_id
-        WHERE
-            u.del_flag = '0'
-          AND (
-                    d.dept_id = #{id}
-                OR d.dept_id IN ( SELECT t.dept_id FROM ${database_system}.sys_dept t WHERE find_in_set( #{id}, ancestors ) ))
-                ${params.dataScope}
-        GROUP BY
-            d.dept_name
+            t_bus_log g
+            LEFT JOIN t_bus_enterprise e ON g.bus_enterprise_id = e.bus_enterprise_id
+            left join onest_system.sys_dept sd on e.dept_id = sd.dept_id
+        GROUP BY e.dept_id
     </select>
 </mapper>