Merge remote-tracking branch 'origin/master_tuzuo' into master_tuzuo

src/main/java/com/sooka/sponest/data/digitalemergency/controller/EmergencyBigDataController.java

@@ -62,7 +62,7 @@ public class EmergencyBigDataController extends BaseController {
     }
 
     /**
-     * 获取行业高危行业分布
+     * 获取行业高危行业分析
      *
      * @return
      */

src/main/java/com/sooka/sponest/data/emergency/appmin/index/service/impl/AppIndexServiceImpl.java

@@ -67,10 +67,10 @@ public class AppIndexServiceImpl extends BaseService implements AppIndexService
             managerMainVO.setParams(vo.getParams());
             //找出已过期和即将到期的巡检项目
             List late_inspection_list = managerMainMapper.getMainInspections(managerMainVO);
-            Map map = new HashMap();
-            map.put("late_inspection_list",late_inspection_list);
+//            Map map = new HashMap();
+//            map.put("late_inspection_list",late_inspection_list);
 
-            return AjaxResult.success(map);
+            return AjaxResult.success(late_inspection_list);
         }catch (Exception e) {
             e.printStackTrace();
             return AjaxResult.error("错误");

src/main/java/com/sooka/sponest/data/emergency/appmin/xunjian/controller/AppXunjianController.java

@@ -25,6 +25,11 @@ public class AppXunjianController {
         return AjaxResult.success(appXunjianService.getXunjianItems(vo));
     }
 
+    /**
+     * 巡查上报
+     * @param vo
+     * @return
+     */
     @PostMapping("submitXunjian")
     public AjaxResult submitXunjian(@RequestBody AppXunjianVO vo) {
         return appXunjianService.submitXunjian(vo);
@@ -89,6 +94,11 @@ public class AppXunjianController {
         return appXunjianService.getFCTZSdetail(vo);
     }
 
+    /**
+     * 整改完成
+     * @param vo
+     * @return
+     */
     @PostMapping("changeInspection")
     public AjaxResult changeInspection(@RequestBody AppXunjianInspectionVO vo) {
         return appXunjianService.changeInspection(vo);

src/main/resources/mapper/digitalemergency/EmergencyBigDataMapper.xml

@@ -15,21 +15,11 @@
     </select>
 
     <select id="selectIndustryHighList" parameterType="TBasicEnterindesmapCount" resultType="java.util.Map">
-        SELECT a.inspection_name AS name,
-               COUNT(DISTINCT f.enterprise_id) AS value
-        FROM
-            centerdata_t_emergency_inspectiontype a
-            LEFT JOIN centerdata_t_emergency_inspectiontype b
-        ON a.id = b.parent_id
-            LEFT JOIN centerdata_t_emergency_inspectionitem c ON b.id = c.imspectiontype_id
-            LEFT JOIN centerdata_t_emergency_enterindesmap d ON d.inspectiontype_id = c.id
-            LEFT JOIN centerdata_t_emergency_enterprise e ON e.id = d.enterprise_id
-            LEFT JOIN onest_event.centerevent_t_emergency_danger f ON f.enterprise_id = e.id AND (SELECT COUNT(h.enterprise_id) FROM  ${database_event}.centerevent_t_emergency_danger h)>  (SELECT config_value FROM ${database_system}.sys_config WHERE config_key='high.risk')
-            LEFT JOIN ${database_system}.sys_dept z ON e.dept_id = z.dept_id
-        WHERE
-            a.`level` = 1 ${params.dataScope}
-        GROUP BY
-            a.inspection_name
+        SELECT dept.dept_name AS `name`,COUNT(ente.dept_id) AS `value` FROM `t_bus_inspection` insp
+        LEFT JOIN t_bus_log log on insp.bus_log_id = log.bus_log_id
+        LEFT JOIN centerdata_t_emergency_enterprise ente ON log.bus_enterprise_id = ente.id
+        LEFT JOIN ${database_system}.sys_dept dept ON dept.dept_id = ente.dept_id
+        WHERE insp.is_pass = 'N' AND ente.dept_id is not null GROUP BY ente.dept_id
     </select>
 
     <select id="selectPersonnelList" resultType="java.util.Map">
@@ -240,15 +230,14 @@
         count desc
     </select>
 
-    <select id="getBigDataPatrolPoints" resultType="java.util.LinkedHashMap" parameterType="CenterdataTEmergencyTeam">
+    <select id="getBigDataPatrolPoints" resultType="java.util.LinkedHashMap">
         SELECT
-            b.name AS `name`,
-            count( a.id ) AS `value`
-        FROM
-            centerdata_t_emergency_patrolpoint a
-                left join centerdata_t_emergency_enterprise b on a.enterprise_id = b.id
-        GROUP BY
-            a.enterprise_id limit 10
+        '逾期' AS `name`,COUNT(*) AS `value`
+        FROM centerdata_t_emergency_patrolpoint WHERE DATE_ADD(patrol_lasttime, INTERVAL patrol_cycle DAY) &lt; NOW()
+        UNION ALL
+        SELECT
+        '预警' AS `name`,COUNT(*) AS `value`
+        FROM centerdata_t_emergency_patrolpoint WHERE DATE_ADD(patrol_lasttime, INTERVAL alert_day DAY) &lt; NOW()
     </select>
 
     <select id="getBigDataInspectionAnalysis" resultType="java.util.Map">