大屏统计优化

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabRiskPlanAbnormalGroupController.java

@@ -74,10 +74,10 @@ public class LabRiskPlanAbnormalGroupController extends BaseController {
 
     /**
      * 东北大学，数据大屏， 预案执行统计
-     * @param group
+     * @param
      * @return
      */
-    @GetMapping("/riskRecordCount")
+    /*@GetMapping("/riskRecordCount")
     @ApiOperation(value = "查询预案执行记录")
     public TableDataInfo riskRecordCount(LabRiskPlanAbnormalGroup group) {
         //结束时间
@@ -114,7 +114,7 @@ public class LabRiskPlanAbnormalGroupController extends BaseController {
             }
         }
         return getDataTable(backList);
-    }
+    }*/
 
     public static void main(String[] args) {
         System.out.println(Integer.valueOf("09"));

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/WarningNoticeLogController.java

@@ -172,10 +172,11 @@ public class WarningNoticeLogController extends AbstractController {
 
 
     @GetMapping("/warningCollect")
-    @ApiOperation("数据大屏-校级,预警通知统计")
+    @ApiOperation("数据大屏-校级,预警通知统计 Top5")
     public ResultData warningCollect(WarningNoticeLogVO vo) {
         List<WarningNoticeLogVO> backList = new ArrayList<>();
         //集合查询
+        vo.setWarningType(3);
         List<WarningNoticeLogVO> list = warningNoticeLogService.selectWarningNoticelist(vo);
 
         if(list!=null && list.size()>0 && list.get(0).getDeptName()!=null){

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabControlMapper.xml

@@ -203,10 +203,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
         lab_risk_plan_abnormal_group gp
         INNER JOIN lab_subject s ON gp.`subject_id` = s.`id`
-        INNER JOIN lab_risk_plan_abnormal_log al ON gp.`id` = al.`group_id`
-        INNER JOIN sys_dept x2 ON s.`dept_id` = x2.`dept_id`
         <where>
-            1=1 and al.`risk_status`=1
             <if test="deptId != null and deptId !=''">
                 and ( s.dept_id in (SELECT dt.dept_id FROM sys_dept dt WHERE find_in_set(#{deptId} ,ancestors )) or s.dept_id = #{deptId} )
             </if>
@@ -253,6 +250,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="subjectId != null and subjectId != '' ">
                 AND s.`id` = #{subjectId}
             </if>
+            <if test="deptId != null and deptId !=''"> <!-- 部门id-->
+                and ( s.dept_id in (SELECT dt.dept_id FROM sys_dept dt WHERE find_in_set(#{deptId} ,ancestors )) or s.dept_id = #{deptId} )
+            </if>
             <if test="beginTimeStr != null and beginTimeStr != ''"><!-- 开始时间检索 -->
                 AND date_format(gp.create_time,'%y%m%d') &gt;= date_format(#{beginTimeStr},'%y%m%d')
             </if>

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabRiskPlanAbnormalGroupMapper.xml

@@ -170,9 +170,10 @@
                 or s.name like concat('%', #{searchValue}, '%')
                 )
             </if>
-            <if test="deptId != null ">and s.dept_id = #{deptId}</if>
             <if test="riskAttribute != null ">and g.risk_attribute = #{riskAttribute}</if>
-
+            <if test="deptId != null and deptId !=''">
+                and ( s.dept_id in (SELECT dt.dept_id FROM sys_dept dt WHERE find_in_set(#{deptId} ,ancestors )) or s.dept_id = #{deptId} )
+            </if>
             <if test="startTime != null ">
                 and date_format(g.create_time,'%Y-%m-%d') &gt;= date_format(#{startTime},'%Y-%m-%d')
             </if>

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/WarningNoticeLogMapper.xml

@@ -59,6 +59,9 @@
         count(id)              totalNum
         from lab_warning_notice_log
         where DATE_FORMAT(create_time, '%Y%m') = DATE_FORMAT(NOW(), '%Y%m')
+        <if test="warningType != null and warningType !=''">
+            and warning_type = #{warningType}
+        </if>
         <if test="deptId != null and deptId !=''">
             and ( college_id in (SELECT dt.dept_id FROM sys_dept dt WHERE find_in_set(#{deptId} ,ancestors )) or college_id = #{deptId} )
         </if>