组织画像-总体概览-巡检问题总次数

airport-admin/src/main/java/com/sundot/airport/web/controller/system/SysUserController.java

@@ -182,7 +182,7 @@ public class SysUserController extends BaseController {
             List<SysRole> roles = sysUser.getRoles();
             if (CollUtil.isNotEmpty(roles)) {
                 List<String> roleKeyList = roles.stream().map(SysRole::getRoleKey).collect(Collectors.toList());
-                if (roleKeyList.contains(RoleTypeEnum.admin.getCode()) || roleKeyList.contains(RoleTypeEnum.test.getCode()) || roleKeyList.contains(RoleTypeEnum.zhijianke.getCode()) || roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
+                if (roleKeyList.contains(RoleTypeEnum.admin.getCode()) || roleKeyList.contains(RoleTypeEnum.test.getCode()) || roleKeyList.contains(RoleTypeEnum.zhijianke.getCode()) || roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode()) || roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
                     dto.setUserId(null);
                     dto.setDeptId(sysUser.getDeptId());
                 }

airport-check/src/main/java/com/sundot/airport/check/service/impl/CheckLargeScreenServiceImpl.java

@@ -1570,6 +1570,25 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
                 }
             });
         }
+        //补充被检查班科室数据
+        List<Long> checkedTeamIdListTemp = all.stream().filter(item -> ObjectUtil.isNull(item.getCheckedDepartmentId())).map(CheckLargeScreenCorrectionPortraitSqlDto::getCheckedTeamId).distinct().collect(Collectors.toList());
+        if (CollUtil.isNotEmpty(checkedTeamIdListTemp)) {
+            List<SysDept> checkedTeamListTemp = sysDeptService.selectDeptByIdList(checkedTeamIdListTemp);
+            if (CollUtil.isNotEmpty(checkedTeamListTemp)) {
+                Map<Long, Long> deptIdMap = checkedTeamListTemp.stream().collect(Collectors.toMap(SysDept::getDeptId, SysDept::getParentId, (oldValue, newValue) -> newValue));
+                List<Long> checkedDepartmentIdListTemp = checkedTeamListTemp.stream().map(SysDept::getParentId).collect(Collectors.toList());
+                List<SysDept> checkedDepartmentListTemp = sysDeptService.selectDeptByIdList(checkedDepartmentIdListTemp);
+                if (CollUtil.isNotEmpty(checkedDepartmentListTemp)) {
+                    Map<Long, String> deptMap = checkedDepartmentListTemp.stream().collect(Collectors.toMap(SysDept::getDeptId, SysDept::getDeptName, (oldValue, newValue) -> newValue));
+                    all.forEach(item -> {
+                        if (ObjectUtil.isNull(item.getCheckedDepartmentId())) {
+                            item.setCheckedDepartmentId(deptIdMap.getOrDefault(item.getCheckedTeamId(), 0L));
+                            item.setCheckedTeamName(deptMap.getOrDefault(item.getCheckedDepartmentId(), ""));
+                        }
+                    });
+                }
+            }
+        }
 
         // 对全量数据进行过滤+处理返回数据
         List<CheckLargeScreenCorrectionPortraitSqlDto> target;
@@ -1581,7 +1600,9 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
             SysDept sysDept = sysDeptService.selectDeptById(dto.getDeptId());
             if (StrUtil.equals(DeptTypeEnum.STATION.getCode(), sysDept.getDeptType())) {
                 target = all;
-            } else if (StrUtil.equals(DeptTypeEnum.DEPARTMENT.getCode(), sysDept.getDeptType())) {
+            } else if (StrUtil.equals(DeptTypeEnum.BRIGADE.getCode(), sysDept.getDeptType())) {
+                target = all.stream().filter(item -> ObjUtil.equals(item.getCheckedBrigadeId(), dto.getDeptId())).collect(Collectors.toList());
+            } else if (StrUtil.equals(DeptTypeEnum.MANAGER.getCode(), sysDept.getDeptType())) {
                 target = all.stream().filter(item -> ObjUtil.equals(item.getCheckedDepartmentId(), dto.getDeptId())).collect(Collectors.toList());
             } else if (StrUtil.equals(DeptTypeEnum.TEAMS.getCode(), sysDept.getDeptType())) {
                 target = all.stream().filter(item -> ObjUtil.equals(item.getCheckedTeamId(), dto.getDeptId())).collect(Collectors.toList());

airport-system/src/main/java/com/sundot/airport/system/service/impl/SysUserServiceImpl.java

@@ -1030,6 +1030,7 @@ public class SysUserServiceImpl implements ISysUserService {
      * @param dto 上行参数
      * @return 总体概览-主观印象
      */
+    @Override
     public String getSubjectiveImpression(BaseLargeScreenQueryParamDto dto) {
         if (ObjUtil.isNotNull(dto.getUserId())) {
             // 个人