Bläddra i källkod

巡检模块-是否队内自查

chenshudong 2 månader sedan
förälder
incheckning
a012a378c0

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

@@ -2,15 +2,20 @@ package com.sundot.airport.web.controller.check;
2
 
2
 
3
 import java.util.Collections;
3
 import java.util.Collections;
4
 import java.util.List;
4
 import java.util.List;
5
+import java.util.stream.Collectors;
5
 import javax.servlet.http.HttpServletResponse;
6
 import javax.servlet.http.HttpServletResponse;
6
 
7
 
7
 import cn.hutool.core.collection.CollUtil;
8
 import cn.hutool.core.collection.CollUtil;
8
 import cn.hutool.core.util.StrUtil;
9
 import cn.hutool.core.util.StrUtil;
9
 import com.sundot.airport.common.core.domain.DataPermissionResult;
10
 import com.sundot.airport.common.core.domain.DataPermissionResult;
11
+import com.sundot.airport.common.core.domain.entity.SysDept;
12
+import com.sundot.airport.common.core.domain.entity.SysRole;
10
 import com.sundot.airport.common.enums.CheckLevelEnum;
13
 import com.sundot.airport.common.enums.CheckLevelEnum;
11
 import com.sundot.airport.common.enums.CheckTaskStatusEnum;
14
 import com.sundot.airport.common.enums.CheckTaskStatusEnum;
15
+import com.sundot.airport.common.enums.RoleTypeEnum;
12
 import com.sundot.airport.common.enums.SourceTypeEnum;
16
 import com.sundot.airport.common.enums.SourceTypeEnum;
13
 import com.sundot.airport.common.utils.SecurityUtils;
17
 import com.sundot.airport.common.utils.SecurityUtils;
18
+import com.sundot.airport.system.service.ISysDeptService;
14
 import com.sundot.airport.web.core.utils.DataPermissionUtils;
19
 import com.sundot.airport.web.core.utils.DataPermissionUtils;
15
 import org.springframework.security.access.prepost.PreAuthorize;
20
 import org.springframework.security.access.prepost.PreAuthorize;
16
 import org.springframework.beans.factory.annotation.Autowired;
21
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,6 +48,8 @@ import com.sundot.airport.common.core.page.TableDataInfo;
43
 public class CheckTaskController extends BaseController {
48
 public class CheckTaskController extends BaseController {
44
     @Autowired
49
     @Autowired
45
     private ICheckTaskService checkTaskService;
50
     private ICheckTaskService checkTaskService;
51
+    @Autowired
52
+    private ISysDeptService sysDeptService;
46
 
53
 
47
     /**
54
     /**
48
      * 查询检查任务列表
55
      * 查询检查任务列表
@@ -62,15 +69,24 @@ public class CheckTaskController extends BaseController {
62
                     checkTask.setCheckLevel(CheckLevelEnum.STATION_LEVEL.getCode());
69
                     checkTask.setCheckLevel(CheckLevelEnum.STATION_LEVEL.getCode());
63
                     break;
70
                     break;
64
                 case BRIGADE:
71
                 case BRIGADE:
65
-                    checkTask.setCheckLevel(CheckLevelEnum.BRIGADE_LEVEL.getCode());
72
+                    List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
73
+                    List<String> roleKeyList = roles.stream().map(SysRole::getRoleKey).collect(Collectors.toList());
74
+                    if (roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
75
+                        checkTask.setCheckLevel(CheckLevelEnum.BRIGADE_LEVEL.getCode());
76
+                        checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
77
+                    } else {
78
+                        return getDataTable(Collections.emptyList());
79
+                    }
66
                     break;
80
                     break;
67
                 case DEPARTMENT:
81
                 case DEPARTMENT:
68
                     checkTask.setCheckLevel(CheckLevelEnum.DEPARTMENT_LEVEL.getCode());
82
                     checkTask.setCheckLevel(CheckLevelEnum.DEPARTMENT_LEVEL.getCode());
69
-                    checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
83
+                    checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getParentId());
70
                     break;
84
                     break;
71
                 case TEAM:
85
                 case TEAM:
72
                     checkTask.setCheckLevel(CheckLevelEnum.TEAM_LEVEL.getCode());
86
                     checkTask.setCheckLevel(CheckLevelEnum.TEAM_LEVEL.getCode());
73
-                    checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getParentId());
87
+                    SysDept teamDept = SecurityUtils.getLoginUser().getUser().getDept();
88
+                    SysDept departmentDept = sysDeptService.selectDeptById(teamDept.getParentId());
89
+                    checkTask.setSelfCheckDeptId(departmentDept.getParentId());
74
                     break;
90
                     break;
75
                 default:
91
                 default:
76
                     return getDataTable(Collections.emptyList());
92
                     return getDataTable(Collections.emptyList());
@@ -83,10 +99,11 @@ public class CheckTaskController extends BaseController {
83
                     list = checkTaskService.selectCheckTaskList(checkTask);
99
                     list = checkTaskService.selectCheckTaskList(checkTask);
84
                     break;
100
                     break;
85
                 case BRIGADE:
101
                 case BRIGADE:
102
+                    checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
86
                     list = checkTaskService.selectCheckTaskListBrigadeWeb(checkTask);
103
                     list = checkTaskService.selectCheckTaskListBrigadeWeb(checkTask);
87
                     break;
104
                     break;
88
                 case DEPARTMENT:
105
                 case DEPARTMENT:
89
-                    checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
106
+                    checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getParentId());
90
                     list = checkTaskService.selectCheckTaskListWeb(checkTask);
107
                     list = checkTaskService.selectCheckTaskListWeb(checkTask);
91
                     break;
108
                     break;
92
                 default:
109
                 default:
@@ -113,10 +130,11 @@ public class CheckTaskController extends BaseController {
113
                 list = checkTaskService.selectCheckTaskList(checkTask);
130
                 list = checkTaskService.selectCheckTaskList(checkTask);
114
                 break;
131
                 break;
115
             case BRIGADE:
132
             case BRIGADE:
133
+                checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
116
                 list = checkTaskService.selectCheckTaskListBrigadeWeb(checkTask);
134
                 list = checkTaskService.selectCheckTaskListBrigadeWeb(checkTask);
117
                 break;
135
                 break;
118
             case DEPARTMENT:
136
             case DEPARTMENT:
119
-                checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
137
+                checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getParentId());
120
                 list = checkTaskService.selectCheckTaskListWeb(checkTask);
138
                 list = checkTaskService.selectCheckTaskListWeb(checkTask);
121
                 break;
139
                 break;
122
             default:
140
             default:
@@ -188,14 +206,17 @@ public class CheckTaskController extends BaseController {
188
                 break;
206
                 break;
189
             case BRIGADE:
207
             case BRIGADE:
190
                 checkTask.setCheckLevel(CheckLevelEnum.BRIGADE_LEVEL.getCode());
208
                 checkTask.setCheckLevel(CheckLevelEnum.BRIGADE_LEVEL.getCode());
209
+                checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
191
                 break;
210
                 break;
192
             case DEPARTMENT:
211
             case DEPARTMENT:
193
                 checkTask.setCheckLevel(CheckLevelEnum.DEPARTMENT_LEVEL.getCode());
212
                 checkTask.setCheckLevel(CheckLevelEnum.DEPARTMENT_LEVEL.getCode());
194
-                checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
213
+                checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getParentId());
195
                 break;
214
                 break;
196
             case TEAM:
215
             case TEAM:
197
                 checkTask.setCheckLevel(CheckLevelEnum.TEAM_LEVEL.getCode());
216
                 checkTask.setCheckLevel(CheckLevelEnum.TEAM_LEVEL.getCode());
198
-                checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getParentId());
217
+                SysDept teamDept = SecurityUtils.getLoginUser().getUser().getDept();
218
+                SysDept departmentDept = sysDeptService.selectDeptById(teamDept.getParentId());
219
+                checkTask.setSelfCheckDeptId(departmentDept.getParentId());
199
                 break;
220
                 break;
200
             default:
221
             default:
201
                 return success(0);
222
                 return success(0);

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

@@ -151,9 +151,9 @@ public class CheckTask extends BaseEntity {
151
     private String ruleTypeDesc;
151
     private String ruleTypeDesc;
152
 
152
 
153
     /**
153
     /**
154
-     * 是否内自查(0=否;1=是)
154
+     * 是否内自查(0=否;1=是)
155
      */
155
      */
156
-    @Excel(name = "是否内自查(0=否;1=是)")
156
+    @Excel(name = "是否内自查(0=否;1=是)")
157
     private Integer isSelfCheck;
157
     private Integer isSelfCheck;
158
 
158
 
159
     /**
159
     /**
@@ -175,15 +175,15 @@ public class CheckTask extends BaseEntity {
175
     private Long updateId;
175
     private Long updateId;
176
 
176
 
177
     /**
177
     /**
178
-     * 自查科室ID
178
+     * 自查大队ID
179
      */
179
      */
180
-    @Excel(name = "自查科室ID")
180
+    @Excel(name = "自查大队ID")
181
     private Long selfCheckDeptId;
181
     private Long selfCheckDeptId;
182
 
182
 
183
     /**
183
     /**
184
-     * 自查科室名称
184
+     * 自查大队名称
185
      */
185
      */
186
-    @Excel(name = "自查科室名称")
186
+    @Excel(name = "自查大队名称")
187
     private String selfCheckDeptName;
187
     private String selfCheckDeptName;
188
 
188
 
189
     /**
189
     /**

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

@@ -115,7 +115,7 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
115
                 dto.setIsSelfCheck(0);
115
                 dto.setIsSelfCheck(0);
116
                 dto.setCreateId(null);
116
                 dto.setCreateId(null);
117
             } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
117
             } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
118
-                dto.setIsSelfCheck(0);
118
+                dto.setIsSelfCheck(1);
119
                 dto.setCreateId(SecurityUtils.getLoginUser().getUserId());
119
                 dto.setCreateId(SecurityUtils.getLoginUser().getUserId());
120
             } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
120
             } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
121
                 dto.setIsSelfCheck(0);
121
                 dto.setIsSelfCheck(0);
@@ -162,7 +162,7 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
162
                 dto.setIsSelfCheck(0);
162
                 dto.setIsSelfCheck(0);
163
                 dto.setCreateId(null);
163
                 dto.setCreateId(null);
164
             } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
164
             } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
165
-                dto.setIsSelfCheck(0);
165
+                dto.setIsSelfCheck(1);
166
                 dto.setCreateId(SecurityUtils.getLoginUser().getUserId());
166
                 dto.setCreateId(SecurityUtils.getLoginUser().getUserId());
167
             } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
167
             } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
168
                 dto.setIsSelfCheck(0);
168
                 dto.setIsSelfCheck(0);
@@ -209,7 +209,7 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
209
                 dto.setIsSelfCheck(0);
209
                 dto.setIsSelfCheck(0);
210
                 dto.setCreateId(null);
210
                 dto.setCreateId(null);
211
             } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
211
             } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
212
-                dto.setIsSelfCheck(0);
212
+                dto.setIsSelfCheck(1);
213
                 dto.setCreateId(SecurityUtils.getLoginUser().getUserId());
213
                 dto.setCreateId(SecurityUtils.getLoginUser().getUserId());
214
             } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
214
             } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
215
                 dto.setIsSelfCheck(0);
215
                 dto.setIsSelfCheck(0);
@@ -241,13 +241,13 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
241
             } else if (roleKeyList.contains(RoleTypeEnum.test.getCode()) || roleKeyList.contains(RoleTypeEnum.zhijianke.getCode())) {
241
             } else if (roleKeyList.contains(RoleTypeEnum.test.getCode()) || roleKeyList.contains(RoleTypeEnum.zhijianke.getCode())) {
242
                 dto.setIsSelfCheck(0);
242
                 dto.setIsSelfCheck(0);
243
             } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
243
             } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
244
-                dto.setIsSelfCheck(0);
244
+                dto.setIsSelfCheck(null);
245
                 dto.setCheckedBrigadeId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
245
                 dto.setCheckedBrigadeId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
246
             } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
246
             } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
247
-                dto.setIsSelfCheck(0);
247
+                dto.setIsSelfCheck(null);
248
                 dto.setCheckedDepartmentId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
248
                 dto.setCheckedDepartmentId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
249
             } else if (roleKeyList.contains(RoleTypeEnum.banzuzhang.getCode())) {
249
             } else if (roleKeyList.contains(RoleTypeEnum.banzuzhang.getCode())) {
250
-                dto.setIsSelfCheck(0);
250
+                dto.setIsSelfCheck(null);
251
                 dto.setCheckedTeamId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
251
                 dto.setCheckedTeamId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
252
             } else {
252
             } else {
253
                 return Collections.emptyList();
253
                 return Collections.emptyList();
@@ -291,15 +291,15 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
291
                 dto.setIsSelfCheck(0);
291
                 dto.setIsSelfCheck(0);
292
                 resultTemp = checkLargeScreenMapper.problemComparisonBrigade(dto);
292
                 resultTemp = checkLargeScreenMapper.problemComparisonBrigade(dto);
293
             } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
293
             } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
294
-                dto.setIsSelfCheck(0);
294
+                dto.setIsSelfCheck(null);
295
                 dto.setCheckedBrigadeId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
295
                 dto.setCheckedBrigadeId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
296
                 resultTemp = checkLargeScreenMapper.problemComparisonBrigade(dto);
296
                 resultTemp = checkLargeScreenMapper.problemComparisonBrigade(dto);
297
             } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
297
             } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
298
-                dto.setIsSelfCheck(0);
298
+                dto.setIsSelfCheck(null);
299
                 dto.setCheckedDepartmentId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
299
                 dto.setCheckedDepartmentId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
300
                 resultTemp = checkLargeScreenMapper.problemComparison(dto);
300
                 resultTemp = checkLargeScreenMapper.problemComparison(dto);
301
             } else if (roleKeyList.contains(RoleTypeEnum.banzuzhang.getCode())) {
301
             } else if (roleKeyList.contains(RoleTypeEnum.banzuzhang.getCode())) {
302
-                dto.setIsSelfCheck(0);
302
+                dto.setIsSelfCheck(null);
303
                 dto.setCheckedTeamId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
303
                 dto.setCheckedTeamId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
304
                 resultTemp = checkLargeScreenMapper.problemComparisonBanZu(dto);
304
                 resultTemp = checkLargeScreenMapper.problemComparisonBanZu(dto);
305
             } else {
305
             } else {
@@ -358,17 +358,17 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
358
                 resultTemp = checkLargeScreenMapper.problemComparisonTwoBrigade(dto);
358
                 resultTemp = checkLargeScreenMapper.problemComparisonTwoBrigade(dto);
359
                 deptList = checkLargeScreenMapper.getProblemBrigade(dto);
359
                 deptList = checkLargeScreenMapper.getProblemBrigade(dto);
360
             } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
360
             } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
361
-                dto.setIsSelfCheck(0);
361
+                dto.setIsSelfCheck(null);
362
                 dto.setCheckedBrigadeId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
362
                 dto.setCheckedBrigadeId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
363
                 resultTemp = checkLargeScreenMapper.problemComparisonTwoBrigade(dto);
363
                 resultTemp = checkLargeScreenMapper.problemComparisonTwoBrigade(dto);
364
                 deptList = checkLargeScreenMapper.getProblemBrigade(dto);
364
                 deptList = checkLargeScreenMapper.getProblemBrigade(dto);
365
             } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
365
             } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
366
-                dto.setIsSelfCheck(0);
366
+                dto.setIsSelfCheck(null);
367
                 dto.setCheckedDepartmentId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
367
                 dto.setCheckedDepartmentId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
368
                 resultTemp = checkLargeScreenMapper.problemComparisonTwo(dto);
368
                 resultTemp = checkLargeScreenMapper.problemComparisonTwo(dto);
369
                 deptList = checkLargeScreenMapper.getProblemDepartment(dto);
369
                 deptList = checkLargeScreenMapper.getProblemDepartment(dto);
370
             } else if (roleKeyList.contains(RoleTypeEnum.banzuzhang.getCode())) {
370
             } else if (roleKeyList.contains(RoleTypeEnum.banzuzhang.getCode())) {
371
-                dto.setIsSelfCheck(0);
371
+                dto.setIsSelfCheck(null);
372
                 dto.setCheckedTeamId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
372
                 dto.setCheckedTeamId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
373
                 resultTemp = checkLargeScreenMapper.problemComparisonTwoBanZu(dto);
373
                 resultTemp = checkLargeScreenMapper.problemComparisonTwoBanZu(dto);
374
                 deptList = checkLargeScreenMapper.getProblemTeam(dto);
374
                 deptList = checkLargeScreenMapper.getProblemTeam(dto);
@@ -495,13 +495,13 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
495
             } else if (roleKeyList.contains(RoleTypeEnum.test.getCode()) || roleKeyList.contains(RoleTypeEnum.zhijianke.getCode())) {
495
             } else if (roleKeyList.contains(RoleTypeEnum.test.getCode()) || roleKeyList.contains(RoleTypeEnum.zhijianke.getCode())) {
496
                 dto.setIsSelfCheck(0);
496
                 dto.setIsSelfCheck(0);
497
             } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
497
             } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
498
-                dto.setIsSelfCheck(0);
498
+                dto.setIsSelfCheck(null);
499
                 dto.setCheckedBrigadeId(SecurityUtils.getLoginUser().getDeptId());
499
                 dto.setCheckedBrigadeId(SecurityUtils.getLoginUser().getDeptId());
500
             } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
500
             } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
501
-                dto.setIsSelfCheck(0);
501
+                dto.setIsSelfCheck(null);
502
                 dto.setCheckedDepartmentId(SecurityUtils.getLoginUser().getDeptId());
502
                 dto.setCheckedDepartmentId(SecurityUtils.getLoginUser().getDeptId());
503
             } else if (roleKeyList.contains(RoleTypeEnum.banzuzhang.getCode())) {
503
             } else if (roleKeyList.contains(RoleTypeEnum.banzuzhang.getCode())) {
504
-                dto.setIsSelfCheck(0);
504
+                dto.setIsSelfCheck(null);
505
                 dto.setCheckedTeamId(SecurityUtils.getLoginUser().getDeptId());
505
                 dto.setCheckedTeamId(SecurityUtils.getLoginUser().getDeptId());
506
             } else {
506
             } else {
507
                 return null;
507
                 return null;
@@ -553,15 +553,15 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
553
                 dto.setIsSelfCheck(0);
553
                 dto.setIsSelfCheck(0);
554
                 result = checkLargeScreenMapper.correctionDistributionBrigade(dto);
554
                 result = checkLargeScreenMapper.correctionDistributionBrigade(dto);
555
             } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
555
             } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
556
-                dto.setIsSelfCheck(0);
556
+                dto.setIsSelfCheck(null);
557
                 dto.setCheckedBrigadeId(SecurityUtils.getLoginUser().getDeptId());
557
                 dto.setCheckedBrigadeId(SecurityUtils.getLoginUser().getDeptId());
558
                 result = checkLargeScreenMapper.correctionDistributionBrigade(dto);
558
                 result = checkLargeScreenMapper.correctionDistributionBrigade(dto);
559
             } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
559
             } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
560
-                dto.setIsSelfCheck(0);
560
+                dto.setIsSelfCheck(null);
561
                 dto.setCheckedDepartmentId(SecurityUtils.getLoginUser().getDeptId());
561
                 dto.setCheckedDepartmentId(SecurityUtils.getLoginUser().getDeptId());
562
                 result = checkLargeScreenMapper.correctionDistribution(dto);
562
                 result = checkLargeScreenMapper.correctionDistribution(dto);
563
             } else if (roleKeyList.contains(RoleTypeEnum.banzuzhang.getCode())) {
563
             } else if (roleKeyList.contains(RoleTypeEnum.banzuzhang.getCode())) {
564
-                dto.setIsSelfCheck(0);
564
+                dto.setIsSelfCheck(null);
565
                 dto.setCheckedTeamId(SecurityUtils.getLoginUser().getDeptId());
565
                 dto.setCheckedTeamId(SecurityUtils.getLoginUser().getDeptId());
566
                 result = checkLargeScreenMapper.correctionDistributionBanZu(dto);
566
                 result = checkLargeScreenMapper.correctionDistributionBanZu(dto);
567
             } else {
567
             } else {
@@ -982,21 +982,21 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
982
             if (roleKeyList.contains(RoleTypeEnum.admin.getCode())) {
982
             if (roleKeyList.contains(RoleTypeEnum.admin.getCode())) {
983
                 dto.setIsSelfCheck(null);
983
                 dto.setIsSelfCheck(null);
984
             } else if (roleKeyList.contains(RoleTypeEnum.test.getCode()) || roleKeyList.contains(RoleTypeEnum.zhijianke.getCode())) {
984
             } else if (roleKeyList.contains(RoleTypeEnum.test.getCode()) || roleKeyList.contains(RoleTypeEnum.zhijianke.getCode())) {
985
-                dto.setIsSelfCheck(0);
985
+                dto.setIsSelfCheck(null);
986
             } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
986
             } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
987
-                dto.setIsSelfCheck(0);
987
+                dto.setIsSelfCheck(null);
988
                 brigadeId = SecurityUtils.getLoginUser().getDeptId();
988
                 brigadeId = SecurityUtils.getLoginUser().getDeptId();
989
                 dto.setCheckedBrigadeId(brigadeId);
989
                 dto.setCheckedBrigadeId(brigadeId);
990
             } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
990
             } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
991
-                dto.setIsSelfCheck(0);
991
+                dto.setIsSelfCheck(null);
992
                 departmentId = SecurityUtils.getLoginUser().getDeptId();
992
                 departmentId = SecurityUtils.getLoginUser().getDeptId();
993
                 dto.setCheckedDepartmentId(departmentId);
993
                 dto.setCheckedDepartmentId(departmentId);
994
             } else if (roleKeyList.contains(RoleTypeEnum.banzuzhang.getCode())) {
994
             } else if (roleKeyList.contains(RoleTypeEnum.banzuzhang.getCode())) {
995
-                dto.setIsSelfCheck(0);
995
+                dto.setIsSelfCheck(null);
996
                 teamId = SecurityUtils.getLoginUser().getDeptId();
996
                 teamId = SecurityUtils.getLoginUser().getDeptId();
997
                 dto.setCheckedTeamId(teamId);
997
                 dto.setCheckedTeamId(teamId);
998
             } else if (roleKeyList.contains(RoleTypeEnum.SecurityCheck.getCode())) {
998
             } else if (roleKeyList.contains(RoleTypeEnum.SecurityCheck.getCode())) {
999
-                dto.setIsSelfCheck(0);
999
+                dto.setIsSelfCheck(null);
1000
                 userId = SecurityUtils.getLoginUser().getUserId();
1000
                 userId = SecurityUtils.getLoginUser().getUserId();
1001
                 dto.setCheckedUserId(userId);
1001
                 dto.setCheckedUserId(userId);
1002
             } else {
1002
             } else {

+ 2 - 1
airport-check/src/main/resources/mapper/check/CheckTaskMapper.xml

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