优化隐患统计逻辑及默认值设置

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/safe/controller/TSafeHazardOrgController.java

@@ -358,33 +358,20 @@ public class TSafeHazardOrgController extends SuperController {
             return baseResponse;
         }
 
-        List<HiddenDangerVO> hiddenDangerNumber = new ArrayList<>();
+        List<HiddenDangerVO> hiddenDanger = new ArrayList<>();
+
         String nature = sysOrg.getNature();
         if (StringUtils.isBlank(nature)){
             nature = sysOrg.getTreeLevel().toString();
         }
         int treeLevel = Integer.parseInt(nature);
-        if (1 == treeLevel) {
-            // 总部
-            hiddenDangerNumber = tSafeHazardOrgService.getHiddenDangerNumber(null,treeLevel + 2);
-        } else if (2 == treeLevel || 3 == treeLevel) {
-            // 大区
-            List<String> orgIds = newSysOrgService.getOrgIdListByParentId(orgId);
-            if (!orgIds.isEmpty()){
-                hiddenDangerNumber = tSafeHazardOrgService.getHiddenDangerNumber(orgIds,treeLevel + 2);
-            }
-        } else if (4 == treeLevel) {
-            // 粮库
-            List<String> parentOrgIds = new ArrayList<>();
-            parentOrgIds.add(orgId);
-//            hiddenDangerNumber = tSafeHazardOrgService.getHiddenDangerNumber(parentOrgIds);
+
+        // 粮库
+        if (4 == treeLevel) {
             List<TSafeHazardOrg> list = tSafeHazardOrgService.list(new QueryWrapper<TSafeHazardOrg>().eq("org_id", orgId)
                     .ne("status", BizConstants.STATUS_DELETE).ne("process_status", 5).ne("process_status", 4)
             );
-
-            List<HiddenDangerVO> hiddenDanger = new ArrayList<>();
-
-            if (list.size() > 0) {
+            if (!list.isEmpty()) {
                 for (TSafeHazardOrg tSafeHazardOrg : list) {
                     HiddenDangerVO hiddenDangerVO = new HiddenDangerVO();
                     hiddenDangerVO.setOrgId(tSafeHazardOrg.getOrgId());
@@ -396,15 +383,37 @@ public class TSafeHazardOrgController extends SuperController {
                     hiddenDanger.add(hiddenDangerVO);
                 }
             }
+        }else {
+            //获取下级单位id
+            List<NewSysOrg> orgListByParentId = newSysOrgService.getOrgListByParentId(orgId);
+            for (NewSysOrg newSysOrg : orgListByParentId) {
+                String orgId1 = newSysOrg.getOrgId();
+                List<String> subInstitutionIds = newSysOrgService.getSubInstitutionIds(orgId1);
+
+                HiddenDangerVO hiddenDangerVO = new HiddenDangerVO();
+                hiddenDangerVO.setOrgId(orgId1);
+                hiddenDangerVO.setOrgName(newSysOrg.getOrgName());
+                if (!subInstitutionIds.isEmpty()) {
+                    //一般危险隐患
+                    QueryWrapper<TSafeHazardOrg> generallyQueryWrapper = new QueryWrapper<TSafeHazardOrg>().in("org_id", subInstitutionIds)
+                            .ne("status", BizConstants.STATUS_DELETE).ne("process_status", 5).ne("process_status", 4)
+                            .eq("`level`", 1);
+                    int generallyCount = tSafeHazardOrgService.count(generallyQueryWrapper);
+                    hiddenDangerVO.setGenerally(generallyCount);
+                    //重大危险隐患
+                    QueryWrapper<TSafeHazardOrg> majorQueryWrapper = new QueryWrapper<TSafeHazardOrg>().in("org_id", subInstitutionIds)
+                            .ne("status", BizConstants.STATUS_DELETE).ne("process_status", 5).ne("process_status", 4)
+                            .eq("`level`", 2);
+                    int majorCount = tSafeHazardOrgService.count(majorQueryWrapper);
+                    hiddenDangerVO.setMajor(majorCount);
+                }
+                hiddenDanger.add(hiddenDangerVO);
+            }
 
-            baseResponse.setData(hiddenDanger);
 
-            return baseResponse;
         }
 
-
-        baseResponse.setData(hiddenDangerNumber);
-
+        baseResponse.setData(hiddenDanger);
         return baseResponse;
     }
 

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/safe/model/domain/TSafeHazardOrg.java

@@ -150,7 +150,7 @@ public class TSafeHazardOrg extends SuperModel {
      */
     @ApiModelProperty(value = "隐患级别")
 
-    @TableField("\"level\"")
+    @TableField("`level`")
     private String level;
     /**
      * 隐患类型

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/safe/model/vo/HiddenDangerVO.java

@@ -20,8 +20,8 @@ public class HiddenDangerVO {
     @ApiModelProperty("机构id")
     private String orgId;
     @ApiModelProperty("一般")
-    private Integer generally;
+    private Integer generally = 0;
 
     @ApiModelProperty("重大")
-    private Integer major;
+    private Integer major = 0;
 }