巡检模块-是否队内自查

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

@@ -2,15 +2,20 @@ package com.sundot.airport.web.controller.check;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.sundot.airport.common.core.domain.DataPermissionResult;
+import com.sundot.airport.common.core.domain.entity.SysDept;
+import com.sundot.airport.common.core.domain.entity.SysRole;
 import com.sundot.airport.common.enums.CheckLevelEnum;
 import com.sundot.airport.common.enums.CheckTaskStatusEnum;
+import com.sundot.airport.common.enums.RoleTypeEnum;
 import com.sundot.airport.common.enums.SourceTypeEnum;
 import com.sundot.airport.common.utils.SecurityUtils;
+import com.sundot.airport.system.service.ISysDeptService;
 import com.sundot.airport.web.core.utils.DataPermissionUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,6 +48,8 @@ import com.sundot.airport.common.core.page.TableDataInfo;
 public class CheckTaskController extends BaseController {
     @Autowired
     private ICheckTaskService checkTaskService;
+    @Autowired
+    private ISysDeptService sysDeptService;
 
     /**
      * 查询检查任务列表
@@ -62,15 +69,24 @@ public class CheckTaskController extends BaseController {
                     checkTask.setCheckLevel(CheckLevelEnum.STATION_LEVEL.getCode());
                     break;
                 case BRIGADE:
-                    checkTask.setCheckLevel(CheckLevelEnum.BRIGADE_LEVEL.getCode());
+                    List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
+                    List<String> roleKeyList = roles.stream().map(SysRole::getRoleKey).collect(Collectors.toList());
+                    if (roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
+                        checkTask.setCheckLevel(CheckLevelEnum.BRIGADE_LEVEL.getCode());
+                        checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
+                    } else {
+                        return getDataTable(Collections.emptyList());
+                    }
                     break;
                 case DEPARTMENT:
                     checkTask.setCheckLevel(CheckLevelEnum.DEPARTMENT_LEVEL.getCode());
-                    checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
+                    checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getParentId());
                     break;
                 case TEAM:
                     checkTask.setCheckLevel(CheckLevelEnum.TEAM_LEVEL.getCode());
-                    checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getParentId());
+                    SysDept teamDept = SecurityUtils.getLoginUser().getUser().getDept();
+                    SysDept departmentDept = sysDeptService.selectDeptById(teamDept.getParentId());
+                    checkTask.setSelfCheckDeptId(departmentDept.getParentId());
                     break;
                 default:
                     return getDataTable(Collections.emptyList());
@@ -83,10 +99,11 @@ public class CheckTaskController extends BaseController {
                     list = checkTaskService.selectCheckTaskList(checkTask);
                     break;
                 case BRIGADE:
+                    checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
                     list = checkTaskService.selectCheckTaskListBrigadeWeb(checkTask);
                     break;
                 case DEPARTMENT:
-                    checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
+                    checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getParentId());
                     list = checkTaskService.selectCheckTaskListWeb(checkTask);
                     break;
                 default:
@@ -113,10 +130,11 @@ public class CheckTaskController extends BaseController {
                 list = checkTaskService.selectCheckTaskList(checkTask);
                 break;
             case BRIGADE:
+                checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
                 list = checkTaskService.selectCheckTaskListBrigadeWeb(checkTask);
                 break;
             case DEPARTMENT:
-                checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
+                checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getParentId());
                 list = checkTaskService.selectCheckTaskListWeb(checkTask);
                 break;
             default:
@@ -188,14 +206,17 @@ public class CheckTaskController extends BaseController {
                 break;
             case BRIGADE:
                 checkTask.setCheckLevel(CheckLevelEnum.BRIGADE_LEVEL.getCode());
+                checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
                 break;
             case DEPARTMENT:
                 checkTask.setCheckLevel(CheckLevelEnum.DEPARTMENT_LEVEL.getCode());
-                checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
+                checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getParentId());
                 break;
             case TEAM:
                 checkTask.setCheckLevel(CheckLevelEnum.TEAM_LEVEL.getCode());
-                checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getParentId());
+                SysDept teamDept = SecurityUtils.getLoginUser().getUser().getDept();
+                SysDept departmentDept = sysDeptService.selectDeptById(teamDept.getParentId());
+                checkTask.setSelfCheckDeptId(departmentDept.getParentId());
                 break;
             default:
                 return success(0);

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

@@ -151,9 +151,9 @@ public class CheckTask extends BaseEntity {
     private String ruleTypeDesc;
 
     /**
-     * 是否科内自查(0=否;1=是)
+     * 是否队内自查(0=否;1=是)
      */
-    @Excel(name = "是否科内自查(0=否;1=是)")
+    @Excel(name = "是否队内自查(0=否;1=是)")
     private Integer isSelfCheck;
 
     /**
@@ -175,15 +175,15 @@ public class CheckTask extends BaseEntity {
     private Long updateId;
 
     /**
-     * 自查科室ID
+     * 自查大队ID
      */
-    @Excel(name = "自查科室ID")
+    @Excel(name = "自查大队ID")
     private Long selfCheckDeptId;
 
     /**
-     * 自查科室名称
+     * 自查大队名称
      */
-    @Excel(name = "自查科室名称")
+    @Excel(name = "自查大队名称")
     private String selfCheckDeptName;
 
     /**

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

@@ -115,7 +115,7 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
                 dto.setIsSelfCheck(0);
                 dto.setCreateId(null);
             } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
-                dto.setIsSelfCheck(0);
+                dto.setIsSelfCheck(1);
                 dto.setCreateId(SecurityUtils.getLoginUser().getUserId());
             } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
                 dto.setIsSelfCheck(0);
@@ -162,7 +162,7 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
                 dto.setIsSelfCheck(0);
                 dto.setCreateId(null);
             } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
-                dto.setIsSelfCheck(0);
+                dto.setIsSelfCheck(1);
                 dto.setCreateId(SecurityUtils.getLoginUser().getUserId());
             } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
                 dto.setIsSelfCheck(0);
@@ -209,7 +209,7 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
                 dto.setIsSelfCheck(0);
                 dto.setCreateId(null);
             } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
-                dto.setIsSelfCheck(0);
+                dto.setIsSelfCheck(1);
                 dto.setCreateId(SecurityUtils.getLoginUser().getUserId());
             } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
                 dto.setIsSelfCheck(0);
@@ -241,13 +241,13 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
             } 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.setIsSelfCheck(null);
                 dto.setCheckedBrigadeId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
             } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
-                dto.setIsSelfCheck(0);
+                dto.setIsSelfCheck(null);
                 dto.setCheckedDepartmentId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
             } else if (roleKeyList.contains(RoleTypeEnum.banzuzhang.getCode())) {
-                dto.setIsSelfCheck(0);
+                dto.setIsSelfCheck(null);
                 dto.setCheckedTeamId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
             } else {
                 return Collections.emptyList();
@@ -291,15 +291,15 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
                 dto.setIsSelfCheck(0);
                 resultTemp = checkLargeScreenMapper.problemComparisonBrigade(dto);
             } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
-                dto.setIsSelfCheck(0);
+                dto.setIsSelfCheck(null);
                 dto.setCheckedBrigadeId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
                 resultTemp = checkLargeScreenMapper.problemComparisonBrigade(dto);
             } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
-                dto.setIsSelfCheck(0);
+                dto.setIsSelfCheck(null);
                 dto.setCheckedDepartmentId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
                 resultTemp = checkLargeScreenMapper.problemComparison(dto);
             } else if (roleKeyList.contains(RoleTypeEnum.banzuzhang.getCode())) {
-                dto.setIsSelfCheck(0);
+                dto.setIsSelfCheck(null);
                 dto.setCheckedTeamId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
                 resultTemp = checkLargeScreenMapper.problemComparisonBanZu(dto);
             } else {
@@ -358,17 +358,17 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
                 resultTemp = checkLargeScreenMapper.problemComparisonTwoBrigade(dto);
                 deptList = checkLargeScreenMapper.getProblemBrigade(dto);
             } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
-                dto.setIsSelfCheck(0);
+                dto.setIsSelfCheck(null);
                 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.setIsSelfCheck(null);
                 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.setIsSelfCheck(null);
                 dto.setCheckedTeamId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
                 resultTemp = checkLargeScreenMapper.problemComparisonTwoBanZu(dto);
                 deptList = checkLargeScreenMapper.getProblemTeam(dto);
@@ -495,13 +495,13 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
             } 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.setIsSelfCheck(null);
                 dto.setCheckedBrigadeId(SecurityUtils.getLoginUser().getDeptId());
             } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
-                dto.setIsSelfCheck(0);
+                dto.setIsSelfCheck(null);
                 dto.setCheckedDepartmentId(SecurityUtils.getLoginUser().getDeptId());
             } else if (roleKeyList.contains(RoleTypeEnum.banzuzhang.getCode())) {
-                dto.setIsSelfCheck(0);
+                dto.setIsSelfCheck(null);
                 dto.setCheckedTeamId(SecurityUtils.getLoginUser().getDeptId());
             } else {
                 return null;
@@ -553,15 +553,15 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
                 dto.setIsSelfCheck(0);
                 result = checkLargeScreenMapper.correctionDistributionBrigade(dto);
             } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
-                dto.setIsSelfCheck(0);
+                dto.setIsSelfCheck(null);
                 dto.setCheckedBrigadeId(SecurityUtils.getLoginUser().getDeptId());
                 result = checkLargeScreenMapper.correctionDistributionBrigade(dto);
             } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
-                dto.setIsSelfCheck(0);
+                dto.setIsSelfCheck(null);
                 dto.setCheckedDepartmentId(SecurityUtils.getLoginUser().getDeptId());
                 result = checkLargeScreenMapper.correctionDistribution(dto);
             } else if (roleKeyList.contains(RoleTypeEnum.banzuzhang.getCode())) {
-                dto.setIsSelfCheck(0);
+                dto.setIsSelfCheck(null);
                 dto.setCheckedTeamId(SecurityUtils.getLoginUser().getDeptId());
                 result = checkLargeScreenMapper.correctionDistributionBanZu(dto);
             } else {
@@ -982,21 +982,21 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
             if (roleKeyList.contains(RoleTypeEnum.admin.getCode())) {
                 dto.setIsSelfCheck(null);
             } else if (roleKeyList.contains(RoleTypeEnum.test.getCode()) || roleKeyList.contains(RoleTypeEnum.zhijianke.getCode())) {
-                dto.setIsSelfCheck(0);
+                dto.setIsSelfCheck(null);
             } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
-                dto.setIsSelfCheck(0);
+                dto.setIsSelfCheck(null);
                 brigadeId = SecurityUtils.getLoginUser().getDeptId();
                 dto.setCheckedBrigadeId(brigadeId);
             } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
-                dto.setIsSelfCheck(0);
+                dto.setIsSelfCheck(null);
                 departmentId = SecurityUtils.getLoginUser().getDeptId();
                 dto.setCheckedDepartmentId(departmentId);
             } else if (roleKeyList.contains(RoleTypeEnum.banzuzhang.getCode())) {
-                dto.setIsSelfCheck(0);
+                dto.setIsSelfCheck(null);
                 teamId = SecurityUtils.getLoginUser().getDeptId();
                 dto.setCheckedTeamId(teamId);
             } else if (roleKeyList.contains(RoleTypeEnum.SecurityCheck.getCode())) {
-                dto.setIsSelfCheck(0);
+                dto.setIsSelfCheck(null);
                 userId = SecurityUtils.getLoginUser().getUserId();
                 dto.setCheckedUserId(userId);
             } else {

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

@@ -304,7 +304,8 @@
                 </otherwise>
             </choose>
             <if test="checkedLevel != null  and checkedLevel != ''">and checked_level = #{checkedLevel}</if>
-            and check_level in ('BRIGADE_LEVEL','DEPARTMENT_LEVEL', 'TEAM_LEVEL')
+            and ((is_self_check = 0 and check_level in ('BRIGADE_LEVEL','DEPARTMENT_LEVEL', 'TEAM_LEVEL'))
+            or (is_self_check = 1 and self_check_dept_id = #{selfCheckDeptId}))
         </where>
         order by create_time desc
     </select>