首页 - 隐患治理 -当前未整改完成隐患数量 修改

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

@@ -312,6 +312,118 @@ public class TSafeHazardOrgController extends SuperController {
             orgId = loginUser.getOrgId();
         }
 
+        NewSysOrg sysOrg = newSysOrgService.getById(orgId);
+        if (ObjectUtils.isEmpty(sysOrg)) {
+            return baseResponse;
+        }
+
+        // ✅ 复用 hiddenDangersNumberList 的逻辑，对所有 generally + major 求和，保证两个接口数据一致
+        List<HiddenDangerVO> hiddenDangerList = getHiddenDangerList(orgId, sysOrg);
+        int total = hiddenDangerList.stream()
+                .mapToInt(vo -> (vo.getGenerally() == null ? 0 : vo.getGenerally())
+                        + (vo.getMajor() == null ? 0 : vo.getMajor()))
+                .sum();
+
+        baseResponse.setData(total);
+        return baseResponse;
+    }
+
+    @ApiOperation(value = "首页 - 隐患治理 - 当前未整改完成隐患数量列表")
+    @GetMapping(value = "/hiddenDangersNumberList")
+    public BaseResponse<List<HiddenDangerVO>> hiddenDangersNumberList(String orgId) {
+        BaseResponse<List<HiddenDangerVO>> baseResponse = new BaseResponse<>();
+
+        UserInfo loginUser = ContextUtils.getLoginUser();
+        if (ObjectUtils.isEmpty(loginUser)) {
+            return baseResponse;
+        }
+        if (StringHelper.isEmpty(orgId)) {
+            orgId = loginUser.getOrgId();
+        }
+
+        NewSysOrg sysOrg = newSysOrgService.getById(orgId);
+        if (ObjectUtils.isEmpty(sysOrg)) {
+            return baseResponse;
+        }
+
+        baseResponse.setData(getHiddenDangerList(orgId, sysOrg));
+        return baseResponse;
+    }
+
+    // ✅ 抽取公共方法，两个接口共用同一套逻辑
+    private List<HiddenDangerVO> getHiddenDangerList(String orgId, NewSysOrg sysOrg) {
+        List<HiddenDangerVO> hiddenDanger = new ArrayList<>();
+
+        String nature = sysOrg.getNature();
+        if (StringUtils.isBlank(nature)) {
+            nature = sysOrg.getTreeLevel().toString();
+        }
+        int treeLevel = Integer.parseInt(nature);
+
+        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)
+            );
+            if (!list.isEmpty()) {
+                for (TSafeHazardOrg tSafeHazardOrg : list) {
+                    HiddenDangerVO hiddenDangerVO = new HiddenDangerVO();
+                    hiddenDangerVO.setOrgId(tSafeHazardOrg.getOrgId());
+                    hiddenDangerVO.setOrgName(tSafeHazardOrg.getName());
+                    String processStatus = tSafeHazardOrg.getProcessStatus();
+                    if (StringHelper.isNotEmpty(processStatus)) {
+                        hiddenDangerVO.setGenerally(Integer.parseInt(processStatus));
+                    }
+                    hiddenDanger.add(hiddenDangerVO);
+                }
+            }
+        } else {
+            // 非粮库：按直接下级分组统计
+            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> generallyQW = new QueryWrapper<TSafeHazardOrg>()
+                            .in("org_id", subInstitutionIds)
+                            .ne("status", BizConstants.STATUS_DELETE)
+                            .ne("process_status", 5).ne("process_status", 4)
+                            .eq("\"level\"", 1);
+                    hiddenDangerVO.setGenerally(tSafeHazardOrgService.count(generallyQW));
+
+                    QueryWrapper<TSafeHazardOrg> majorQW = new QueryWrapper<TSafeHazardOrg>()
+                            .in("org_id", subInstitutionIds)
+                            .ne("status", BizConstants.STATUS_DELETE)
+                            .ne("process_status", 5).ne("process_status", 4)
+                            .eq("\"level\"", 2);
+                    hiddenDangerVO.setMajor(tSafeHazardOrgService.count(majorQW));
+                }
+                hiddenDanger.add(hiddenDangerVO);
+            }
+        }
+        return hiddenDanger;
+    }
+
+    /*@ApiOperation(value = "首页 - 隐患治理 -当前未整改完成隐患数量")
+    @GetMapping(value = "/hiddenDangersNumber")
+    public BaseResponse<Integer> hiddenDangersNumber(String orgId) {
+        BaseResponse<Integer> baseResponse = new BaseResponse<>();
+
+        UserInfo loginUser = ContextUtils.getLoginUser();
+        if (ObjectUtils.isEmpty(loginUser)) {
+            return baseResponse;
+        }
+        if (StringHelper.isEmpty(orgId)) {
+            orgId = loginUser.getOrgId();
+        }
+
         NewSysOrg sysOrg = newSysOrgService.getById(orgId);
         if (ObjectUtils.isEmpty(sysOrg)) {
             return baseResponse;
@@ -416,7 +528,7 @@ public class TSafeHazardOrgController extends SuperController {
 
         baseResponse.setData(hiddenDanger);
         return baseResponse;
-    }
+    }*/
 
 
     @ApiOperation(value = "首页 - 隐患治理 -当前完成隐患数量")

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/sys/service/impl/NewSysOrgServiceImpl.java

@@ -103,6 +103,7 @@ public class NewSysOrgServiceImpl extends SuperServiceImpl<NewSysOrgDao, NewSysO
         return getSubInstitutions(orgId).stream().map(NewSysOrg::getOrgId).collect(Collectors.toList());
     }
 
+    @Override
     public String getOrgFullPathName(String orgId) {
         StringBuilder fullName = new StringBuilder();
         NewSysOrg sysOrg = (NewSysOrg) this.getById(orgId);