巡检统计

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

@@ -14,6 +14,16 @@ import java.math.BigDecimal;
 public class CheckLargeScreenCorrectionAssistDto {
 
     /**
+     * 大队ID
+     */
+    private Long brigadeId;
+
+    /**
+     * 大队名称
+     */
+    private String brigadeName;
+
+    /**
      * 科室ID
      */
     private Long departmentId;

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

@@ -18,6 +18,11 @@ public class CheckLargeScreenCorrectionQueryParamDto extends BaseLargeScreenQuer
     private Integer isSelfCheck;
 
     /**
+     * 被检查大队ID
+     */
+    private Long checkedBrigadeId;
+
+    /**
      * 被检查科室ID
      */
     private Long checkedDepartmentId;

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

@@ -18,6 +18,11 @@ public class CheckLargeScreenProblemQueryParamDto extends BaseLargeScreenQueryPa
     private Integer isSelfCheck;
 
     /**
+     * 被检查大队ID
+     */
+    private Long checkedBrigadeId;
+
+    /**
      * 被检查科室ID
      */
     private Long checkedDepartmentId;

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

@@ -58,7 +58,15 @@ public interface CheckLargeScreenMapper {
     public List<CheckLargeScreenProblemDto> problemDistribution(CheckLargeScreenProblemQueryParamDto dto);
 
     /**
-     * 问题发现-问题分布对比
+     * 问题发现-问题分布对比-大队
+     *
+     * @param dto 大屏查询参数
+     * @return 问题分布对比
+     */
+    public List<CheckLargeScreenProblemDto> problemComparisonBrigade(CheckLargeScreenProblemQueryParamDto dto);
+
+    /**
+     * 问题发现-问题分布对比-科室
      *
      * @param dto 大屏查询参数
      * @return 问题分布对比
@@ -66,7 +74,15 @@ public interface CheckLargeScreenMapper {
     public List<CheckLargeScreenProblemDto> problemComparison(CheckLargeScreenProblemQueryParamDto dto);
 
     /**
-     * 问题发现-通道面貌-问题对比
+     * 问题发现-通道面貌-问题对比-大队
+     *
+     * @param dto 大屏查询参数
+     * @return 通道面貌-问题对比
+     */
+    public List<CheckLargeScreenProblemDto> problemComparisonTwoBrigade(CheckLargeScreenProblemQueryParamDto dto);
+
+    /**
+     * 问题发现-通道面貌-问题对比-科室
      *
      * @param dto 大屏查询参数
      * @return 通道面貌-问题对比
@@ -90,7 +106,15 @@ public interface CheckLargeScreenMapper {
     public List<CheckLargeScreenProblemDto> problemComparisonTwoBanZu(CheckLargeScreenProblemQueryParamDto dto);
 
     /**
-     * 问题发现-通道面貌-问题趋势
+     * 问题发现-通道面貌-问题趋势-大队
+     *
+     * @param dto 大屏查询参数
+     * @return 通道面貌-问题趋势
+     */
+    public List<CheckLargeScreenProblemTrendDto> problemTrendBrigade(CheckLargeScreenProblemQueryParamDto dto);
+
+    /**
+     * 问题发现-通道面貌-问题趋势-科室
      *
      * @param dto 大屏查询参数
      * @return 通道面貌-问题趋势
@@ -114,6 +138,14 @@ public interface CheckLargeScreenMapper {
     public List<CheckLargeScreenCorrectionAssistDto> correction(CheckLargeScreenCorrectionQueryParamDto dto);
 
     /**
+     * 问题整改-整改状态分布-大队对比
+     *
+     * @param dto 大屏查询参数
+     * @return 整改状态分布-科级对比
+     */
+    public List<CheckLargeScreenCorrectionDto> correctionDistributionBrigade(CheckLargeScreenCorrectionQueryParamDto dto);
+
+    /**
      * 问题整改-整改状态分布-科级对比
      *
      * @param dto 大屏查询参数
@@ -153,6 +185,14 @@ public interface CheckLargeScreenMapper {
     public List<CheckLargeScreenInspectionExecuteUserDto> inspectionExecuteUser(List<Long> list);
 
     /**
+     * 问题发现大队汇总
+     *
+     * @param dto 大屏查询参数
+     * @return 问题发现科室汇总
+     */
+    public List<CheckLargeScreenProblemDto> getProblemBrigade(CheckLargeScreenProblemQueryParamDto dto);
+
+    /**
      * 问题发现科室汇总
      *
      * @param dto 大屏查询参数

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

@@ -112,8 +112,11 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
         } else if (roleKeyList.contains(RoleTypeEnum.test.getCode()) || roleKeyList.contains(RoleTypeEnum.zhijianke.getCode())) {
             dto.setIsSelfCheck(0);
             dto.setCreateId(null);
+        } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
+            dto.setIsSelfCheck(0);
+            dto.setCreateId(SecurityUtils.getLoginUser().getUserId());
         } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
-            dto.setIsSelfCheck(1);
+            dto.setIsSelfCheck(0);
             dto.setCreateId(SecurityUtils.getLoginUser().getUserId());
         } else {
             return Collections.emptyList();
@@ -154,8 +157,11 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
         } else if (roleKeyList.contains(RoleTypeEnum.test.getCode()) || roleKeyList.contains(RoleTypeEnum.zhijianke.getCode())) {
             dto.setIsSelfCheck(0);
             dto.setCreateId(null);
+        } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
+            dto.setIsSelfCheck(0);
+            dto.setCreateId(SecurityUtils.getLoginUser().getUserId());
         } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
-            dto.setIsSelfCheck(1);
+            dto.setIsSelfCheck(0);
             dto.setCreateId(SecurityUtils.getLoginUser().getUserId());
         } else {
             return Collections.emptyList();
@@ -196,8 +202,11 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
         } else if (roleKeyList.contains(RoleTypeEnum.test.getCode()) || roleKeyList.contains(RoleTypeEnum.zhijianke.getCode())) {
             dto.setIsSelfCheck(0);
             dto.setCreateId(null);
+        } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
+            dto.setIsSelfCheck(0);
+            dto.setCreateId(SecurityUtils.getLoginUser().getUserId());
         } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
-            dto.setIsSelfCheck(1);
+            dto.setIsSelfCheck(0);
             dto.setCreateId(SecurityUtils.getLoginUser().getUserId());
         } else {
             return Collections.emptyList();
@@ -223,11 +232,14 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
             dto.setIsSelfCheck(null);
         } else if (roleKeyList.contains(RoleTypeEnum.test.getCode()) || roleKeyList.contains(RoleTypeEnum.zhijianke.getCode())) {
             dto.setIsSelfCheck(0);
+        } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
+            dto.setIsSelfCheck(0);
+            dto.setCheckedBrigadeId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
         } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
-            dto.setIsSelfCheck(null);
+            dto.setIsSelfCheck(0);
             dto.setCheckedDepartmentId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
         } else if (roleKeyList.contains(RoleTypeEnum.banzuzhang.getCode())) {
-            dto.setIsSelfCheck(null);
+            dto.setIsSelfCheck(0);
             dto.setCheckedTeamId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
         } else {
             return Collections.emptyList();
@@ -264,16 +276,20 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
         List<CheckLargeScreenProblemDto> resultTemp;
         if (roleKeyList.contains(RoleTypeEnum.admin.getCode())) {
             dto.setIsSelfCheck(null);
-            resultTemp = checkLargeScreenMapper.problemComparison(dto);
+            resultTemp = checkLargeScreenMapper.problemComparisonBrigade(dto);
         } else if (roleKeyList.contains(RoleTypeEnum.test.getCode()) || roleKeyList.contains(RoleTypeEnum.zhijianke.getCode())) {
             dto.setIsSelfCheck(0);
-            resultTemp = checkLargeScreenMapper.problemComparison(dto);
+            resultTemp = checkLargeScreenMapper.problemComparisonBrigade(dto);
+        } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
+            dto.setIsSelfCheck(0);
+            dto.setCheckedBrigadeId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
+            resultTemp = checkLargeScreenMapper.problemComparisonBrigade(dto);
         } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
-            dto.setIsSelfCheck(null);
+            dto.setIsSelfCheck(0);
             dto.setCheckedDepartmentId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
             resultTemp = checkLargeScreenMapper.problemComparison(dto);
         } else if (roleKeyList.contains(RoleTypeEnum.banzuzhang.getCode())) {
-            dto.setIsSelfCheck(null);
+            dto.setIsSelfCheck(0);
             dto.setCheckedTeamId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
             resultTemp = checkLargeScreenMapper.problemComparisonBanZu(dto);
         } else {
@@ -321,19 +337,24 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
         List<CheckLargeScreenProblemDto> deptList;
         if (roleKeyList.contains(RoleTypeEnum.admin.getCode())) {
             dto.setIsSelfCheck(null);
-            resultTemp = checkLargeScreenMapper.problemComparisonTwo(dto);
-            deptList = checkLargeScreenMapper.getProblemDepartment(dto);
+            resultTemp = checkLargeScreenMapper.problemComparisonTwoBrigade(dto);
+            deptList = checkLargeScreenMapper.getProblemBrigade(dto);
         } else if (roleKeyList.contains(RoleTypeEnum.test.getCode()) || roleKeyList.contains(RoleTypeEnum.zhijianke.getCode())) {
             dto.setIsSelfCheck(0);
-            resultTemp = checkLargeScreenMapper.problemComparisonTwo(dto);
-            deptList = checkLargeScreenMapper.getProblemDepartment(dto);
+            resultTemp = checkLargeScreenMapper.problemComparisonTwoBrigade(dto);
+            deptList = checkLargeScreenMapper.getProblemBrigade(dto);
+        } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
+            dto.setIsSelfCheck(0);
+            dto.setCheckedBrigadeId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
+            resultTemp = checkLargeScreenMapper.problemComparisonTwoBrigade(dto);
+            deptList = checkLargeScreenMapper.getProblemBrigade(dto);
         } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
-            dto.setIsSelfCheck(null);
+            dto.setIsSelfCheck(0);
             dto.setCheckedDepartmentId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
             resultTemp = checkLargeScreenMapper.problemComparisonTwo(dto);
             deptList = checkLargeScreenMapper.getProblemDepartment(dto);
         } else if (roleKeyList.contains(RoleTypeEnum.banzuzhang.getCode())) {
-            dto.setIsSelfCheck(null);
+            dto.setIsSelfCheck(0);
             dto.setCheckedTeamId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
             resultTemp = checkLargeScreenMapper.problemComparisonTwoBanZu(dto);
             deptList = checkLargeScreenMapper.getProblemTeam(dto);
@@ -387,12 +408,17 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
         List<CheckLargeScreenProblemDto> deptList;
         if (roleKeyList.contains(RoleTypeEnum.admin.getCode())) {
             dto.setIsSelfCheck(null);
-            list = checkLargeScreenMapper.problemTrend(dto);
-            deptList = checkLargeScreenMapper.getProblemDepartment(dto);
+            list = checkLargeScreenMapper.problemTrendBrigade(dto);
+            deptList = checkLargeScreenMapper.getProblemBrigade(dto);
         } else if (roleKeyList.contains(RoleTypeEnum.test.getCode()) || roleKeyList.contains(RoleTypeEnum.zhijianke.getCode())) {
             dto.setIsSelfCheck(0);
-            list = checkLargeScreenMapper.problemTrend(dto);
-            deptList = checkLargeScreenMapper.getProblemDepartment(dto);
+            list = checkLargeScreenMapper.problemTrendBrigade(dto);
+            deptList = checkLargeScreenMapper.getProblemBrigade(dto);
+        } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
+            dto.setIsSelfCheck(null);
+            dto.setCheckedBrigadeId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
+            list = checkLargeScreenMapper.problemTrendBrigade(dto);
+            deptList = checkLargeScreenMapper.getProblemBrigade(dto);
         } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
             dto.setIsSelfCheck(null);
             dto.setCheckedDepartmentId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
@@ -444,11 +470,14 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
             dto.setIsSelfCheck(null);
         } else if (roleKeyList.contains(RoleTypeEnum.test.getCode()) || roleKeyList.contains(RoleTypeEnum.zhijianke.getCode())) {
             dto.setIsSelfCheck(0);
+        } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
+            dto.setIsSelfCheck(0);
+            dto.setCheckedBrigadeId(SecurityUtils.getLoginUser().getDeptId());
         } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
-            dto.setIsSelfCheck(null);
+            dto.setIsSelfCheck(0);
             dto.setCheckedDepartmentId(SecurityUtils.getLoginUser().getDeptId());
         } else if (roleKeyList.contains(RoleTypeEnum.banzuzhang.getCode())) {
-            dto.setIsSelfCheck(null);
+            dto.setIsSelfCheck(0);
             dto.setCheckedTeamId(SecurityUtils.getLoginUser().getDeptId());
         } else {
             return null;
@@ -461,8 +490,8 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
         BigDecimal otherCount = BigDecimal.valueOf(list.stream().filter(item -> StringUtils.equals(CheckLargeScreenCorrectionTypeEnum.OTHER.getCode(), item.getType())).count());
 
         CheckLargeScreenCorrectionDto result = new CheckLargeScreenCorrectionDto();
-        if (ObjUtil.isNotNull(dto.getCheckedDepartmentId()) || ObjUtil.isNotNull(dto.getCheckedTeamId())) {
-            Long deptId = Optional.ofNullable(dto.getCheckedDepartmentId()).orElse(dto.getCheckedTeamId());
+        if (ObjUtil.isNotNull(dto.getCheckedBrigadeId()) || ObjUtil.isNotNull(dto.getCheckedDepartmentId()) || ObjUtil.isNotNull(dto.getCheckedTeamId())) {
+            Long deptId = ObjUtil.isNotNull(dto.getCheckedBrigadeId()) ? dto.getCheckedBrigadeId() : ObjUtil.isNotNull(dto.getCheckedDepartmentId()) ? dto.getCheckedDepartmentId() : dto.getCheckedTeamId();
             SysDept sysDept = sysDeptService.selectDeptById(deptId);
             if (ObjUtil.isNotNull(sysDept)) {
                 result.setDeptId(sysDept.getDeptId());
@@ -493,16 +522,20 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
         List<CheckLargeScreenCorrectionDto> result;
         if (roleKeyList.contains(RoleTypeEnum.admin.getCode())) {
             dto.setIsSelfCheck(null);
-            result = checkLargeScreenMapper.correctionDistribution(dto);
+            result = checkLargeScreenMapper.correctionDistributionBrigade(dto);
         } else if (roleKeyList.contains(RoleTypeEnum.test.getCode()) || roleKeyList.contains(RoleTypeEnum.zhijianke.getCode())) {
             dto.setIsSelfCheck(0);
-            result = checkLargeScreenMapper.correctionDistribution(dto);
+            result = checkLargeScreenMapper.correctionDistributionBrigade(dto);
+        } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
+            dto.setIsSelfCheck(0);
+            dto.setCheckedBrigadeId(SecurityUtils.getLoginUser().getDeptId());
+            result = checkLargeScreenMapper.correctionDistributionBrigade(dto);
         } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
-            dto.setIsSelfCheck(null);
+            dto.setIsSelfCheck(0);
             dto.setCheckedDepartmentId(SecurityUtils.getLoginUser().getDeptId());
             result = checkLargeScreenMapper.correctionDistribution(dto);
         } else if (roleKeyList.contains(RoleTypeEnum.banzuzhang.getCode())) {
-            dto.setIsSelfCheck(null);
+            dto.setIsSelfCheck(0);
             dto.setCheckedTeamId(SecurityUtils.getLoginUser().getDeptId());
             result = checkLargeScreenMapper.correctionDistributionBanZu(dto);
         } else {
@@ -530,6 +563,7 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
             return Collections.emptyList();
         }
         List<CheckLargeScreenInspectionExecuteUserDto> stationTargetUserList = new ArrayList<>();
+        List<CheckLargeScreenInspectionExecuteUserDto> brigadeTargetUserList = new ArrayList<>();
         List<CheckLargeScreenInspectionExecuteUserDto> departmentTargetUserList = new ArrayList<>();
         List<CheckLargeScreenInspectionExecuteUserDto> teamUserTargetList = new ArrayList<>();
         List<CheckLargeScreenInspectionExecuteUserDto> targetUserList = checkLargeScreenMapper.inspectionExecuteUser(targetUserIdList);
@@ -541,6 +575,8 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
             checkLargeScreenInspectionExecuteUserDto.setUserName(key.split("-")[1]);
             if (value.contains(RoleTypeEnum.test.getCode()) || value.contains(RoleTypeEnum.zhijianke.getCode())) {
                 stationTargetUserList.add(checkLargeScreenInspectionExecuteUserDto);
+            } else if (value.contains(RoleTypeEnum.jingli.getCode()) || value.contains(RoleTypeEnum.xingzheng.getCode())) {
+                brigadeTargetUserList.add(checkLargeScreenInspectionExecuteUserDto);
             } else if (value.contains(RoleTypeEnum.kezhang.getCode())) {
                 departmentTargetUserList.add(checkLargeScreenInspectionExecuteUserDto);
             } else if (value.contains(RoleTypeEnum.banzuzhang.getCode())) {
@@ -550,11 +586,15 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
             }
         });
         List<Long> stationTargetUserIdList = stationTargetUserList.stream().map(CheckLargeScreenInspectionExecuteUserDto::getUserId).collect(Collectors.toList());
+        List<Long> brigadeTargetUserIdList = brigadeTargetUserList.stream().map(CheckLargeScreenInspectionExecuteUserDto::getUserId).collect(Collectors.toList());
         List<Long> departmentTargetUserIdList = departmentTargetUserList.stream().map(CheckLargeScreenInspectionExecuteUserDto::getUserId).collect(Collectors.toList());
         List<Long> teamTargetUserIdList = teamUserTargetList.stream().map(CheckLargeScreenInspectionExecuteUserDto::getUserId).collect(Collectors.toList());
 
         // 补充未执行用户数据
         List<CheckLargeScreenInspectionExecuteDto> result = checkLargeScreenMapper.inspectionExecute();
+        if (CollUtil.isEmpty(result)) {
+            return Collections.emptyList();
+        }
         Map<String, CheckLargeScreenInspectionExecuteDto> checkLargeScreenInspectionExecuteDtoMap = result.stream().collect(Collectors.toMap(CheckLargeScreenInspectionExecuteDto::getTaskCode, item -> item));
         List<String> taskCodeList = result.stream().map(CheckLargeScreenInspectionExecuteDto::getTaskCode).collect(Collectors.toList());
         List<CheckLargeScreenInspectionExecuteItemDto> resultItemList = checkLargeScreenMapper.inspectionExecuteItem(taskCodeList);
@@ -580,6 +620,23 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
                     checkLargeScreenInspectionExecuteItemDto.setUnqualifiedProjectCount(BigDecimal.ZERO);
                     value.add(checkLargeScreenInspectionExecuteItemDto);
                 });
+            } else if (StringUtils.equals(CheckLevelEnum.BRIGADE_LEVEL.getCode(), checkLargeScreenInspectionExecuteDto.getCheckLevel())) {
+                List<Long> unexecutedUserIdList = brigadeTargetUserIdList.stream().filter(item -> !userIdList.contains(item)).collect(Collectors.toList());
+                unexecutedUserIdList.forEach(item -> {
+                    CheckLargeScreenInspectionExecuteUserDto checkLargeScreenInspectionExecuteUserDto = targetUserMap.get(item);
+                    CheckLargeScreenInspectionExecuteItemDto checkLargeScreenInspectionExecuteItemDto = new CheckLargeScreenInspectionExecuteItemDto();
+                    checkLargeScreenInspectionExecuteItemDto.setTaskId(checkLargeScreenInspectionExecuteDto.getTaskId());
+                    checkLargeScreenInspectionExecuteItemDto.setTaskCode(checkLargeScreenInspectionExecuteDto.getTaskCode());
+                    checkLargeScreenInspectionExecuteItemDto.setTaskName(checkLargeScreenInspectionExecuteDto.getTaskName());
+                    checkLargeScreenInspectionExecuteItemDto.setRuleTypeNum(checkLargeScreenInspectionExecuteDto.getRuleTypeNum());
+                    checkLargeScreenInspectionExecuteItemDto.setUserId(checkLargeScreenInspectionExecuteUserDto.getUserId());
+                    checkLargeScreenInspectionExecuteItemDto.setUserName(checkLargeScreenInspectionExecuteUserDto.getNickName());
+                    checkLargeScreenInspectionExecuteItemDto.setCompletionPercentage(BigDecimal.ZERO);
+                    checkLargeScreenInspectionExecuteItemDto.setCheckOrderCount(BigDecimal.ZERO);
+                    checkLargeScreenInspectionExecuteItemDto.setRectificationOrderCount(BigDecimal.ZERO);
+                    checkLargeScreenInspectionExecuteItemDto.setUnqualifiedProjectCount(BigDecimal.ZERO);
+                    value.add(checkLargeScreenInspectionExecuteItemDto);
+                });
             } else if (StringUtils.equals(CheckLevelEnum.DEPARTMENT_LEVEL.getCode(), checkLargeScreenInspectionExecuteDto.getCheckLevel())) {
                 List<Long> unexecutedUserIdList = departmentTargetUserIdList.stream().filter(item -> !userIdList.contains(item)).collect(Collectors.toList());
                 unexecutedUserIdList.forEach(item -> {
@@ -649,6 +706,22 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
                         checkLargeScreenInspectionExecuteItemDto.setUnqualifiedProjectCount(BigDecimal.ZERO);
                         checkLargeScreenInspectionExecuteItemDtoList.add(checkLargeScreenInspectionExecuteItemDto);
                     }
+                } else if (StringUtils.equals(CheckLevelEnum.BRIGADE_LEVEL.getCode(), resultItem.getCheckLevel())) {
+                    for (Long item : brigadeTargetUserIdList) {
+                        CheckLargeScreenInspectionExecuteUserDto checkLargeScreenInspectionExecuteUserDto = targetUserMap.get(item);
+                        CheckLargeScreenInspectionExecuteItemDto checkLargeScreenInspectionExecuteItemDto = new CheckLargeScreenInspectionExecuteItemDto();
+                        checkLargeScreenInspectionExecuteItemDto.setTaskId(resultItem.getTaskId());
+                        checkLargeScreenInspectionExecuteItemDto.setTaskCode(resultItem.getTaskCode());
+                        checkLargeScreenInspectionExecuteItemDto.setTaskName(resultItem.getTaskName());
+                        checkLargeScreenInspectionExecuteItemDto.setRuleTypeNum(resultItem.getRuleTypeNum());
+                        checkLargeScreenInspectionExecuteItemDto.setUserId(checkLargeScreenInspectionExecuteUserDto.getUserId());
+                        checkLargeScreenInspectionExecuteItemDto.setUserName(checkLargeScreenInspectionExecuteUserDto.getNickName());
+                        checkLargeScreenInspectionExecuteItemDto.setCompletionPercentage(BigDecimal.ZERO);
+                        checkLargeScreenInspectionExecuteItemDto.setCheckOrderCount(BigDecimal.ZERO);
+                        checkLargeScreenInspectionExecuteItemDto.setRectificationOrderCount(BigDecimal.ZERO);
+                        checkLargeScreenInspectionExecuteItemDto.setUnqualifiedProjectCount(BigDecimal.ZERO);
+                        checkLargeScreenInspectionExecuteItemDtoList.add(checkLargeScreenInspectionExecuteItemDto);
+                    }
                 } else if (StringUtils.equals(CheckLevelEnum.DEPARTMENT_LEVEL.getCode(), resultItem.getCheckLevel())) {
                     for (Long item : departmentTargetUserIdList) {
                         CheckLargeScreenInspectionExecuteUserDto checkLargeScreenInspectionExecuteUserDto = targetUserMap.get(item);
@@ -709,6 +782,39 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
             return result;
         } else if (roleKeyList.contains(RoleTypeEnum.test.getCode()) || roleKeyList.contains(RoleTypeEnum.zhijianke.getCode())) {
             return result;
+        } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
+            List<CheckLargeScreenInspectionExecuteDto> resultBrigade = result.stream()
+                    .filter(checkLargeScreenInspectionExecuteDto -> StringUtils.equals(CheckLevelEnum.BRIGADE_LEVEL.getCode(), checkLargeScreenInspectionExecuteDto.getCheckLevel()))
+                    .map(checkLargeScreenInspectionExecuteDto -> {
+                                CheckLargeScreenInspectionExecuteDto temp = new CheckLargeScreenInspectionExecuteDto();
+                                temp.setTaskId(checkLargeScreenInspectionExecuteDto.getTaskId());
+                                temp.setTaskCode(checkLargeScreenInspectionExecuteDto.getTaskCode());
+                                temp.setTaskName(checkLargeScreenInspectionExecuteDto.getTaskName());
+                                temp.setCheckLevel(checkLargeScreenInspectionExecuteDto.getCheckLevel());
+                                temp.setCheckLevelDesc(checkLargeScreenInspectionExecuteDto.getCheckLevelDesc());
+                                temp.setRuleTypeNum(checkLargeScreenInspectionExecuteDto.getRuleTypeNum());
+                                temp.setCheckStartTime(checkLargeScreenInspectionExecuteDto.getCheckStartTime());
+                                temp.setCheckEndTime(checkLargeScreenInspectionExecuteDto.getCheckEndTime());
+                                temp.setCompletedCount(checkLargeScreenInspectionExecuteDto.getCompletedCount());
+                                temp.setInProgressCount(checkLargeScreenInspectionExecuteDto.getInProgressCount());
+                                temp.setNotStartedCount(checkLargeScreenInspectionExecuteDto.getNotStartedCount());
+                                if (CollUtil.isNotEmpty(checkLargeScreenInspectionExecuteDto.getCheckLargeScreenInspectionExecuteItemDtoList())) {
+                                    temp.setCheckLargeScreenInspectionExecuteItemDtoList(checkLargeScreenInspectionExecuteDto.getCheckLargeScreenInspectionExecuteItemDtoList().stream()
+                                            .filter(itemDto -> SecurityUtils.getLoginUser().getUserId().equals(itemDto.getUserId()))
+                                            .collect(Collectors.toList()));
+                                }
+                                return temp;
+                            }
+                    )
+                    .filter(checkLargeScreenInspectionExecuteDto -> CollUtil.isNotEmpty(checkLargeScreenInspectionExecuteDto.getCheckLargeScreenInspectionExecuteItemDtoList()))
+                    .collect(Collectors.toList());
+            resultBrigade.addAll(result.stream()
+                    .filter(checklargeScreenInspectionExecuteDto -> StringUtils.equals(CheckLevelEnum.DEPARTMENT_LEVEL.getCode(), checklargeScreenInspectionExecuteDto.getCheckLevel()))
+                    .collect(Collectors.toList()));
+            resultBrigade.addAll(result.stream()
+                    .filter(checklargeScreenInspectionExecuteDto -> StringUtils.equals(CheckLevelEnum.TEAM_LEVEL.getCode(), checklargeScreenInspectionExecuteDto.getCheckLevel()))
+                    .collect(Collectors.toList()));
+            return resultBrigade;
         } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
             List<CheckLargeScreenInspectionExecuteDto> resultKeZhang = result.stream()
                     .filter(checkLargeScreenInspectionExecuteDto -> StringUtils.equals(CheckLevelEnum.DEPARTMENT_LEVEL.getCode(), checkLargeScreenInspectionExecuteDto.getCheckLevel()))

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

@@ -68,6 +68,9 @@
         <if test="isSelfCheck != null">
             and cc.is_self_check=#{isSelfCheck}
         </if>
+        <if test="checkedBrigadeId != null">
+            and cc.checked_brigade_id=#{checkedBrigadeId}
+        </if>
         <if test="checkedDepartmentId != null">
             and cc.checked_department_id=#{checkedDepartmentId}
         </if>
@@ -82,6 +85,32 @@
         order by total desc
     </select>
 
+    <select id="problemComparisonBrigade" resultType="com.sundot.airport.check.domain.CheckLargeScreenProblemDto">
+        select cc.checked_brigade_id deptId,
+        cc.checked_brigade_name deptName,
+        cpi.category_code_one code,
+        cpi.category_name_one name,
+        count(cpi.id) total
+        from check_correction cc
+        inner join check_project_item cpi on (cpi.source_id = cc.id and cpi.type = 'CHECK_CORRECTION')
+        where 1 = 1
+        <if test="isSelfCheck != null">
+            and cc.is_self_check=#{isSelfCheck}
+        </if>
+        <if test="checkedBrigadeId != null">
+            and cc.checked_brigade_id=#{checkedBrigadeId}
+        </if>
+        <if test="checkedDepartmentId != null">
+            and cc.checked_department_id=#{checkedDepartmentId}
+        </if>
+        <if test="startDate != null and endDate != null">
+            and (cc.check_time >= #{startDate}
+            and cc.check_time <![CDATA[ < ]]> date_add(#{endDate} , interval 1 day))
+        </if>
+        group by cc.checked_brigade_id, cc.checked_brigade_name, cpi.category_code_one, cpi.category_name_one
+        order by total desc
+    </select>
+
     <select id="problemComparison" resultType="com.sundot.airport.check.domain.CheckLargeScreenProblemDto">
         select cc.checked_department_id deptId,
         cc.checked_department_name deptName,
@@ -94,6 +123,9 @@
         <if test="isSelfCheck != null">
             and cc.is_self_check=#{isSelfCheck}
         </if>
+        <if test="checkedBrigadeId != null">
+            and cc.checked_brigade_id=#{checkedBrigadeId}
+        </if>
         <if test="checkedDepartmentId != null">
             and cc.checked_department_id=#{checkedDepartmentId}
         </if>
@@ -105,6 +137,35 @@
         order by total desc
     </select>
 
+    <select id="problemComparisonTwoBrigade" resultType="com.sundot.airport.check.domain.CheckLargeScreenProblemDto">
+        select cc.checked_brigade_id deptId,
+        cc.checked_brigade_name deptName,
+        cpi.category_code_two code,
+        cpi.category_name_two name,
+        count(cpi.id) total
+        from check_correction cc
+        inner join check_project_item cpi on (cpi.source_id = cc.id and cpi.type = 'CHECK_CORRECTION')
+        where 1 = 1
+        <if test="isSelfCheck != null">
+            and cc.is_self_check=#{isSelfCheck}
+        </if>
+        <if test="checkedBrigadeId != null">
+            and cc.checked_brigade_id=#{checkedBrigadeId}
+        </if>
+        <if test="checkedDepartmentId != null">
+            and cc.checked_department_id=#{checkedDepartmentId}
+        </if>
+        <if test="categoryCodeOne != null and categoryCodeOne != ''">
+            and cpi.category_code_one=#{categoryCodeOne}
+        </if>
+        <if test="startDate != null and endDate != null">
+            and (cc.check_time >= #{startDate}
+            and cc.check_time <![CDATA[ < ]]> date_add(#{endDate} , interval 1 day))
+        </if>
+        group by cc.checked_brigade_id, cc.checked_brigade_name, cpi.category_code_two, cpi.category_name_two
+        order by total desc
+    </select>
+
     <select id="problemComparisonTwo" resultType="com.sundot.airport.check.domain.CheckLargeScreenProblemDto">
         select cc.checked_department_id deptId,
         cc.checked_department_name deptName,
@@ -117,6 +178,9 @@
         <if test="isSelfCheck != null">
             and cc.is_self_check=#{isSelfCheck}
         </if>
+        <if test="checkedBrigadeId != null">
+            and cc.checked_brigade_id=#{checkedBrigadeId}
+        </if>
         <if test="checkedDepartmentId != null">
             and cc.checked_department_id=#{checkedDepartmentId}
         </if>
@@ -180,6 +244,34 @@
         order by total desc
     </select>
 
+    <select id="problemTrendBrigade" resultType="com.sundot.airport.check.domain.CheckLargeScreenProblemTrendDto">
+        select date_format(cc.check_time, '%Y-%m-%d') date,
+        cc.checked_brigade_id id,
+        cc.checked_brigade_name name,
+        count(cpi.id) total
+        from check_correction cc
+        inner join check_project_item cpi on (cpi.source_id = cc.id and cpi.type = 'CHECK_CORRECTION')
+        where 1 = 1
+        <if test="isSelfCheck != null">
+            and cc.is_self_check=#{isSelfCheck}
+        </if>
+        <if test="checkedBrigadeId != null">
+            and cc.checked_brigade_id=#{checkedBrigadeId}
+        </if>
+        <if test="checkedDepartmentId != null">
+            and cc.checked_department_id=#{checkedDepartmentId}
+        </if>
+        <if test="categoryCodeOne != null and categoryCodeOne != ''">
+            and cpi.category_code_one=#{categoryCodeOne}
+        </if>
+        <if test="startDate != null and endDate != null">
+            and (cc.check_time >= #{startDate}
+            and cc.check_time <![CDATA[ < ]]> date_add(#{endDate} , interval 1 day))
+        </if>
+        group by date_format(cc.check_time, '%Y-%m-%d'), cc.checked_brigade_id, cc.checked_brigade_name
+        order by total desc
+    </select>
+
     <select id="problemTrend" resultType="com.sundot.airport.check.domain.CheckLargeScreenProblemTrendDto">
         select date_format(cc.check_time, '%Y-%m-%d') date,
         cc.checked_department_id id,
@@ -191,6 +283,9 @@
         <if test="isSelfCheck != null">
             and cc.is_self_check=#{isSelfCheck}
         </if>
+        <if test="checkedBrigadeId != null">
+            and cc.checked_brigade_id=#{checkedBrigadeId}
+        </if>
         <if test="checkedDepartmentId != null">
             and cc.checked_department_id=#{checkedDepartmentId}
         </if>
@@ -231,7 +326,9 @@
     </select>
 
     <select id="correction" resultType="com.sundot.airport.check.domain.CheckLargeScreenCorrectionAssistDto">
-        select cc.checked_department_id departmentId,
+        select cc.checked_brigade_id brigadeId,
+        cc.checked_brigade_name brigadeName,
+        cc.checked_department_id departmentId,
         cc.checked_department_name departmentName,
         cc.checked_team_id teamId,
         cc.checked_team_name teamName,
@@ -254,6 +351,9 @@
             and (cc.check_time >= #{startDate}
             and cc.check_time <![CDATA[ < ]]> date_add(#{endDate} , interval 1 day))
         </if>
+        <if test="checkedBrigadeId != null">
+            and cc.checked_brigade_id=#{checkedBrigadeId}
+        </if>
         <if test="checkedDepartmentId != null">
             and cc.checked_department_id=#{checkedDepartmentId}
         </if>
@@ -262,6 +362,48 @@
         </if>
     </select>
 
+    <select id="correctionDistributionBrigade"
+            resultType="com.sundot.airport.check.domain.CheckLargeScreenCorrectionDto">
+        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="isSelfCheck != null">
+            and cc.is_self_check=#{isSelfCheck}
+        </if>
+        <if test="checkedBrigadeId != null">
+            and cc.checked_brigade_id=#{checkedBrigadeId}
+        </if>
+        <if test="checkedDepartmentId != null">
+            and cc.checked_department_id=#{checkedDepartmentId}
+        </if>
+        <if test="checkedTeamId != null">
+            and cc.checked_team_id=#{checkedTeamId}
+        </if>
+        <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="correctionDistribution" resultType="com.sundot.airport.check.domain.CheckLargeScreenCorrectionDto">
         select temp.deptId deptId,
         temp.deptName deptName,
@@ -287,6 +429,9 @@
         <if test="isSelfCheck != null">
             and cc.is_self_check=#{isSelfCheck}
         </if>
+        <if test="checkedBrigadeId != null">
+            and cc.checked_brigade_id=#{checkedBrigadeId}
+        </if>
         <if test="checkedDepartmentId != null">
             and cc.checked_department_id=#{checkedDepartmentId}
         </if>
@@ -325,6 +470,9 @@
         <if test="isSelfCheck != null">
             and cc.is_self_check=#{isSelfCheck}
         </if>
+        <if test="checkedBrigadeId != null">
+            and cc.checked_brigade_id=#{checkedBrigadeId}
+        </if>
         <if test="checkedDepartmentId != null">
             and cc.checked_department_id=#{checkedDepartmentId}
         </if>
@@ -369,7 +517,7 @@
             #{item}
         </foreach>
         and (cr.check_time
-        between concat(curdate(), ' 09:00:00') and concat(date_add(curdate(), interval 1 day), ' 09:00:00'))
+        between concat(curdate(), ' 00:00:00') and concat(date_add(curdate(), interval 1 day), ' 00:00:00'))
         group by cr.task_code, cr.checker_id, cr.checker_name
     </select>
 
@@ -394,6 +542,30 @@
         </foreach>
     </select>
 
+    <select id="getProblemBrigade" resultType="com.sundot.airport.check.domain.CheckLargeScreenProblemDto">
+        select distinct cc.checked_brigade_id deptId,
+        cc.checked_brigade_name deptName
+        from check_correction cc
+        inner join check_project_item cpi on (cpi.source_id = cc.id and cpi.type = 'CHECK_CORRECTION')
+        where 1 = 1
+        <if test="isSelfCheck != null">
+            and cc.is_self_check=#{isSelfCheck}
+        </if>
+        <if test="checkedBrigadeId != null">
+            and cc.checked_brigade_id=#{checkedBrigadeId}
+        </if>
+        <if test="checkedDepartmentId != null">
+            and cc.checked_department_id=#{checkedDepartmentId}
+        </if>
+        <if test="checkedTeamId != null">
+            and cc.checked_team_id=#{checkedTeamId}
+        </if>
+        <if test="startDate != null and endDate != null">
+            and (cc.check_time >= #{startDate}
+            and cc.check_time <![CDATA[ < ]]> date_add(#{endDate} , interval 1 day))
+        </if>
+    </select>
+
     <select id="getProblemDepartment" resultType="com.sundot.airport.check.domain.CheckLargeScreenProblemDto">
         select distinct cc.checked_department_id deptId,
         cc.checked_department_name deptName
@@ -403,6 +575,9 @@
         <if test="isSelfCheck != null">
             and cc.is_self_check=#{isSelfCheck}
         </if>
+        <if test="checkedBrigadeId != null">
+            and cc.checked_brigade_id=#{checkedBrigadeId}
+        </if>
         <if test="checkedDepartmentId != null">
             and cc.checked_department_id=#{checkedDepartmentId}
         </if>
@@ -424,6 +599,9 @@
         <if test="isSelfCheck != null">
             and cc.is_self_check=#{isSelfCheck}
         </if>
+        <if test="checkedBrigadeId != null">
+            and cc.checked_brigade_id=#{checkedBrigadeId}
+        </if>
         <if test="checkedDepartmentId != null">
             and cc.checked_department_id=#{checkedDepartmentId}
         </if>