质控分析报告-质控活动-部门或用户筛选功能

airport-check/src/main/java/com/sundot/airport/check/domain/CheckLargeScreenPlanQueryParamDto.java

@@ -3,6 +3,8 @@ package com.sundot.airport.check.domain;
 import com.sundot.airport.common.core.domain.BaseLargeScreenQueryParamDto;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 巡检大屏:巡检计划查询参数
  *
@@ -22,4 +24,9 @@ public class CheckLargeScreenPlanQueryParamDto extends BaseLargeScreenQueryParam
      */
     private Long createId;
 
+    /**
+     * 创建人ID列表
+     */
+    private List<Long> userIdList;
+
 }

airport-check/src/main/java/com/sundot/airport/check/mapper/CheckLargeScreenMapper.java

@@ -281,14 +281,6 @@ public interface CheckLargeScreenMapper {
     public List<SysCheckAnalysisReportCheckProblemDistributionItemDto> problemDistributionStatistics(BaseLargeScreenQueryParamDto dto);
 
     /**
-     * 问题整改统计
-     *
-     * @param dto 大屏查询参数
-     * @return 问题整改统计
-     */
-    public List<SysCheckAnalysisReportCheckProblemCorrectionItemDto> problemCorrectionStatistics(BaseLargeScreenQueryParamDto dto);
-
-    /**
      * 使用报表-运行情况-巡检模块
      *
      * @param dto 大屏查询参数

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

@@ -67,6 +67,7 @@ import com.sundot.airport.common.enums.MedalTypeEnum;
 import com.sundot.airport.common.enums.RoleTypeEnum;
 import com.sundot.airport.common.enums.SourceTypeEnum;
 import com.sundot.airport.common.exception.ServiceException;
+import com.sundot.airport.common.utils.DeptUtils;
 import com.sundot.airport.common.utils.LargeScreenDateUtils;
 import com.sundot.airport.common.utils.SecurityUtils;
 import com.sundot.airport.common.utils.StringUtils;
@@ -2797,6 +2798,9 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
      */
     @Override
     public SysCheckAnalysisReportDto checkAnalysisReport(SysAnalysisReportParamDto paramDto) {
+        if (ObjUtil.isNull(paramDto.getUserId()) && ObjUtil.isNull(paramDto.getDeptId())) {
+            paramDto.setDeptId(DeptUtils.getTopSiteId(sysDeptService.selectDeptById(SecurityUtils.getDeptId())));
+        }
         SysCheckAnalysisReportDto result = new SysCheckAnalysisReportDto();
         result.setCheckTaskDto(getCheckTaskDto(paramDto));
         result.setCheckProblemDiscoveryDto(getCheckProblemDiscoveryDto(paramDto));
@@ -2812,13 +2816,53 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
      * @return 任务计划安排统计
      */
     private SysCheckAnalysisReportCheckTaskDto getCheckTaskDto(SysAnalysisReportParamDto paramDto) {
+        if (ObjectUtil.isNotNull(paramDto.getUserId())) {
+            return null;
+        }
+        SysDept sysDept = sysDeptService.selectDeptById(paramDto.getDeptId());
+        if (ObjUtil.isNull(sysDept)) {
+            throw new ServiceException("【" + paramDto.getDeptId() + "】部门不存在");
+        }
+        if (!StrUtil.equals(DeptTypeEnum.STATION.getCode(), sysDept.getDeptType()) && !StrUtil.equals(DeptTypeEnum.BRIGADE.getCode(), sysDept.getDeptType()) && !StrUtil.equals(DeptTypeEnum.MANAGER.getCode(), sysDept.getDeptType())) {
+            return null;
+        }
+        List<SysUser> sysUserList;
+        if (StrUtil.equals(DeptTypeEnum.BRIGADE.getCode(), sysDept.getDeptType())) {
+            sysUserList = sysUserService.selectUserListByRoleKeyAndDeptId(Arrays.asList(RoleTypeEnum.jingli.getCode(), RoleTypeEnum.xingzheng.getCode()), sysDept.getDeptId());
+        } else if (StrUtil.equals(DeptTypeEnum.MANAGER.getCode(), sysDept.getDeptType())) {
+            sysUserList = sysUserService.selectUserListByRoleKeyAndDeptId(Arrays.asList(RoleTypeEnum.kezhang.getCode()), sysDept.getDeptId());
+        } else {
+            sysUserList = Collections.emptyList();
+        }
         SysCheckAnalysisReportCheckTaskDto checkTaskDto = new SysCheckAnalysisReportCheckTaskDto();
         List<SysCheckAnalysisReportCheckTaskItemDto> checkTaskItemDtoList = new ArrayList<>();
         paramDto.getDateRangeList().forEach(dateRange -> {
+            List<CheckTask> checkTaskList = Collections.emptyList();
             CheckLargeScreenPlanQueryParamDto dto = new CheckLargeScreenPlanQueryParamDto();
             dto.setStartDate(dateRange.getStartDate());
             dto.setEndDate(dateRange.getEndDate());
-            List<CheckTask> checkTaskList = checkLargeScreenMapper.planStatistics(dto);
+            if (StrUtil.equals(DeptTypeEnum.STATION.getCode(), sysDept.getDeptType())) {
+                dto.setIsSelfCheck(null);
+                dto.setCreateId(null);
+                dto.setUserIdList(null);
+                checkTaskList = checkLargeScreenMapper.planStatistics(dto);
+            } else if (StrUtil.equals(DeptTypeEnum.BRIGADE.getCode(), sysDept.getDeptType())) {
+                if (!CollUtil.isEmpty(sysUserList)) {
+                    List<Long> userIdList = sysUserList.stream().map(SysUser::getUserId).collect(Collectors.toList());
+                    dto.setIsSelfCheck(1);
+                    dto.setCreateId(null);
+                    dto.setUserIdList(userIdList);
+                    checkTaskList = checkLargeScreenMapper.planStatistics(dto);
+                }
+            } else {
+                if (!CollUtil.isEmpty(sysUserList)) {
+                    List<Long> userIdList = sysUserList.stream().map(SysUser::getUserId).collect(Collectors.toList());
+                    dto.setIsSelfCheck(0);
+                    dto.setCreateId(null);
+                    dto.setUserIdList(userIdList);
+                    checkTaskList = checkLargeScreenMapper.planStatistics(dto);
+                }
+            }
             Map<String, Long> map = checkTaskList.stream().collect(Collectors.groupingBy(CheckTask::getCheckCategory, Collectors.counting()));
 
             SysCheckAnalysisReportCheckTaskItemDto itemDtoSpecialTask = new SysCheckAnalysisReportCheckTaskItemDto();
@@ -2985,12 +3029,23 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
      * @return 问题发现统计
      */
     private SysCheckAnalysisReportCheckProblemDiscoveryDto getCheckProblemDiscoveryDto(SysAnalysisReportParamDto paramDto) {
+        List<Long> userIdList = new ArrayList<>();
+        if (ObjUtil.isNotNull(paramDto.getUserId())) {
+            userIdList.add(paramDto.getUserId());
+        } else {
+            List<SysUser> sysUserList = sysUserService.selectUserByDeptId(paramDto.getDeptId());
+            if (ObjUtil.isEmpty(sysUserList)) {
+                return null;
+            }
+            userIdList.addAll(sysUserList.stream().map(SysUser::getUserId).collect(Collectors.toList()));
+        }
         SysCheckAnalysisReportCheckProblemDiscoveryDto checkProblemDiscoveryDto = new SysCheckAnalysisReportCheckProblemDiscoveryDto();
         List<SysCheckAnalysisReportCheckProblemDiscoveryItemDto> checkProblemDiscoveryItemDtoList = new ArrayList<>();
         paramDto.getDateRangeList().forEach(dateRange -> {
             CheckLargeScreenPlanQueryParamDto dto = new CheckLargeScreenPlanQueryParamDto();
             dto.setStartDate(dateRange.getStartDate());
             dto.setEndDate(dateRange.getEndDate());
+            dto.setUserIdList(userIdList);
             BigDecimal count = checkLargeScreenMapper.problemDistributionTotal(dto);
             SysCheckAnalysisReportCheckProblemDiscoveryItemDto checkProblemDiscoveryItemDto = new SysCheckAnalysisReportCheckProblemDiscoveryItemDto();
             checkProblemDiscoveryItemDto.setStartDate(dateRange.getStartDate());
@@ -3071,11 +3126,22 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
      * @return 问题分布统计
      */
     private SysCheckAnalysisReportCheckProblemDistributionDto getCheckProblemDistributionDto(SysAnalysisReportParamDto paramDto) {
+        List<Long> userIdList = new ArrayList<>();
+        if (ObjUtil.isNotNull(paramDto.getUserId())) {
+            userIdList.add(paramDto.getUserId());
+        } else {
+            List<SysUser> sysUserList = sysUserService.selectUserByDeptId(paramDto.getDeptId());
+            if (ObjUtil.isEmpty(sysUserList)) {
+                return null;
+            }
+            userIdList.addAll(sysUserList.stream().map(SysUser::getUserId).collect(Collectors.toList()));
+        }
         SysCheckAnalysisReportCheckProblemDistributionDto checkProblemDistributionDto = new SysCheckAnalysisReportCheckProblemDistributionDto();
         SysAnalysisReportDateRangeDto currentDateRangeDto = paramDto.getDateRangeList().stream().filter(dateRange -> StrUtil.equals(CompareTypeEnum.CURRENT.getCode(), dateRange.getTag())).findFirst().orElse(null);
         BaseLargeScreenQueryParamDto queryParamDto = new BaseLargeScreenQueryParamDto();
         queryParamDto.setStartDate(currentDateRangeDto.getStartDate());
         queryParamDto.setEndDate(currentDateRangeDto.getEndDate());
+        queryParamDto.setUserIdList(userIdList);
         List<SysCheckAnalysisReportCheckProblemDistributionItemDto> checkProblemDistributionItemDtoList = checkLargeScreenMapper.problemDistributionStatistics(queryParamDto);
         checkProblemDistributionDto.setCheckProblemDistributionItemDtoList(checkProblemDistributionItemDtoList);
         if (CollUtil.isEmpty(checkProblemDistributionItemDtoList)) {
@@ -3108,59 +3174,189 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
     private SysCheckAnalysisReportCheckProblemCorrectionDto getCheckProblemCorrectionDto(SysAnalysisReportParamDto paramDto) {
         SysCheckAnalysisReportCheckProblemCorrectionDto checkProblemCorrectionDto = new SysCheckAnalysisReportCheckProblemCorrectionDto();
         List<SysCheckAnalysisReportCheckProblemCorrectionItemDto> checkProblemCorrectionItemDtoList = new ArrayList<>();
+        checkProblemCorrectionDto.setCheckProblemCorrectionItemDtoList(checkProblemCorrectionItemDtoList);
         SysAnalysisReportDateRangeDto currentDateRangeDto = paramDto.getDateRangeList().stream().filter(dateRange -> StrUtil.equals(CompareTypeEnum.CURRENT.getCode(), dateRange.getTag())).findFirst().orElse(null);
-        BaseLargeScreenQueryParamDto queryParamDto = new BaseLargeScreenQueryParamDto();
-        queryParamDto.setStartDate(currentDateRangeDto.getStartDate());
-        queryParamDto.setEndDate(currentDateRangeDto.getEndDate());
-        List<SysCheckAnalysisReportCheckProblemCorrectionItemDto> tempCheckProblemCorrectionItemDtoList = checkLargeScreenMapper.problemCorrectionStatistics(queryParamDto);
-        if (CollUtil.isEmpty(tempCheckProblemCorrectionItemDtoList)) {
+
+        CheckLargeScreenCorrectionQueryParamDto tempQueryParam = new CheckLargeScreenCorrectionQueryParamDto();
+        tempQueryParam.setStartDate(currentDateRangeDto.getStartDate());
+        tempQueryParam.setEndDate(currentDateRangeDto.getEndDate());
+        List<CheckLargeScreenCorrectionPortraitSqlDto> all = checkLargeScreenMapper.portrait(tempQueryParam);
+        if (CollUtil.isEmpty(all)) {
             return null;
         }
-        Map<Long, SysCheckAnalysisReportCheckProblemCorrectionItemDto> deptMap = tempCheckProblemCorrectionItemDtoList.stream().collect(Collectors.toMap(SysCheckAnalysisReportCheckProblemCorrectionItemDto::getDeptId, item -> item, (oldValue, newValue) -> newValue));
+        //补充检查级别为站级的整改单中的被检查班组数据
+        List<Long> userIdList = all.stream().filter(item -> ObjectUtil.isNull(item.getCheckedTeamId())).map(CheckLargeScreenCorrectionPortraitSqlDto::getUserId).distinct().collect(Collectors.toList());
+        if (CollUtil.isNotEmpty(userIdList)) {
+            List<SysUser> sysUserList = sysUserService.selectByUserIdList(userIdList);
+            Map<Long, Long> sysUserMap = sysUserList.stream().collect(Collectors.toMap(SysUser::getUserId, SysUser::getDeptId, (oldValue, newValue) -> newValue));
+            List<Long> deptIdList = sysUserList.stream().map(SysUser::getDeptId).distinct().collect(Collectors.toList());
+            List<SysDept> deptList = sysDeptService.selectDeptByIdList(deptIdList);
+            Map<Long, String> deptMap = deptList.stream().collect(Collectors.toMap(SysDept::getDeptId, SysDept::getDeptName, (oldValue, newValue) -> newValue));
+            all.forEach(item -> {
+                if (ObjectUtil.isNull(item.getCheckedTeamId())) {
+                    item.setCheckedTeamId(sysUserMap.getOrDefault(item.getUserId(), 0L));
+                    item.setCheckedTeamName(deptMap.getOrDefault(item.getCheckedTeamId(), ""));
+                }
+            });
+        }
+        //补充被检查班科室数据
+        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.setCheckedDepartmentName(deptMap.getOrDefault(item.getCheckedDepartmentId(), ""));
+                        }
+                    });
+                }
+            }
+        }
 
-        SysCheckAnalysisReportCheckProblemCorrectionItemDto maxItemDto = tempCheckProblemCorrectionItemDtoList.stream()
-                .filter(p -> p.getOnTimeCompletedCount() != null && p.getOnTimeCompletedCount().compareTo(BigDecimal.ZERO) > 0)
-                .max(Comparator.comparing(SysCheckAnalysisReportCheckProblemCorrectionItemDto::getOnTimeCompletedCount))
-                .orElse(null);
-        if (ObjUtil.isNotNull(maxItemDto)) {
-            String desc = maxItemDto.getDeptName() + "的按时整改率更高、整改更及时,是当时整改工作落实较好的科室";
+        if (ObjUtil.isNotNull(paramDto.getUserId())) {
+            List<CheckLargeScreenCorrectionPortraitSqlDto> targetList = all.stream().filter(item -> ObjUtil.equals(paramDto.getUserId(), item.getUserId())).collect(Collectors.toList());
+            if (CollUtil.isEmpty(targetList)) {
+                return null;
+            }
+            SysCheckAnalysisReportCheckProblemCorrectionItemDto individual = new SysCheckAnalysisReportCheckProblemCorrectionItemDto();
+            SysUser sysUser = sysUserService.selectUserById(paramDto.getUserId());
+            individual.setDeptId(sysUser.getUserId());
+            individual.setDeptName(sysUser.getNickName());
+            individual.setOnTimeCompletedCount(BigDecimal.valueOf(targetList.stream().filter(item -> StrUtil.equals(CheckLargeScreenCorrectionTypeEnum.ON_TIME_COMPLETED.getCode(), item.getCorrectionType())).count()));
+            individual.setOverTimeCompletedCount(BigDecimal.valueOf(targetList.stream().filter(item -> StrUtil.equals(CheckLargeScreenCorrectionTypeEnum.OVER_TIME_COMPLETED.getCode(), item.getCorrectionType())).count()));
+            individual.setOnTimeUnfinishedCount(BigDecimal.valueOf(targetList.stream().filter(item -> StrUtil.equals(CheckLargeScreenCorrectionTypeEnum.ON_TIME_UNFINISHED.getCode(), item.getCorrectionType())).count()));
+            individual.setOverTimeUnfinishedCount(BigDecimal.valueOf(targetList.stream().filter(item -> StrUtil.equals(CheckLargeScreenCorrectionTypeEnum.OVER_TIME_UNFINISHED.getCode(), item.getCorrectionType())).count()));
+            individual.setOtherCount(BigDecimal.valueOf(targetList.stream().filter(item -> StrUtil.equals(CheckLargeScreenCorrectionTypeEnum.OTHER.getCode(), item.getCorrectionType())).count()));
+            String desc = "按期整改" + individual.getOnTimeCompletedCount().add(individual.getOnTimeUnfinishedCount()) + "个,超期整改" + individual.getOverTimeCompletedCount().add(individual.getOverTimeUnfinishedCount()) + "个";
             checkProblemCorrectionDto.setDesc(desc);
-        }
+            checkProblemCorrectionItemDtoList.add(individual);
+        } else {
+            SysDept sysDept = sysDeptService.selectDeptById(paramDto.getDeptId());
+            List<SysUser> sysUserList = sysUserService.selectUserByDeptId(sysDept.getDeptId());
+            if (CollUtil.isEmpty(sysUserList)) {
+                return null;
+            }
+            List<Long> targetUserIdList = sysUserList.stream().map(SysUser::getUserId).collect(Collectors.toList());
+            List<CheckLargeScreenCorrectionPortraitSqlDto> targetList = all.stream().filter(item -> targetUserIdList.contains(item.getUserId())).collect(Collectors.toList());
+            if (CollUtil.isEmpty(targetList)) {
+                return null;
+            }
+            if (StrUtil.equals(sysDept.getDeptType(), DeptTypeEnum.STATION.getCode())) {
+                Map<String, Long> descMap = targetList.stream().filter(item -> StrUtil.equals(CheckLargeScreenCorrectionTypeEnum.ON_TIME_COMPLETED.getCode(), item.getCorrectionType())).collect(Collectors.groupingBy(item -> item.getCheckedBrigadeId() + "###" + item.getCheckedBrigadeName(), Collectors.counting()));
+                String key = descMap.entrySet().stream()
+                        .max(Map.Entry.comparingByValue())
+                        .map(Map.Entry::getKey)
+                        .orElse(null);
+                if (ObjUtil.isNotNull(key)) {
+                    String desc = key.split("###")[1] + "的按时整改率更高、整改更及时,是当时整改工作落实较好的大队";
+                    checkProblemCorrectionDto.setDesc(desc);
+                }
+
+                Map<Long, List<CheckLargeScreenCorrectionPortraitSqlDto>> deptMap = targetList.stream().collect(Collectors.groupingBy(CheckLargeScreenCorrectionPortraitSqlDto::getCheckedBrigadeId));
+                SysDept deptQuery = new SysDept();
+                deptQuery.setParentId(sysDept.getDeptId());
+                deptQuery.setDeptType(DeptTypeEnum.BRIGADE.getCode());
+                List<SysDept> sysDeptList = sysDeptService.selectDeptInfoAll(deptQuery);
+                sysDeptList.forEach(dept -> {
+                    SysCheckAnalysisReportCheckProblemCorrectionItemDto itemDto = new SysCheckAnalysisReportCheckProblemCorrectionItemDto();
+                    itemDto.setDeptId(dept.getDeptId());
+                    itemDto.setDeptName(dept.getDeptName());
+                    List<CheckLargeScreenCorrectionPortraitSqlDto> list = deptMap.get(dept.getDeptId());
+                    if (CollUtil.isNotEmpty(list)) {
+                        itemDto.setOnTimeCompletedCount(BigDecimal.valueOf(list.stream().filter(item -> StrUtil.equals(CheckLargeScreenCorrectionTypeEnum.ON_TIME_COMPLETED.getCode(), item.getCorrectionType())).count()));
+                        itemDto.setOverTimeCompletedCount(BigDecimal.valueOf(list.stream().filter(item -> StrUtil.equals(CheckLargeScreenCorrectionTypeEnum.OVER_TIME_COMPLETED.getCode(), item.getCorrectionType())).count()));
+                        itemDto.setOnTimeUnfinishedCount(BigDecimal.valueOf(list.stream().filter(item -> StrUtil.equals(CheckLargeScreenCorrectionTypeEnum.ON_TIME_UNFINISHED.getCode(), item.getCorrectionType())).count()));
+                        itemDto.setOverTimeUnfinishedCount(BigDecimal.valueOf(list.stream().filter(item -> StrUtil.equals(CheckLargeScreenCorrectionTypeEnum.OVER_TIME_UNFINISHED.getCode(), item.getCorrectionType())).count()));
+                        itemDto.setOtherCount(BigDecimal.valueOf(list.stream().filter(item -> StrUtil.equals(CheckLargeScreenCorrectionTypeEnum.OTHER.getCode(), item.getCorrectionType())).count()));
+                    } else {
+                        itemDto.setOnTimeCompletedCount(BigDecimal.ZERO);
+                        itemDto.setOverTimeCompletedCount(BigDecimal.ZERO);
+                        itemDto.setOnTimeUnfinishedCount(BigDecimal.ZERO);
+                        itemDto.setOverTimeUnfinishedCount(BigDecimal.ZERO);
+                        itemDto.setOtherCount(BigDecimal.ZERO);
+                    }
+                    checkProblemCorrectionItemDtoList.add(itemDto);
+                });
+
+                SysCheckAnalysisReportCheckProblemCorrectionItemDto totalItem = new SysCheckAnalysisReportCheckProblemCorrectionItemDto();
+                totalItem.setDeptId(null);
+                totalItem.setDeptName("总数");
+                totalItem.setOnTimeCompletedCount(checkProblemCorrectionItemDtoList.stream().map(SysCheckAnalysisReportCheckProblemCorrectionItemDto::getOnTimeCompletedCount).reduce(BigDecimal.ZERO, BigDecimal::add));
+                totalItem.setOverTimeCompletedCount(checkProblemCorrectionItemDtoList.stream().map(SysCheckAnalysisReportCheckProblemCorrectionItemDto::getOverTimeCompletedCount).reduce(BigDecimal.ZERO, BigDecimal::add));
+                totalItem.setOnTimeUnfinishedCount(checkProblemCorrectionItemDtoList.stream().map(SysCheckAnalysisReportCheckProblemCorrectionItemDto::getOnTimeUnfinishedCount).reduce(BigDecimal.ZERO, BigDecimal::add));
+                totalItem.setOverTimeUnfinishedCount(checkProblemCorrectionItemDtoList.stream().map(SysCheckAnalysisReportCheckProblemCorrectionItemDto::getOverTimeUnfinishedCount).reduce(BigDecimal.ZERO, BigDecimal::add));
+                totalItem.setOtherCount(checkProblemCorrectionItemDtoList.stream().map(SysCheckAnalysisReportCheckProblemCorrectionItemDto::getOtherCount).reduce(BigDecimal.ZERO, BigDecimal::add));
+                checkProblemCorrectionItemDtoList.add(0, totalItem);
+            } else if (StrUtil.equals(sysDept.getDeptType(), DeptTypeEnum.BRIGADE.getCode())) {
+                Map<String, Long> descMap = targetList.stream().filter(item -> StrUtil.equals(CheckLargeScreenCorrectionTypeEnum.ON_TIME_COMPLETED.getCode(), item.getCorrectionType())).collect(Collectors.groupingBy(item -> item.getCheckedDepartmentId() + "###" + item.getCheckedDepartmentName(), Collectors.counting()));
+                String key = descMap.entrySet().stream()
+                        .max(Map.Entry.comparingByValue())
+                        .map(Map.Entry::getKey)
+                        .orElse(null);
+                if (ObjUtil.isNotNull(key)) {
+                    String desc = key.split("###")[1] + "的按时整改率更高、整改更及时,是当时整改工作落实较好的主管";
+                    checkProblemCorrectionDto.setDesc(desc);
+                }
 
-        List<SysDept> deptList = sysDeptService.selectAllDept(SecurityUtils.getLoginUser().getDeptId());
-        Collections.reverse(deptList);
-        SysDept station = deptList.stream().filter(x -> StrUtil.equals(DeptType.STATION.getCode(), x.getDeptType())).findFirst().orElse(null);
-        SysDept deptQuery = new SysDept();
-        deptQuery.setParentId(station.getDeptId());
-        deptQuery.setDeptType(DeptType.DEPARTMENT.getCode());
-        List<SysDept> sysDeptList = sysDeptService.selectDeptInfoAll(deptQuery);
-        sysDeptList.forEach(dept -> {
-            SysCheckAnalysisReportCheckProblemCorrectionItemDto itemDto = deptMap.get(dept.getDeptId());
-            if (itemDto != null) {
-                checkProblemCorrectionItemDtoList.add(itemDto);
+                SysCheckAnalysisReportCheckProblemCorrectionItemDto totalItem = new SysCheckAnalysisReportCheckProblemCorrectionItemDto();
+                totalItem.setDeptId(sysDept.getDeptId());
+                totalItem.setDeptName(sysDept.getDeptName());
+                totalItem.setOnTimeCompletedCount(BigDecimal.valueOf(targetList.stream().filter(item -> StrUtil.equals(CheckLargeScreenCorrectionTypeEnum.ON_TIME_COMPLETED.getCode(), item.getCorrectionType())).count()));
+                totalItem.setOverTimeCompletedCount(BigDecimal.valueOf(targetList.stream().filter(item -> StrUtil.equals(CheckLargeScreenCorrectionTypeEnum.OVER_TIME_COMPLETED.getCode(), item.getCorrectionType())).count()));
+                totalItem.setOnTimeUnfinishedCount(BigDecimal.valueOf(targetList.stream().filter(item -> StrUtil.equals(CheckLargeScreenCorrectionTypeEnum.ON_TIME_UNFINISHED.getCode(), item.getCorrectionType())).count()));
+                totalItem.setOverTimeUnfinishedCount(BigDecimal.valueOf(targetList.stream().filter(item -> StrUtil.equals(CheckLargeScreenCorrectionTypeEnum.OVER_TIME_UNFINISHED.getCode(), item.getCorrectionType())).count()));
+                totalItem.setOtherCount(BigDecimal.valueOf(targetList.stream().filter(item -> StrUtil.equals(CheckLargeScreenCorrectionTypeEnum.OTHER.getCode(), item.getCorrectionType())).count()));
+                checkProblemCorrectionItemDtoList.add(totalItem);
+            } else if (StrUtil.equals(sysDept.getDeptType(), DeptTypeEnum.MANAGER.getCode())) {
+                Map<String, Long> descMap = targetList.stream().filter(item -> StrUtil.equals(CheckLargeScreenCorrectionTypeEnum.ON_TIME_COMPLETED.getCode(), item.getCorrectionType())).collect(Collectors.groupingBy(item -> item.getCheckedTeamId() + "###" + item.getCheckedTeamName(), Collectors.counting()));
+                String key = descMap.entrySet().stream()
+                        .max(Map.Entry.comparingByValue())
+                        .map(Map.Entry::getKey)
+                        .orElse(null);
+                if (ObjUtil.isNotNull(key)) {
+                    String desc = key.split("###")[1] + "的按时整改率更高、整改更及时,是当时整改工作落实较好的班组";
+                    checkProblemCorrectionDto.setDesc(desc);
+                }
+
+                SysCheckAnalysisReportCheckProblemCorrectionItemDto totalItem = new SysCheckAnalysisReportCheckProblemCorrectionItemDto();
+                totalItem.setDeptId(sysDept.getDeptId());
+                totalItem.setDeptName(sysDept.getDeptName());
+                totalItem.setOnTimeCompletedCount(BigDecimal.valueOf(targetList.stream().filter(item -> StrUtil.equals(CheckLargeScreenCorrectionTypeEnum.ON_TIME_COMPLETED.getCode(), item.getCorrectionType())).count()));
+                totalItem.setOverTimeCompletedCount(BigDecimal.valueOf(targetList.stream().filter(item -> StrUtil.equals(CheckLargeScreenCorrectionTypeEnum.OVER_TIME_COMPLETED.getCode(), item.getCorrectionType())).count()));
+                totalItem.setOnTimeUnfinishedCount(BigDecimal.valueOf(targetList.stream().filter(item -> StrUtil.equals(CheckLargeScreenCorrectionTypeEnum.ON_TIME_UNFINISHED.getCode(), item.getCorrectionType())).count()));
+                totalItem.setOverTimeUnfinishedCount(BigDecimal.valueOf(targetList.stream().filter(item -> StrUtil.equals(CheckLargeScreenCorrectionTypeEnum.OVER_TIME_UNFINISHED.getCode(), item.getCorrectionType())).count()));
+                totalItem.setOtherCount(BigDecimal.valueOf(targetList.stream().filter(item -> StrUtil.equals(CheckLargeScreenCorrectionTypeEnum.OTHER.getCode(), item.getCorrectionType())).count()));
+                checkProblemCorrectionItemDtoList.add(totalItem);
+            } else if (StrUtil.equals(sysDept.getDeptType(), DeptTypeEnum.TEAMS.getCode())) {
+                Map<String, Long> descMap = targetList.stream().filter(item -> StrUtil.equals(CheckLargeScreenCorrectionTypeEnum.ON_TIME_COMPLETED.getCode(), item.getCorrectionType())).collect(Collectors.groupingBy(item -> item.getUserId() + "###" + item.getUserName(), Collectors.counting()));
+                String key = descMap.entrySet().stream()
+                        .max(Map.Entry.comparingByValue())
+                        .map(Map.Entry::getKey)
+                        .orElse(null);
+                if (ObjUtil.isNotNull(key)) {
+                    String desc = key.split("###")[1] + "的按时整改率更高、整改更及时,是当时整改工作落实较好的成员";
+                    checkProblemCorrectionDto.setDesc(desc);
+                }
+
+                SysCheckAnalysisReportCheckProblemCorrectionItemDto totalItem = new SysCheckAnalysisReportCheckProblemCorrectionItemDto();
+                totalItem.setDeptId(sysDept.getDeptId());
+                totalItem.setDeptName(sysDept.getDeptName());
+                totalItem.setOnTimeCompletedCount(BigDecimal.valueOf(targetList.stream().filter(item -> StrUtil.equals(CheckLargeScreenCorrectionTypeEnum.ON_TIME_COMPLETED.getCode(), item.getCorrectionType())).count()));
+                totalItem.setOverTimeCompletedCount(BigDecimal.valueOf(targetList.stream().filter(item -> StrUtil.equals(CheckLargeScreenCorrectionTypeEnum.OVER_TIME_COMPLETED.getCode(), item.getCorrectionType())).count()));
+                totalItem.setOnTimeUnfinishedCount(BigDecimal.valueOf(targetList.stream().filter(item -> StrUtil.equals(CheckLargeScreenCorrectionTypeEnum.ON_TIME_UNFINISHED.getCode(), item.getCorrectionType())).count()));
+                totalItem.setOverTimeUnfinishedCount(BigDecimal.valueOf(targetList.stream().filter(item -> StrUtil.equals(CheckLargeScreenCorrectionTypeEnum.OVER_TIME_UNFINISHED.getCode(), item.getCorrectionType())).count()));
+                totalItem.setOtherCount(BigDecimal.valueOf(targetList.stream().filter(item -> StrUtil.equals(CheckLargeScreenCorrectionTypeEnum.OTHER.getCode(), item.getCorrectionType())).count()));
+                checkProblemCorrectionItemDtoList.add(totalItem);
             } else {
-                SysCheckAnalysisReportCheckProblemCorrectionItemDto itemDtoZero = new SysCheckAnalysisReportCheckProblemCorrectionItemDto();
-                itemDtoZero.setDeptId(dept.getDeptId());
-                itemDtoZero.setDeptName(dept.getDeptName());
-                itemDtoZero.setOnTimeCompletedCount(BigDecimal.ZERO);
-                itemDtoZero.setOverTimeCompletedCount(BigDecimal.ZERO);
-                itemDtoZero.setOnTimeUnfinishedCount(BigDecimal.ZERO);
-                itemDtoZero.setOverTimeUnfinishedCount(BigDecimal.ZERO);
-                itemDtoZero.setOtherCount(BigDecimal.ZERO);
-                checkProblemCorrectionItemDtoList.add(itemDtoZero);
+                throw new ServiceException("部门类型错误");
             }
-        });
-
-        SysCheckAnalysisReportCheckProblemCorrectionItemDto totalItem = new SysCheckAnalysisReportCheckProblemCorrectionItemDto();
-        totalItem.setDeptId(null);
-        totalItem.setDeptName("总数");
-        totalItem.setOnTimeCompletedCount(tempCheckProblemCorrectionItemDtoList.stream().map(SysCheckAnalysisReportCheckProblemCorrectionItemDto::getOnTimeCompletedCount).reduce(BigDecimal.ZERO, BigDecimal::add));
-        totalItem.setOverTimeCompletedCount(tempCheckProblemCorrectionItemDtoList.stream().map(SysCheckAnalysisReportCheckProblemCorrectionItemDto::getOverTimeCompletedCount).reduce(BigDecimal.ZERO, BigDecimal::add));
-        totalItem.setOnTimeUnfinishedCount(tempCheckProblemCorrectionItemDtoList.stream().map(SysCheckAnalysisReportCheckProblemCorrectionItemDto::getOnTimeUnfinishedCount).reduce(BigDecimal.ZERO, BigDecimal::add));
-        totalItem.setOverTimeUnfinishedCount(tempCheckProblemCorrectionItemDtoList.stream().map(SysCheckAnalysisReportCheckProblemCorrectionItemDto::getOverTimeUnfinishedCount).reduce(BigDecimal.ZERO, BigDecimal::add));
-        totalItem.setOtherCount(tempCheckProblemCorrectionItemDtoList.stream().map(SysCheckAnalysisReportCheckProblemCorrectionItemDto::getOtherCount).reduce(BigDecimal.ZERO, BigDecimal::add));
-        checkProblemCorrectionItemDtoList.add(0, totalItem);
-        checkProblemCorrectionDto.setCheckProblemCorrectionItemDtoList(checkProblemCorrectionItemDtoList);
+        }
 
         return checkProblemCorrectionDto;
     }

airport-check/src/main/resources/mapper/check/CheckLargeScreenMapper.xml

@@ -66,6 +66,12 @@
             and (ct.check_start_time >= #{startDate}
             and ct.check_start_time <![CDATA[ < ]]> date_add(#{endDate} , interval 1 day))
         </if>
+        <if test="userIdList != null and userIdList.size() > 0">
+            and ct.create_id in
+            <foreach collection="userIdList" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
         order by ct.check_start_time desc
     </select>
 
@@ -932,62 +938,48 @@
     </select>
 
     <select id="problemDistributionTotal" resultType="java.math.BigDecimal">
-        select count(cpi.id) total
+        select count(cu.id) total
         from check_correction cc
         inner join check_project_item cpi on (cpi.source_id = cc.id and cpi.type = 'CHECK_CORRECTION')
+        inner join check_user cu on
+        (cu.source_id = cpi.id and cu.type = 'PROBLEM_RECTIFICATION_INSPECTION_ITEM_DETAILS')
         where 1 = 1
         <if test="startDate != null and endDate != null">
             and (cc.check_time >= #{startDate}
             and cc.check_time <![CDATA[ < ]]> date_add(#{endDate} , interval 1 day))
         </if>
+        <if test="userIdList != null and userIdList.size() > 0">
+            and cu.user_id in
+            <foreach collection="userIdList" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
     </select>
 
     <select id="problemDistributionStatistics"
             resultType="com.sundot.airport.common.core.domain.SysCheckAnalysisReportCheckProblemDistributionItemDto">
         select cpi.category_code_one code,
         cpi.category_name_one name,
-        count(cpi.id) total
+        count(cu.id) total
         from check_correction cc
         inner join check_project_item cpi on (cpi.source_id = cc.id and cpi.type = 'CHECK_CORRECTION')
+        inner join check_user cu on
+        (cu.source_id = cpi.id and cu.type = 'PROBLEM_RECTIFICATION_INSPECTION_ITEM_DETAILS')
         where 1 = 1
         <if test="startDate != null and endDate != null">
             and (cc.check_time >= #{startDate}
             and cc.check_time <![CDATA[ < ]]> date_add(#{endDate} , interval 1 day))
         </if>
+        <if test="userIdList != null and userIdList.size() > 0">
+            and cu.user_id in
+            <foreach collection="userIdList" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
         group by cpi.category_code_one, cpi.category_name_one
         order by total desc
     </select>
 
-    <select id="problemCorrectionStatistics"
-            resultType="com.sundot.airport.common.core.domain.SysCheckAnalysisReportCheckProblemCorrectionItemDto">
-        select temp.deptId deptId,
-        temp.deptName deptName,
-        ifnull(sum(case when temp.type = 'ON_TIME_COMPLETED' then 1 else 0 end), 0) onTimeCompletedCount,
-        ifnull(sum(case when temp.type = 'OVER_TIME_COMPLETED' then 1 else 0 end), 0) overTimeCompletedCount,
-        ifnull(sum(case when temp.type = 'ON_TIME_UNFINISHED' then 1 else 0 end), 0) onTimeUnfinishedCount,
-        ifnull(sum(case when temp.type = 'OVER_TIME_UNFINISHED' then 1 else 0 end), 0) overTimeUnfinishedCount,
-        ifnull(sum(case when temp.type = 'OTHER' then 1 else 0 end), 0) otherCount
-        from (select cc.checked_brigade_id deptId,
-        cc.checked_brigade_name deptName,
-        case
-        when cc.status = 'RECTIFIED' and cc.rectification_deadline >= cc.completion_time
-        then 'ON_TIME_COMPLETED'
-        when cc.status = 'RECTIFIED' and cc.rectification_deadline <![CDATA[ < ]]> cc.completion_time
-        then 'OVER_TIME_COMPLETED'
-        when cc.status = 'UNDER_RECTIFICATION' and CURRENT_DATE() <![CDATA[ <= ]]> cc.rectification_deadline
-        then 'ON_TIME_UNFINISHED'
-        when cc.status = 'UNDER_RECTIFICATION' and CURRENT_DATE() > cc.rectification_deadline
-        then 'OVER_TIME_UNFINISHED'
-        else 'OTHER' end type
-        from check_correction cc
-        where 1 = 1
-        <if test="startDate != null and endDate != null">
-            and (cc.check_time >= #{startDate}
-            and cc.check_time <![CDATA[ < ]]> date_add(#{endDate} , interval 1 day))
-        </if>) temp
-        group by temp.deptId, temp.deptName
-    </select>
-
     <select id="getUsageReportCheckTaskDto"
             resultType="com.sundot.airport.common.core.domain.SysUsageReportCheckTaskDto">
         select ct.task_code taskCode,

airport-common/src/main/java/com/sundot/airport/common/core/domain/BaseLargeScreenQueryParamDto.java

@@ -7,6 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 大屏查询参数
@@ -115,4 +116,8 @@ public class BaseLargeScreenQueryParamDto implements Serializable {
 
     @ApiModelProperty("站id")
     private Long inspectStationId;
+
+    @ApiModelProperty("人员ID列表")
+    private List<Long> userIdList;
+
 }

airport-common/src/main/java/com/sundot/airport/common/core/domain/SysAnalysisReportParamDto.java

@@ -38,4 +38,14 @@ public class SysAnalysisReportParamDto {
      */
     private List<SysAnalysisReportDateRangeDto> dateRangeList;
 
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+
 }