pms 瑞鹰看板设备利用率调整

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/stat/IotStaticController.java

@@ -3034,6 +3034,20 @@ public class IotStaticController {
         Map<Long, DeptDO> allDeptPair = deptService.getDeptMap(childDeptIds);
         Set<String> projectDeptNames = new HashSet<>();
         Set<Long> projectDeptIds = new HashSet<>();
+
+        // 查询钻井部门 修井 部门
+        // 钻井或修井部门 队伍
+        List<Long> zjOrXjDeptIds = new ArrayList<>();
+        IotDeptTypePageReqVO deptTypeReqVO = new IotDeptTypePageReqVO();
+        List<IotDeptTypeDO> deptTypes = iotDeptTypeMapper.selectList(deptTypeReqVO);
+        if (CollUtil.isNotEmpty(deptTypes)) {
+            deptTypes.forEach(dept -> {
+                if (!"no".equals(dept.getUpdater())) {
+                    zjOrXjDeptIds.add(dept.getDeptId());
+                }
+            });
+        }
+
         // key项目部id   value项目部名称
         Map<Long, String> projectPair = new HashMap<>();
         // key项目部id   value项目部包含的队伍id集合
@@ -3059,14 +3073,16 @@ public class IotStaticController {
                     // 获得当前部门的上级项目部
                     projectPair.forEach((projectDeptId, projectDept) -> {
                         if (projectDeptId.equals(dept.getParentId())) {
-                            if (projectTeamPair.containsKey(projectDeptId)) {
-                                Set<Long> teamIds = projectTeamPair.get(projectDeptId);
-                                teamIds.add(deptId);
-                                projectTeamPair.put(projectDeptId, teamIds);
-                            } else {
-                                Set<Long> teamIds = new HashSet<>();
-                                teamIds.add(deptId);
-                                projectTeamPair.put(projectDeptId, teamIds);
+                            if (zjOrXjDeptIds.contains(deptId)) {
+                                if (projectTeamPair.containsKey(projectDeptId)) {
+                                    Set<Long> teamIds = projectTeamPair.get(projectDeptId);
+                                    teamIds.add(deptId);
+                                    projectTeamPair.put(projectDeptId, teamIds);
+                                } else {
+                                    Set<Long> teamIds = new HashSet<>();
+                                    teamIds.add(deptId);
+                                    projectTeamPair.put(projectDeptId, teamIds);
+                                }
                             }
                         }
                     });