巡检模块看板

airport-admin/src/main/java/com/sundot/airport/web/controller/check/CheckLargeScreenController.java

@@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -42,8 +43,8 @@ public class CheckLargeScreenController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('check:checkTask:list')")
     @GetMapping("/planOverview")
-    public AjaxResult planOverview(CheckLargeScreenPlanQueryParamDto dto) {
-        List<CheckLargeScreenPlanOverviewDto> result = checkLargeScreenService.planOverview(dto);
+    public AjaxResult planOverview(CheckLargeScreenPlanQueryParamDto dto, @RequestHeader(value = "X-Request-Source", defaultValue = "mobile") String source) {
+        List<CheckLargeScreenPlanOverviewDto> result = checkLargeScreenService.planOverview(dto, source);
         return success(result);
     }
 
@@ -52,8 +53,8 @@ public class CheckLargeScreenController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('check:checkTask:list')")
     @GetMapping("/planDistribution")
-    public AjaxResult planDistribution(CheckLargeScreenPlanQueryParamDto dto) {
-        List<CheckLargeScreenCommonDto> result = checkLargeScreenService.planDistribution(dto);
+    public AjaxResult planDistribution(CheckLargeScreenPlanQueryParamDto dto, @RequestHeader(value = "X-Request-Source", defaultValue = "mobile") String source) {
+        List<CheckLargeScreenCommonDto> result = checkLargeScreenService.planDistribution(dto, source);
         return success(result);
     }
 
@@ -62,8 +63,8 @@ public class CheckLargeScreenController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('check:checkTask:list')")
     @GetMapping("/planStatistics")
-    public AjaxResult planStatistics(CheckLargeScreenPlanQueryParamDto dto) {
-        List<CheckTask> result = checkLargeScreenService.planStatistics(dto);
+    public AjaxResult planStatistics(CheckLargeScreenPlanQueryParamDto dto, @RequestHeader(value = "X-Request-Source", defaultValue = "mobile") String source) {
+        List<CheckTask> result = checkLargeScreenService.planStatistics(dto, source);
         return success(result);
     }
 
@@ -72,8 +73,8 @@ public class CheckLargeScreenController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('check:checkTask:list')")
     @GetMapping("/problemDistribution")
-    public AjaxResult problemDistribution(CheckLargeScreenProblemQueryParamDto dto) {
-        List<CheckLargeScreenProblemDto> result = checkLargeScreenService.problemDistribution(dto);
+    public AjaxResult problemDistribution(CheckLargeScreenProblemQueryParamDto dto, @RequestHeader(value = "X-Request-Source", defaultValue = "mobile") String source) {
+        List<CheckLargeScreenProblemDto> result = checkLargeScreenService.problemDistribution(dto, source);
         return success(result);
     }
 
@@ -82,8 +83,8 @@ public class CheckLargeScreenController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('check:checkTask:list')")
     @GetMapping("/problemComparison")
-    public AjaxResult problemComparison(CheckLargeScreenProblemQueryParamDto dto) {
-        List<CheckLargeScreenProblemDto> result = checkLargeScreenService.problemComparison(dto);
+    public AjaxResult problemComparison(CheckLargeScreenProblemQueryParamDto dto, @RequestHeader(value = "X-Request-Source", defaultValue = "mobile") String source) {
+        List<CheckLargeScreenProblemDto> result = checkLargeScreenService.problemComparison(dto, source);
         return success(result);
     }
 
@@ -92,8 +93,8 @@ public class CheckLargeScreenController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('check:checkTask:list')")
     @GetMapping("/problemComparisonTwo")
-    public AjaxResult problemComparisonTwo(CheckLargeScreenProblemQueryParamDto dto) {
-        List<CheckLargeScreenProblemDto> result = checkLargeScreenService.problemComparisonTwo(dto);
+    public AjaxResult problemComparisonTwo(CheckLargeScreenProblemQueryParamDto dto, @RequestHeader(value = "X-Request-Source", defaultValue = "mobile") String source) {
+        List<CheckLargeScreenProblemDto> result = checkLargeScreenService.problemComparisonTwo(dto, source);
         return success(result);
     }
 
@@ -102,8 +103,8 @@ public class CheckLargeScreenController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('check:checkTask:list')")
     @GetMapping("/problemTrend")
-    public AjaxResult problemTrend(CheckLargeScreenProblemQueryParamDto dto) {
-        List<CheckLargeScreenProblemTrendDto> result = checkLargeScreenService.problemTrend(dto);
+    public AjaxResult problemTrend(CheckLargeScreenProblemQueryParamDto dto, @RequestHeader(value = "X-Request-Source", defaultValue = "mobile") String source) {
+        List<CheckLargeScreenProblemTrendDto> result = checkLargeScreenService.problemTrend(dto, source);
         return success(result);
     }
 
@@ -112,8 +113,8 @@ public class CheckLargeScreenController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('check:checkTask:list')")
     @GetMapping("/correction")
-    public AjaxResult correction(CheckLargeScreenCorrectionQueryParamDto dto) {
-        CheckLargeScreenCorrectionDto result = checkLargeScreenService.correction(dto);
+    public AjaxResult correction(CheckLargeScreenCorrectionQueryParamDto dto, @RequestHeader(value = "X-Request-Source", defaultValue = "mobile") String source) {
+        CheckLargeScreenCorrectionDto result = checkLargeScreenService.correction(dto, source);
         return success(result);
     }
 
@@ -122,8 +123,8 @@ public class CheckLargeScreenController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('check:checkTask:list')")
     @GetMapping("/correctionDistribution")
-    public AjaxResult correctionDistribution(CheckLargeScreenCorrectionQueryParamDto dto) {
-        List<CheckLargeScreenCorrectionDto> result = checkLargeScreenService.correctionDistribution(dto);
+    public AjaxResult correctionDistribution(CheckLargeScreenCorrectionQueryParamDto dto, @RequestHeader(value = "X-Request-Source", defaultValue = "mobile") String source) {
+        List<CheckLargeScreenCorrectionDto> result = checkLargeScreenService.correctionDistribution(dto, source);
         return success(result);
     }
 

airport-check/src/main/java/com/sundot/airport/check/service/ICheckLargeScreenService.java

@@ -30,7 +30,7 @@ public interface ICheckLargeScreenService {
      * @param dto 大屏查询参数
      * @return 计划安排总览
      */
-    public List<CheckLargeScreenPlanOverviewDto> planOverview(CheckLargeScreenPlanQueryParamDto dto);
+    public List<CheckLargeScreenPlanOverviewDto> planOverview(CheckLargeScreenPlanQueryParamDto dto, String source);
 
     /**
      * 巡检计划-日常任务检查指标累积分布
@@ -38,7 +38,7 @@ public interface ICheckLargeScreenService {
      * @param dto 大屏查询参数
      * @return 日常任务检查指标累积分布
      */
-    public List<CheckLargeScreenCommonDto> planDistribution(CheckLargeScreenPlanQueryParamDto dto);
+    public List<CheckLargeScreenCommonDto> planDistribution(CheckLargeScreenPlanQueryParamDto dto, String source);
 
     /**
      * 巡检计划-任务明细统计表
@@ -46,7 +46,7 @@ public interface ICheckLargeScreenService {
      * @param dto 大屏查询参数
      * @return 任务明细统计表
      */
-    public List<CheckTask> planStatistics(CheckLargeScreenPlanQueryParamDto dto);
+    public List<CheckTask> planStatistics(CheckLargeScreenPlanQueryParamDto dto, String source);
 
     /**
      * 问题发现-总体问题分布
@@ -54,7 +54,7 @@ public interface ICheckLargeScreenService {
      * @param dto 大屏查询参数
      * @return 总体问题分布
      */
-    public List<CheckLargeScreenProblemDto> problemDistribution(CheckLargeScreenProblemQueryParamDto dto);
+    public List<CheckLargeScreenProblemDto> problemDistribution(CheckLargeScreenProblemQueryParamDto dto, String source);
 
     /**
      * 问题发现-问题分布对比
@@ -62,7 +62,7 @@ public interface ICheckLargeScreenService {
      * @param dto 大屏查询参数
      * @return 问题分布对比
      */
-    public List<CheckLargeScreenProblemDto> problemComparison(CheckLargeScreenProblemQueryParamDto dto);
+    public List<CheckLargeScreenProblemDto> problemComparison(CheckLargeScreenProblemQueryParamDto dto, String source);
 
     /**
      * 问题发现-通道面貌-问题对比
@@ -70,7 +70,7 @@ public interface ICheckLargeScreenService {
      * @param dto 大屏查询参数
      * @return 通道面貌-问题对比
      */
-    public List<CheckLargeScreenProblemDto> problemComparisonTwo(CheckLargeScreenProblemQueryParamDto dto);
+    public List<CheckLargeScreenProblemDto> problemComparisonTwo(CheckLargeScreenProblemQueryParamDto dto, String source);
 
     /**
      * 问题发现-通道面貌-问题趋势
@@ -78,7 +78,7 @@ public interface ICheckLargeScreenService {
      * @param dto 大屏查询参数
      * @return 通道面貌-问题趋势
      */
-    public List<CheckLargeScreenProblemTrendDto> problemTrend(CheckLargeScreenProblemQueryParamDto dto);
+    public List<CheckLargeScreenProblemTrendDto> problemTrend(CheckLargeScreenProblemQueryParamDto dto, String source);
 
     /**
      * 问题整改-整改状态总计
@@ -86,7 +86,7 @@ public interface ICheckLargeScreenService {
      * @param dto 大屏查询参数
      * @return 整改状态总计
      */
-    public CheckLargeScreenCorrectionDto correction(CheckLargeScreenCorrectionQueryParamDto dto);
+    public CheckLargeScreenCorrectionDto correction(CheckLargeScreenCorrectionQueryParamDto dto, String source);
 
     /**
      * 问题整改-整改状态分布-科级对比
@@ -94,7 +94,7 @@ public interface ICheckLargeScreenService {
      * @param dto 大屏查询参数
      * @return 整改状态总计
      */
-    public List<CheckLargeScreenCorrectionDto> correctionDistribution(CheckLargeScreenCorrectionQueryParamDto dto);
+    public List<CheckLargeScreenCorrectionDto> correctionDistribution(CheckLargeScreenCorrectionQueryParamDto dto, String source);
 
     /**
      * 巡检执行

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

@@ -35,6 +35,7 @@ import com.sundot.airport.common.enums.CheckLevelEnum;
 import com.sundot.airport.common.enums.DeptType;
 import com.sundot.airport.common.enums.DeptTypeEnum;
 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.LargeScreenDateUtils;
 import com.sundot.airport.common.utils.SecurityUtils;
@@ -89,7 +90,7 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
      * @return 计划安排总览
      */
     @Override
-    public List<CheckLargeScreenPlanOverviewDto> planOverview(CheckLargeScreenPlanQueryParamDto dto) {
+    public List<CheckLargeScreenPlanOverviewDto> planOverview(CheckLargeScreenPlanQueryParamDto dto, String source) {
         // 1、参数校验
         validateDateRange(dto.getStartDate(), dto.getEndDate());
         // 2、生成日期序列
@@ -101,25 +102,27 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
         Map<String, String> sysDictDataMap = sysDictDataList.stream().collect(Collectors.toMap(SysDictData::getDictValue, SysDictData::getDictLabel));
         List<String> typeList = sysDictDataList.stream().map(SysDictData::getDictValue).collect(Collectors.toList());
         // 4、构建统计映射
-        List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
-        if (CollUtil.isEmpty(roles)) {
-            return Collections.emptyList();
-        }
-        List<String> roleKeyList = roles.stream().map(SysRole::getRoleKey).collect(Collectors.toList());
-        if (roleKeyList.contains(RoleTypeEnum.admin.getCode())) {
-            dto.setIsSelfCheck(null);
-            dto.setCreateId(null);
-        } 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(0);
-            dto.setCreateId(SecurityUtils.getLoginUser().getUserId());
-        } else {
-            return Collections.emptyList();
+        if (StrUtil.equals(SourceTypeEnum.mobile.getCode(), source)) {
+            List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
+            if (CollUtil.isEmpty(roles)) {
+                return Collections.emptyList();
+            }
+            List<String> roleKeyList = roles.stream().map(SysRole::getRoleKey).collect(Collectors.toList());
+            if (roleKeyList.contains(RoleTypeEnum.admin.getCode())) {
+                dto.setIsSelfCheck(null);
+                dto.setCreateId(null);
+            } 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(0);
+                dto.setCreateId(SecurityUtils.getLoginUser().getUserId());
+            } else {
+                return Collections.emptyList();
+            }
         }
         List<CheckLargeScreenPlanOverviewDto> list = checkLargeScreenMapper.planOverview(dto);
         Map<String, BigDecimal> statsMap = list.stream().collect(Collectors.toMap(item -> item.getType() + "***" + item.getDate(), CheckLargeScreenPlanOverviewDto::getTotal, (oldValue, newValue) -> newValue));
@@ -145,26 +148,28 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
      * @return 日常任务检查指标累积分布
      */
     @Override
-    public List<CheckLargeScreenCommonDto> planDistribution(CheckLargeScreenPlanQueryParamDto dto) {
-        List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
-        if (CollUtil.isEmpty(roles)) {
-            return Collections.emptyList();
-        }
-        List<String> roleKeyList = roles.stream().map(SysRole::getRoleKey).collect(Collectors.toList());
-        if (roleKeyList.contains(RoleTypeEnum.admin.getCode())) {
-            dto.setIsSelfCheck(null);
-            dto.setCreateId(null);
-        } 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(0);
-            dto.setCreateId(SecurityUtils.getLoginUser().getUserId());
-        } else {
-            return Collections.emptyList();
+    public List<CheckLargeScreenCommonDto> planDistribution(CheckLargeScreenPlanQueryParamDto dto, String source) {
+        if (StrUtil.equals(SourceTypeEnum.mobile.getCode(), source)) {
+            List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
+            if (CollUtil.isEmpty(roles)) {
+                return Collections.emptyList();
+            }
+            List<String> roleKeyList = roles.stream().map(SysRole::getRoleKey).collect(Collectors.toList());
+            if (roleKeyList.contains(RoleTypeEnum.admin.getCode())) {
+                dto.setIsSelfCheck(null);
+                dto.setCreateId(null);
+            } 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(0);
+                dto.setCreateId(SecurityUtils.getLoginUser().getUserId());
+            } else {
+                return Collections.emptyList();
+            }
         }
         List<CheckLargeScreenCommonDto> resultTemp = checkLargeScreenMapper.planDistribution(dto);
         // 未查询到的需补充0数据填充到结果中
@@ -190,26 +195,28 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
      * @return 任务明细统计表
      */
     @Override
-    public List<CheckTask> planStatistics(CheckLargeScreenPlanQueryParamDto dto) {
-        List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
-        if (CollUtil.isEmpty(roles)) {
-            return Collections.emptyList();
-        }
-        List<String> roleKeyList = roles.stream().map(SysRole::getRoleKey).collect(Collectors.toList());
-        if (roleKeyList.contains(RoleTypeEnum.admin.getCode())) {
-            dto.setIsSelfCheck(null);
-            dto.setCreateId(null);
-        } 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(0);
-            dto.setCreateId(SecurityUtils.getLoginUser().getUserId());
-        } else {
-            return Collections.emptyList();
+    public List<CheckTask> planStatistics(CheckLargeScreenPlanQueryParamDto dto, String source) {
+        if (StrUtil.equals(SourceTypeEnum.mobile.getCode(), source)) {
+            List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
+            if (CollUtil.isEmpty(roles)) {
+                return Collections.emptyList();
+            }
+            List<String> roleKeyList = roles.stream().map(SysRole::getRoleKey).collect(Collectors.toList());
+            if (roleKeyList.contains(RoleTypeEnum.admin.getCode())) {
+                dto.setIsSelfCheck(null);
+                dto.setCreateId(null);
+            } 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(0);
+                dto.setCreateId(SecurityUtils.getLoginUser().getUserId());
+            } else {
+                return Collections.emptyList();
+            }
         }
         List<CheckTask> result = checkLargeScreenMapper.planStatistics(dto);
         return result;
@@ -222,27 +229,29 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
      * @return 总体问题分布
      */
     @Override
-    public List<CheckLargeScreenProblemDto> problemDistribution(CheckLargeScreenProblemQueryParamDto dto) {
-        List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
-        if (CollUtil.isEmpty(roles)) {
-            return Collections.emptyList();
-        }
-        List<String> roleKeyList = roles.stream().map(SysRole::getRoleKey).collect(Collectors.toList());
-        if (roleKeyList.contains(RoleTypeEnum.admin.getCode())) {
-            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(0);
-            dto.setCheckedDepartmentId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
-        } else if (roleKeyList.contains(RoleTypeEnum.banzuzhang.getCode())) {
-            dto.setIsSelfCheck(0);
-            dto.setCheckedTeamId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
-        } else {
-            return Collections.emptyList();
+    public List<CheckLargeScreenProblemDto> problemDistribution(CheckLargeScreenProblemQueryParamDto dto, String source) {
+        if (StrUtil.equals(SourceTypeEnum.mobile.getCode(), source)) {
+            List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
+            if (CollUtil.isEmpty(roles)) {
+                return Collections.emptyList();
+            }
+            List<String> roleKeyList = roles.stream().map(SysRole::getRoleKey).collect(Collectors.toList());
+            if (roleKeyList.contains(RoleTypeEnum.admin.getCode())) {
+                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(0);
+                dto.setCheckedDepartmentId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
+            } else if (roleKeyList.contains(RoleTypeEnum.banzuzhang.getCode())) {
+                dto.setIsSelfCheck(0);
+                dto.setCheckedTeamId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
+            } else {
+                return Collections.emptyList();
+            }
         }
         List<CheckLargeScreenProblemDto> result = checkLargeScreenMapper.problemDistribution(dto);
         // 问题对比和问题趋势
@@ -254,8 +263,8 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
             checkLargeScreenProblemQueryParamDto.setStartDate(dto.getStartDate());
             checkLargeScreenProblemQueryParamDto.setEndDate(dto.getEndDate());
             checkLargeScreenProblemQueryParamDto.setCategoryCodeOne(item.getCode());
-            item.setCheckLargeScreenProblemDtoList(problemComparisonTwo(checkLargeScreenProblemQueryParamDto));
-            item.setCheckLargeScreenProblemTrendDtoList(problemTrend(checkLargeScreenProblemQueryParamDto));
+            item.setCheckLargeScreenProblemDtoList(problemComparisonTwo(checkLargeScreenProblemQueryParamDto, source));
+            item.setCheckLargeScreenProblemTrendDtoList(problemTrend(checkLargeScreenProblemQueryParamDto, source));
         });
         return result;
     }
@@ -267,33 +276,37 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
      * @return 问题分布对比
      */
     @Override
-    public List<CheckLargeScreenProblemDto> problemComparison(CheckLargeScreenProblemQueryParamDto dto) {
-        List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
-        if (CollUtil.isEmpty(roles)) {
-            return Collections.emptyList();
-        }
-        List<String> roleKeyList = roles.stream().map(SysRole::getRoleKey).collect(Collectors.toList());
+    public List<CheckLargeScreenProblemDto> problemComparison(CheckLargeScreenProblemQueryParamDto dto, String source) {
         List<CheckLargeScreenProblemDto> resultTemp;
-        if (roleKeyList.contains(RoleTypeEnum.admin.getCode())) {
-            dto.setIsSelfCheck(null);
-            resultTemp = checkLargeScreenMapper.problemComparisonBrigade(dto);
-        } else if (roleKeyList.contains(RoleTypeEnum.test.getCode()) || roleKeyList.contains(RoleTypeEnum.zhijianke.getCode())) {
-            dto.setIsSelfCheck(0);
-            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(0);
-            dto.setCheckedDepartmentId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
-            resultTemp = checkLargeScreenMapper.problemComparison(dto);
-        } else if (roleKeyList.contains(RoleTypeEnum.banzuzhang.getCode())) {
-            dto.setIsSelfCheck(0);
-            dto.setCheckedTeamId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
-            resultTemp = checkLargeScreenMapper.problemComparisonBanZu(dto);
+        if (StrUtil.equals(SourceTypeEnum.mobile.getCode(), source)) {
+            List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
+            if (CollUtil.isEmpty(roles)) {
+                return Collections.emptyList();
+            }
+            List<String> roleKeyList = roles.stream().map(SysRole::getRoleKey).collect(Collectors.toList());
+            if (roleKeyList.contains(RoleTypeEnum.admin.getCode())) {
+                dto.setIsSelfCheck(null);
+                resultTemp = checkLargeScreenMapper.problemComparisonBrigade(dto);
+            } else if (roleKeyList.contains(RoleTypeEnum.test.getCode()) || roleKeyList.contains(RoleTypeEnum.zhijianke.getCode())) {
+                dto.setIsSelfCheck(0);
+                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(0);
+                dto.setCheckedDepartmentId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
+                resultTemp = checkLargeScreenMapper.problemComparison(dto);
+            } else if (roleKeyList.contains(RoleTypeEnum.banzuzhang.getCode())) {
+                dto.setIsSelfCheck(0);
+                dto.setCheckedTeamId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
+                resultTemp = checkLargeScreenMapper.problemComparisonBanZu(dto);
+            } else {
+                return Collections.emptyList();
+            }
         } else {
-            return Collections.emptyList();
+            resultTemp = checkLargeScreenMapper.problemComparisonBrigade(dto);
         }
         if (CollUtil.isEmpty(resultTemp)) {
             return Collections.emptyList();
@@ -327,39 +340,44 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
      * @return 通道面貌-问题对比
      */
     @Override
-    public List<CheckLargeScreenProblemDto> problemComparisonTwo(CheckLargeScreenProblemQueryParamDto dto) {
-        List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
-        if (CollUtil.isEmpty(roles)) {
-            return Collections.emptyList();
-        }
-        List<String> roleKeyList = roles.stream().map(SysRole::getRoleKey).collect(Collectors.toList());
+    public List<CheckLargeScreenProblemDto> problemComparisonTwo(CheckLargeScreenProblemQueryParamDto dto, String source) {
         List<CheckLargeScreenProblemDto> resultTemp;
         List<CheckLargeScreenProblemDto> deptList;
-        if (roleKeyList.contains(RoleTypeEnum.admin.getCode())) {
-            dto.setIsSelfCheck(null);
-            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.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());
+        if (StrUtil.equals(SourceTypeEnum.mobile.getCode(), source)) {
+            List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
+            if (CollUtil.isEmpty(roles)) {
+                return Collections.emptyList();
+            }
+            List<String> roleKeyList = roles.stream().map(SysRole::getRoleKey).collect(Collectors.toList());
+            if (roleKeyList.contains(RoleTypeEnum.admin.getCode())) {
+                dto.setIsSelfCheck(null);
+                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.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(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(0);
+                dto.setCheckedTeamId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
+                resultTemp = checkLargeScreenMapper.problemComparisonTwoBanZu(dto);
+                deptList = checkLargeScreenMapper.getProblemTeam(dto);
+            } else {
+                return Collections.emptyList();
+            }
+        } else {
             resultTemp = checkLargeScreenMapper.problemComparisonTwoBrigade(dto);
             deptList = checkLargeScreenMapper.getProblemBrigade(dto);
-        } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
-            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(0);
-            dto.setCheckedTeamId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
-            resultTemp = checkLargeScreenMapper.problemComparisonTwoBanZu(dto);
-            deptList = checkLargeScreenMapper.getProblemTeam(dto);
-        } else {
-            return Collections.emptyList();
         }
         if (CollUtil.isEmpty(resultTemp) || CollUtil.isEmpty(deptList)) {
             return Collections.emptyList();
@@ -393,44 +411,49 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
      * @return 通道面貌-问题趋势
      */
     @Override
-    public List<CheckLargeScreenProblemTrendDto> problemTrend(CheckLargeScreenProblemQueryParamDto dto) {
+    public List<CheckLargeScreenProblemTrendDto> problemTrend(CheckLargeScreenProblemQueryParamDto dto, String source) {
         // 1、参数校验
         validateDateRange(dto.getStartDate(), dto.getEndDate());
         // 2、生成日期序列
         List<Date> dateRange = generateDateRange(dto.getStartDate(), dto.getEndDate());
         // 3、构建统计映射
-        List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
-        if (CollUtil.isEmpty(roles)) {
-            return Collections.emptyList();
-        }
-        List<String> roleKeyList = roles.stream().map(SysRole::getRoleKey).collect(Collectors.toList());
         List<CheckLargeScreenProblemTrendDto> list;
         List<CheckLargeScreenProblemDto> deptList;
-        if (roleKeyList.contains(RoleTypeEnum.admin.getCode())) {
-            dto.setIsSelfCheck(null);
-            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.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());
+        if (StrUtil.equals(SourceTypeEnum.mobile.getCode(), source)) {
+            List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
+            if (CollUtil.isEmpty(roles)) {
+                return Collections.emptyList();
+            }
+            List<String> roleKeyList = roles.stream().map(SysRole::getRoleKey).collect(Collectors.toList());
+            if (roleKeyList.contains(RoleTypeEnum.admin.getCode())) {
+                dto.setIsSelfCheck(null);
+                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.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());
+                list = checkLargeScreenMapper.problemTrend(dto);
+                deptList = checkLargeScreenMapper.getProblemDepartment(dto);
+            } else if (roleKeyList.contains(RoleTypeEnum.banzuzhang.getCode())) {
+                dto.setIsSelfCheck(null);
+                dto.setCheckedTeamId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
+                list = checkLargeScreenMapper.problemTrendBanZu(dto);
+                deptList = checkLargeScreenMapper.getProblemTeam(dto);
+            } else {
+                return Collections.emptyList();
+            }
+        } else {
             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());
-            list = checkLargeScreenMapper.problemTrend(dto);
-            deptList = checkLargeScreenMapper.getProblemDepartment(dto);
-        } else if (roleKeyList.contains(RoleTypeEnum.banzuzhang.getCode())) {
-            dto.setIsSelfCheck(null);
-            dto.setCheckedTeamId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
-            list = checkLargeScreenMapper.problemTrendBanZu(dto);
-            deptList = checkLargeScreenMapper.getProblemTeam(dto);
-        } else {
-            return Collections.emptyList();
         }
         if (CollUtil.isEmpty(list) || CollUtil.isEmpty(deptList)) {
             return Collections.emptyList();
@@ -460,27 +483,29 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
      * @return 整改状态总计
      */
     @Override
-    public CheckLargeScreenCorrectionDto correction(CheckLargeScreenCorrectionQueryParamDto dto) {
-        List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
-        if (CollUtil.isEmpty(roles)) {
-            return null;
-        }
-        List<String> roleKeyList = roles.stream().map(SysRole::getRoleKey).collect(Collectors.toList());
-        if (roleKeyList.contains(RoleTypeEnum.admin.getCode())) {
-            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(0);
-            dto.setCheckedDepartmentId(SecurityUtils.getLoginUser().getDeptId());
-        } else if (roleKeyList.contains(RoleTypeEnum.banzuzhang.getCode())) {
-            dto.setIsSelfCheck(0);
-            dto.setCheckedTeamId(SecurityUtils.getLoginUser().getDeptId());
-        } else {
-            return null;
+    public CheckLargeScreenCorrectionDto correction(CheckLargeScreenCorrectionQueryParamDto dto, String source) {
+        if (StrUtil.equals(SourceTypeEnum.mobile.getCode(), source)) {
+            List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
+            if (CollUtil.isEmpty(roles)) {
+                return null;
+            }
+            List<String> roleKeyList = roles.stream().map(SysRole::getRoleKey).collect(Collectors.toList());
+            if (roleKeyList.contains(RoleTypeEnum.admin.getCode())) {
+                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(0);
+                dto.setCheckedDepartmentId(SecurityUtils.getLoginUser().getDeptId());
+            } else if (roleKeyList.contains(RoleTypeEnum.banzuzhang.getCode())) {
+                dto.setIsSelfCheck(0);
+                dto.setCheckedTeamId(SecurityUtils.getLoginUser().getDeptId());
+            } else {
+                return null;
+            }
         }
         List<CheckLargeScreenCorrectionAssistDto> list = checkLargeScreenMapper.correction(dto);
         BigDecimal onTimeCompletedCount = BigDecimal.valueOf(list.stream().filter(item -> StringUtils.equals(CheckLargeScreenCorrectionTypeEnum.ON_TIME_COMPLETED.getCode(), item.getType())).count());
@@ -513,33 +538,37 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
      * @return 整改状态总计
      */
     @Override
-    public List<CheckLargeScreenCorrectionDto> correctionDistribution(CheckLargeScreenCorrectionQueryParamDto dto) {
-        List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
-        if (CollUtil.isEmpty(roles)) {
-            return Collections.emptyList();
-        }
-        List<String> roleKeyList = roles.stream().map(SysRole::getRoleKey).collect(Collectors.toList());
+    public List<CheckLargeScreenCorrectionDto> correctionDistribution(CheckLargeScreenCorrectionQueryParamDto dto, String source) {
         List<CheckLargeScreenCorrectionDto> result;
-        if (roleKeyList.contains(RoleTypeEnum.admin.getCode())) {
-            dto.setIsSelfCheck(null);
-            result = checkLargeScreenMapper.correctionDistributionBrigade(dto);
-        } else if (roleKeyList.contains(RoleTypeEnum.test.getCode()) || roleKeyList.contains(RoleTypeEnum.zhijianke.getCode())) {
-            dto.setIsSelfCheck(0);
-            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(0);
-            dto.setCheckedDepartmentId(SecurityUtils.getLoginUser().getDeptId());
-            result = checkLargeScreenMapper.correctionDistribution(dto);
-        } else if (roleKeyList.contains(RoleTypeEnum.banzuzhang.getCode())) {
-            dto.setIsSelfCheck(0);
-            dto.setCheckedTeamId(SecurityUtils.getLoginUser().getDeptId());
-            result = checkLargeScreenMapper.correctionDistributionBanZu(dto);
+        if (StrUtil.equals(SourceTypeEnum.mobile.getCode(), source)) {
+            List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
+            if (CollUtil.isEmpty(roles)) {
+                return Collections.emptyList();
+            }
+            List<String> roleKeyList = roles.stream().map(SysRole::getRoleKey).collect(Collectors.toList());
+            if (roleKeyList.contains(RoleTypeEnum.admin.getCode())) {
+                dto.setIsSelfCheck(null);
+                result = checkLargeScreenMapper.correctionDistributionBrigade(dto);
+            } else if (roleKeyList.contains(RoleTypeEnum.test.getCode()) || roleKeyList.contains(RoleTypeEnum.zhijianke.getCode())) {
+                dto.setIsSelfCheck(0);
+                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(0);
+                dto.setCheckedDepartmentId(SecurityUtils.getLoginUser().getDeptId());
+                result = checkLargeScreenMapper.correctionDistribution(dto);
+            } else if (roleKeyList.contains(RoleTypeEnum.banzuzhang.getCode())) {
+                dto.setIsSelfCheck(0);
+                dto.setCheckedTeamId(SecurityUtils.getLoginUser().getDeptId());
+                result = checkLargeScreenMapper.correctionDistributionBanZu(dto);
+            } else {
+                return Collections.emptyList();
+            }
         } else {
-            return Collections.emptyList();
+            result = checkLargeScreenMapper.correctionDistributionBrigade(dto);
         }
         return result;
     }

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

@@ -17,6 +17,9 @@
         <if test="createId != null">
             and ct.create_id=#{createId}
         </if>
+        <if test="deptId != null">
+            and ct.self_check_dept_id=#{deptId}
+        </if>
         <if test="startDate != null and endDate != null">
             and (ct.check_start_time >= #{startDate}
             and ct.check_start_time <![CDATA[ < ]]> date_add(#{endDate} , interval 1 day))
@@ -35,6 +38,9 @@
         <if test="createId != null">
             and ct.create_id=#{createId}
         </if>
+        <if test="deptId != null">
+            and ct.self_check_dept_id=#{deptId}
+        </if>
         <if test="startDate != null and endDate != null">
             and (ct.check_start_time >= #{startDate}
             and ct.check_start_time <![CDATA[ < ]]> date_add(#{endDate} , interval 1 day))
@@ -53,6 +59,9 @@
         <if test="createId != null">
             and ct.create_id=#{createId}
         </if>
+        <if test="deptId != null">
+            and ct.self_check_dept_id=#{deptId}
+        </if>
         <if test="startDate != null and endDate != null">
             and (ct.check_start_time >= #{startDate}
             and ct.check_start_time <![CDATA[ < ]]> date_add(#{endDate} , interval 1 day))
@@ -103,6 +112,9 @@
         <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))
@@ -129,6 +141,9 @@
         <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))
@@ -155,6 +170,9 @@
         <if test="checkedDepartmentId != null">
             and cc.checked_department_id=#{checkedDepartmentId}
         </if>
+        <if test="checkedTeamId != null">
+            and cc.checked_team_id=#{checkedTeamId}
+        </if>
         <if test="categoryCodeOne != null and categoryCodeOne != ''">
             and cpi.category_code_one=#{categoryCodeOne}
         </if>
@@ -184,6 +202,9 @@
         <if test="checkedDepartmentId != null">
             and cc.checked_department_id=#{checkedDepartmentId}
         </if>
+        <if test="checkedTeamId != null">
+            and cc.checked_team_id=#{checkedTeamId}
+        </if>
         <if test="categoryCodeOne != null and categoryCodeOne != ''">
             and cpi.category_code_one=#{categoryCodeOne}
         </if>
@@ -207,6 +228,12 @@
         <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>
@@ -230,6 +257,12 @@
         <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>
@@ -261,6 +294,9 @@
         <if test="checkedDepartmentId != null">
             and cc.checked_department_id=#{checkedDepartmentId}
         </if>
+        <if test="checkedTeamId != null">
+            and cc.checked_team_id=#{checkedTeamId}
+        </if>
         <if test="categoryCodeOne != null and categoryCodeOne != ''">
             and cpi.category_code_one=#{categoryCodeOne}
         </if>
@@ -289,6 +325,9 @@
         <if test="checkedDepartmentId != null">
             and cc.checked_department_id=#{checkedDepartmentId}
         </if>
+        <if test="checkedTeamId != null">
+            and cc.checked_team_id=#{checkedTeamId}
+        </if>
         <if test="categoryCodeOne != null and categoryCodeOne != ''">
             and cpi.category_code_one=#{categoryCodeOne}
         </if>
@@ -311,6 +350,12 @@
         <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>
@@ -647,6 +692,9 @@
         <if test="processStatus != null">
             and cc.process_status=#{processStatus}
         </if>
+        <if test="checkedBrigadeId != null">
+            and cc.checked_brigade_id=#{checkedBrigadeId}
+        </if>
         <if test="checkedDepartmentId != null">
             and cc.checked_department_id=#{checkedDepartmentId}
         </if>