组织画像-明细-人均巡检问题数

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

@@ -257,7 +257,7 @@ public class SysUserController extends BaseController {
 
         // 返回结果处理
         SysDept sysDept = deptService.selectDeptById(dto.getDeptId());
-        if (StrUtil.equals(DeptTypeEnum.STATION.getCode(), sysDept.getDeptType()) || StrUtil.equals(DeptTypeEnum.DEPARTMENT.getCode(), sysDept.getDeptType())) {
+        if (StrUtil.equals(DeptTypeEnum.STATION.getCode(), sysDept.getDeptType()) || StrUtil.equals(DeptTypeEnum.BRIGADE.getCode(), sysDept.getDeptType()) || StrUtil.equals(DeptTypeEnum.MANAGER.getCode(), sysDept.getDeptType())) {
             indicatorCalculateParams.setUserType(StrUtil.equals(DeptTypeEnum.STATION.getCode(), sysDept.getDeptType()) ? UserType.DEPARTMENT : UserType.TEAM);
             SysDept temp = new SysDept();
             temp.setParentId(dto.getDeptId());

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

@@ -1656,11 +1656,43 @@ 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(), ""));
+                        }
+                    });
+                }
+            }
+        }
 
         // 对全量数据进行过滤+处理返回数据
         SysDept sysDept = sysDeptService.selectDeptById(dto.getDeptId());
         if (StrUtil.equals(DeptTypeEnum.STATION.getCode(), sysDept.getDeptType())) {
             List<CheckLargeScreenCorrectionPortraitSqlDto> target = all;
+            Map<Long, String> map = target.stream().collect(Collectors.toMap(CheckLargeScreenCorrectionPortraitSqlDto::getCheckedBrigadeId, CheckLargeScreenCorrectionPortraitSqlDto::getCheckedBrigadeName, (oldValue, newValue) -> newValue));
+            Map<Long, List<CheckLargeScreenCorrectionPortraitSqlDto>> groupingBy = target.stream().collect(Collectors.groupingBy(CheckLargeScreenCorrectionPortraitSqlDto::getCheckedBrigadeId));
+            groupingBy.forEach((key, value) -> {
+                SysLargeScreenDetailDto temp = new SysLargeScreenDetailDto();
+                temp.setId(key);
+                temp.setName(map.getOrDefault(key, ""));
+                int sum = value.size();
+                long count = value.stream().map(CheckLargeScreenCorrectionPortraitSqlDto::getUserId).distinct().count();
+                temp.setCheckCount(BigDecimal.valueOf(sum).divide(BigDecimal.valueOf(count), 1, RoundingMode.HALF_UP));
+                result.add(temp);
+            });
+        } else if (StrUtil.equals(DeptTypeEnum.BRIGADE.getCode(), sysDept.getDeptType())) {
+            List<CheckLargeScreenCorrectionPortraitSqlDto> target = all.stream().filter(item -> ObjUtil.equals(item.getCheckedBrigadeId(), dto.getDeptId())).collect(Collectors.toList());
             Map<Long, String> map = target.stream().collect(Collectors.toMap(CheckLargeScreenCorrectionPortraitSqlDto::getCheckedDepartmentId, CheckLargeScreenCorrectionPortraitSqlDto::getCheckedDepartmentName, (oldValue, newValue) -> newValue));
             Map<Long, List<CheckLargeScreenCorrectionPortraitSqlDto>> groupingBy = target.stream().collect(Collectors.groupingBy(CheckLargeScreenCorrectionPortraitSqlDto::getCheckedDepartmentId));
             groupingBy.forEach((key, value) -> {
@@ -1672,7 +1704,7 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
                 temp.setCheckCount(BigDecimal.valueOf(sum).divide(BigDecimal.valueOf(count), 1, RoundingMode.HALF_UP));
                 result.add(temp);
             });
-        } else if (StrUtil.equals(DeptTypeEnum.DEPARTMENT.getCode(), sysDept.getDeptType())) {
+        } else if (StrUtil.equals(DeptTypeEnum.MANAGER.getCode(), sysDept.getDeptType())) {
             List<CheckLargeScreenCorrectionPortraitSqlDto> target = all.stream().filter(item -> ObjUtil.equals(item.getCheckedDepartmentId(), dto.getDeptId())).collect(Collectors.toList());
             Map<Long, String> map = target.stream().collect(Collectors.toMap(CheckLargeScreenCorrectionPortraitSqlDto::getCheckedTeamId, CheckLargeScreenCorrectionPortraitSqlDto::getCheckedTeamName, (oldValue, newValue) -> newValue));
             Map<Long, List<CheckLargeScreenCorrectionPortraitSqlDto>> groupingBy = target.stream().collect(Collectors.groupingBy(CheckLargeScreenCorrectionPortraitSqlDto::getCheckedTeamId));