巡检模块

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

@@ -56,6 +56,8 @@ public class CheckCorrectionController extends BaseController {
 
         } else if (roleKeyList.contains(RoleTypeEnum.test.getCode()) || roleKeyList.contains(RoleTypeEnum.zhijianke.getCode())) {
 
+        } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
+            checkCorrection.setCheckedBrigadeId(SecurityUtils.getLoginUser().getDeptId());
         } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
             checkCorrection.setCheckedDepartmentId(SecurityUtils.getLoginUser().getDeptId());
         } else if (roleKeyList.contains(RoleTypeEnum.banzuzhang.getCode())) {
@@ -82,6 +84,9 @@ public class CheckCorrectionController extends BaseController {
                 list = checkCorrectionService.selectCheckCorrectionList(checkCorrection);
             } else if (roleKeyList.contains(RoleTypeEnum.test.getCode()) || roleKeyList.contains(RoleTypeEnum.zhijianke.getCode())) {
                 list = checkCorrectionService.selectCheckCorrectionList(checkCorrection);
+            } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
+                checkCorrection.setCheckedBrigadeId(SecurityUtils.getLoginUser().getDeptId());
+                list = checkCorrectionService.selectCheckCorrectionList(checkCorrection);
             } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
                 checkCorrection.setCheckedDepartmentId(SecurityUtils.getLoginUser().getDeptId());
                 list = checkCorrectionService.selectCheckCorrectionList(checkCorrection);

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

@@ -68,6 +68,14 @@ public class CheckRecordController extends BaseController {
 
             } else if (roleKeyList.contains(RoleTypeEnum.test.getCode()) || roleKeyList.contains(RoleTypeEnum.zhijianke.getCode())) {
 
+            } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
+                Long deptId = SecurityUtils.getLoginUser().getDeptId();
+                List<SysUser> sysUserList = sysUserService.selectUserByDeptId(deptId);
+                if (CollUtil.isEmpty(sysUserList)) {
+                    return getDataTable(Collections.emptyList());
+                }
+                List<Long> userIdList = sysUserList.stream().map(SysUser::getUserId).distinct().collect(Collectors.toList());
+                checkRecord.setQueryCheckerIdList(userIdList);
             } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
                 Long deptId = SecurityUtils.getLoginUser().getDeptId();
                 List<SysUser> sysUserList = sysUserService.selectUserByDeptId(deptId);
@@ -104,6 +112,14 @@ public class CheckRecordController extends BaseController {
                 list = checkRecordService.selectCheckRecordList(checkRecord);
             } else if (roleKeyList.contains(RoleTypeEnum.test.getCode()) || roleKeyList.contains(RoleTypeEnum.zhijianke.getCode())) {
                 list = checkRecordService.selectCheckRecordList(checkRecord);
+            } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
+                Long deptId = SecurityUtils.getLoginUser().getDeptId();
+                List<SysUser> sysUserList = sysUserService.selectUserByDeptId(deptId);
+                if (CollUtil.isNotEmpty(sysUserList)) {
+                    List<Long> userIdList = sysUserList.stream().map(SysUser::getUserId).distinct().collect(Collectors.toList());
+                    checkRecord.setQueryCheckerIdList(userIdList);
+                    list = checkRecordService.selectCheckRecordList(checkRecord);
+                }
             } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
                 Long deptId = SecurityUtils.getLoginUser().getDeptId();
                 List<SysUser> sysUserList = sysUserService.selectUserByDeptId(deptId);

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

@@ -63,6 +63,8 @@ public class CheckTaskController extends BaseController {
                 checkTask.setCheckLevel(null);
             } else if (roleKeyList.contains(RoleTypeEnum.test.getCode()) || roleKeyList.contains(RoleTypeEnum.zhijianke.getCode())) {
                 checkTask.setCheckLevel(CheckLevelEnum.STATION_LEVEL.getCode());
+            } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
+                checkTask.setCheckLevel(CheckLevelEnum.BRIGADE_LEVEL.getCode());
             } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
                 checkTask.setCheckLevel(CheckLevelEnum.DEPARTMENT_LEVEL.getCode());
                 checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
@@ -78,6 +80,9 @@ public class CheckTaskController extends BaseController {
                 list = checkTaskService.selectCheckTaskList(checkTask);
             } else if (roleKeyList.contains(RoleTypeEnum.test.getCode()) || roleKeyList.contains(RoleTypeEnum.zhijianke.getCode())) {
                 list = checkTaskService.selectCheckTaskList(checkTask);
+            } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
+                checkTask.setCheckLevel(CheckLevelEnum.BRIGADE_LEVEL.getCode());
+                list = checkTaskService.selectCheckTaskList(checkTask);
             } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
                 checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
                 list = checkTaskService.selectCheckTaskListWeb(checkTask);
@@ -107,6 +112,9 @@ public class CheckTaskController extends BaseController {
                 list = checkTaskService.selectCheckTaskList(checkTask);
             } else if (roleKeyList.contains(RoleTypeEnum.test.getCode()) || roleKeyList.contains(RoleTypeEnum.zhijianke.getCode())) {
                 list = checkTaskService.selectCheckTaskList(checkTask);
+            } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
+                checkTask.setCheckLevel(CheckLevelEnum.BRIGADE_LEVEL.getCode());
+                list = checkTaskService.selectCheckTaskList(checkTask);
             } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
                 checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getDeptId());
                 list = checkTaskService.selectCheckTaskListWeb(checkTask);
@@ -180,6 +188,8 @@ public class CheckTaskController extends BaseController {
             checkTask.setCheckLevel(null);
         } else if (roleKeyList.contains(RoleTypeEnum.test.getCode()) || roleKeyList.contains(RoleTypeEnum.zhijianke.getCode())) {
             checkTask.setCheckLevel(CheckLevelEnum.STATION_LEVEL.getCode());
+        } else if (roleKeyList.contains(RoleTypeEnum.jingli.getCode()) || roleKeyList.contains(RoleTypeEnum.xingzheng.getCode())) {
+            checkTask.setCheckLevel(CheckLevelEnum.BRIGADE_LEVEL.getCode());
         } else if (roleKeyList.contains(RoleTypeEnum.kezhang.getCode())) {
             checkTask.setCheckLevel(CheckLevelEnum.DEPARTMENT_LEVEL.getCode());
             checkTask.setSelfCheckDeptId(SecurityUtils.getLoginUser().getDeptId());

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

@@ -431,6 +431,30 @@ public class CheckCorrection extends BaseEntity {
     private Long instanceId;
 
     /**
+     * 被检查大队ID
+     */
+    @Excel(name = "被检查大队ID")
+    private Long checkedBrigadeId;
+
+    /**
+     * 被检查大队名称
+     */
+    @Excel(name = "被检查大队名称")
+    private String checkedBrigadeName;
+
+    /**
+     * 被检查大队负责人ID
+     */
+    @Excel(name = "被检查大队负责人ID")
+    private Long checkedBrigadeLeaderId;
+
+    /**
+     * 被检查大队负责人名称
+     */
+    @Excel(name = "被检查大队负责人名称")
+    private String checkedBrigadeLeaderName;
+
+    /**
      * 审批意见
      */
     @TableField(exist = false)
@@ -986,6 +1010,38 @@ public class CheckCorrection extends BaseEntity {
         this.instanceId = instanceId;
     }
 
+    public void setCheckedBrigadeId(Long checkedBrigadeId) {
+        this.checkedBrigadeId = checkedBrigadeId;
+    }
+
+    public Long getCheckedBrigadeId() {
+        return checkedBrigadeId;
+    }
+
+    public void setCheckedBrigadeName(String checkedBrigadeName) {
+        this.checkedBrigadeName = checkedBrigadeName;
+    }
+
+    public String getCheckedBrigadeName() {
+        return checkedBrigadeName;
+    }
+
+    public void setCheckedBrigadeLeaderId(Long checkedBrigadeLeaderId) {
+        this.checkedBrigadeLeaderId = checkedBrigadeLeaderId;
+    }
+
+    public Long getCheckedBrigadeLeaderId() {
+        return checkedBrigadeLeaderId;
+    }
+
+    public void setCheckedBrigadeLeaderName(String checkedBrigadeLeaderName) {
+        this.checkedBrigadeLeaderName = checkedBrigadeLeaderName;
+    }
+
+    public String getCheckedBrigadeLeaderName() {
+        return checkedBrigadeLeaderName;
+    }
+
     public String getComment() {
         return comment;
     }
@@ -1085,6 +1141,10 @@ public class CheckCorrection extends BaseEntity {
                 .append("checkRecordBaseAttachmentList", getCheckRecordBaseAttachmentList())
                 .append("taskId", getTaskId())
                 .append("instanceId", getInstanceId())
+                .append("checkedBrigadeId", getCheckedBrigadeId())
+                .append("checkedBrigadeName", getCheckedBrigadeName())
+                .append("checkedBrigadeLeaderId", getCheckedBrigadeLeaderId())
+                .append("checkedBrigadeLeaderName", getCheckedBrigadeLeaderName())
                 .append("comment", getComment())
                 .toString();
     }

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

@@ -423,6 +423,30 @@ public class CheckRecord extends BaseEntity {
     private Integer isSelfCheck;
 
     /**
+     * 被检查大队ID
+     */
+    @Excel(name = "被检查大队ID")
+    private Long checkedBrigadeId;
+
+    /**
+     * 被检查大队名称
+     */
+    @Excel(name = "被检查大队名称")
+    private String checkedBrigadeName;
+
+    /**
+     * 被检查大队负责人ID
+     */
+    @Excel(name = "被检查大队负责人ID")
+    private Long checkedBrigadeLeaderId;
+
+    /**
+     * 被检查大队负责人名称
+     */
+    @Excel(name = "被检查大队负责人名称")
+    private String checkedBrigadeLeaderName;
+
+    /**
      * 检查项明细列表
      */
     @TableField(exist = false)
@@ -982,6 +1006,38 @@ public class CheckRecord extends BaseEntity {
         return isSelfCheck;
     }
 
+    public void setCheckedBrigadeId(Long checkedBrigadeId) {
+        this.checkedBrigadeId = checkedBrigadeId;
+    }
+
+    public Long getCheckedBrigadeId() {
+        return checkedBrigadeId;
+    }
+
+    public void setCheckedBrigadeName(String checkedBrigadeName) {
+        this.checkedBrigadeName = checkedBrigadeName;
+    }
+
+    public String getCheckedBrigadeName() {
+        return checkedBrigadeName;
+    }
+
+    public void setCheckedBrigadeLeaderId(Long checkedBrigadeLeaderId) {
+        this.checkedBrigadeLeaderId = checkedBrigadeLeaderId;
+    }
+
+    public Long getCheckedBrigadeLeaderId() {
+        return checkedBrigadeLeaderId;
+    }
+
+    public void setCheckedBrigadeLeaderName(String checkedBrigadeLeaderName) {
+        this.checkedBrigadeLeaderName = checkedBrigadeLeaderName;
+    }
+
+    public String getCheckedBrigadeLeaderName() {
+        return checkedBrigadeLeaderName;
+    }
+
     public List<CheckProjectItem> getCheckProjectItemList() {
         return checkProjectItemList;
     }
@@ -1096,6 +1152,10 @@ public class CheckRecord extends BaseEntity {
                 .append("checkEndTime", getCheckEndTime())
                 .append("description", getDescription())
                 .append("isSelfCheck", getIsSelfCheck())
+                .append("checkedBrigadeId", getCheckedBrigadeId())
+                .append("checkedBrigadeName", getCheckedBrigadeName())
+                .append("checkedBrigadeLeaderId", getCheckedBrigadeLeaderId())
+                .append("checkedBrigadeLeaderName", getCheckedBrigadeLeaderName())
                 .append("checkProjectItemList", getCheckProjectItemList())
                 .append("baseAttachmentList", getBaseAttachmentList())
                 .toString();

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

@@ -190,23 +190,25 @@ public class CheckCorrectionServiceImpl extends ServiceImpl<CheckCorrectionMappe
     public int updateCheckCorrection(CheckCorrection checkCorrection) {
         checkCorrection.setUpdateTime(DateUtils.getNowDate());
         int result = checkCorrectionMapper.updateCheckCorrection(checkCorrection);
-        //检查项明细列表
+        //检查项明细列表先删除后新增
+        CheckProjectItem checkProjectItemQuery = new CheckProjectItem();
+        checkProjectItemQuery.setType(CheckProjectItemTypeEnum.CHECK_CORRECTION.getCode());
+        checkProjectItemQuery.setSourceId(checkCorrection.getId());
+        List<CheckProjectItem> checkProjectItemListOld = checkProjectItemService.selectCheckProjectItemList(checkProjectItemQuery);
+        checkProjectItemService.removeBatchByIds(checkProjectItemListOld);
+        LambdaQueryWrapper<CheckUser> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(CheckUser::getType, CheckUserTypeEnum.PROBLEM_RECTIFICATION_INSPECTION_ITEM_DETAILS.getCode())
+                .in(CheckUser::getSourceId, checkProjectItemListOld.stream().map(CheckProjectItem::getId).toArray());
+        List<CheckUser> checkUserListOld = checkUserService.getBaseMapper().selectList(wrapper);
+        checkUserService.removeBatchByIds(checkUserListOld);
         if (CollUtil.isNotEmpty(checkCorrection.getCheckProjectItemList())) {
             checkCorrection.getCheckProjectItemList().forEach(checkProjectItem -> {
                 checkProjectItem.setUpdateTime(DateUtils.getNowDate());
                 checkProjectItem.setType(CheckProjectItemTypeEnum.CHECK_CORRECTION.getCode());
                 checkProjectItem.setTypeDesc(CheckProjectItemTypeEnum.CHECK_CORRECTION.getInfo());
                 checkProjectItem.setSourceId(checkCorrection.getId());
-                checkProjectItemService.saveOrUpdate(checkProjectItem);
+                checkProjectItemService.save(checkProjectItem);
                 if (CollUtil.isNotEmpty(checkProjectItem.getCheckUserList())) {
-                    //问题人表先删除后新增
-                    LambdaQueryWrapper<CheckUser> wrapper = new LambdaQueryWrapper<>();
-                    wrapper.eq(CheckUser::getType, CheckUserTypeEnum.PROBLEM_RECTIFICATION_INSPECTION_ITEM_DETAILS.getCode())
-                            .eq(CheckUser::getSourceId, checkProjectItem.getId());
-                    List<CheckUser> checkUserListOld = checkUserService.getBaseMapper().selectList(wrapper);
-                    if (CollUtil.isNotEmpty(checkUserListOld)) {
-                        checkUserService.removeBatchByIds(checkUserListOld);
-                    }
                     checkProjectItem.getCheckUserList().forEach(checkUser -> {
                         checkUser.setId(null);
                         checkUser.setCreateBy(checkProjectItem.getCreateBy());
@@ -220,14 +222,12 @@ public class CheckCorrectionServiceImpl extends ServiceImpl<CheckCorrectionMappe
             });
         }
         //附件列表先删除后新增
+        BaseAttachment baseAttachmentQuery = new BaseAttachment();
+        baseAttachmentQuery.setSourceType(BaseAttachmentSourceTypeEnum.CHECK_CORRECTION.getCode());
+        baseAttachmentQuery.setSourceId(checkCorrection.getId());
+        List<BaseAttachment> baseAttachmentListOld = baseAttachmentService.selectBaseAttachmentList(baseAttachmentQuery);
+        baseAttachmentService.removeBatchByIds(baseAttachmentListOld);
         if (CollUtil.isNotEmpty(checkCorrection.getBaseAttachmentList())) {
-            BaseAttachment baseAttachmentQuery = new BaseAttachment();
-            baseAttachmentQuery.setSourceType(BaseAttachmentSourceTypeEnum.CHECK_CORRECTION.getCode());
-            baseAttachmentQuery.setSourceId(checkCorrection.getId());
-            List<BaseAttachment> baseAttachmentListOld = baseAttachmentService.selectBaseAttachmentList(baseAttachmentQuery);
-            if (CollUtil.isNotEmpty(baseAttachmentListOld)) {
-                baseAttachmentService.removeBatchByIds(baseAttachmentListOld);
-            }
             checkCorrection.getBaseAttachmentList().forEach(baseAttachment -> {
                 baseAttachment.setCreateBy(checkCorrection.getCreateBy());
                 baseAttachment.setCreateTime(DateUtils.getNowDate());
@@ -246,9 +246,28 @@ public class CheckCorrectionServiceImpl extends ServiceImpl<CheckCorrectionMappe
      * @param ids 需要删除的问题整改主键
      * @return 结果
      */
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public int deleteCheckCorrectionByIds(Long[] ids) {
-        return checkCorrectionMapper.deleteCheckCorrectionByIds(ids);
+        int result = checkCorrectionMapper.deleteCheckCorrectionByIds(ids);
+        for (Long id : ids) {
+            CheckProjectItem checkProjectItemQuery = new CheckProjectItem();
+            checkProjectItemQuery.setType(CheckProjectItemTypeEnum.CHECK_CORRECTION.getCode());
+            checkProjectItemQuery.setSourceId(id);
+            List<CheckProjectItem> checkProjectItemListOld = checkProjectItemService.selectCheckProjectItemList(checkProjectItemQuery);
+            checkProjectItemService.removeBatchByIds(checkProjectItemListOld);
+            LambdaQueryWrapper<CheckUser> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(CheckUser::getType, CheckUserTypeEnum.PROBLEM_RECTIFICATION_INSPECTION_ITEM_DETAILS.getCode())
+                    .in(CheckUser::getSourceId, checkProjectItemListOld.stream().map(CheckProjectItem::getId).toArray());
+            List<CheckUser> checkUserListOld = checkUserService.getBaseMapper().selectList(wrapper);
+            checkUserService.removeBatchByIds(checkUserListOld);
+            BaseAttachment baseAttachmentQuery = new BaseAttachment();
+            baseAttachmentQuery.setSourceType(BaseAttachmentSourceTypeEnum.CHECK_CORRECTION.getCode());
+            baseAttachmentQuery.setSourceId(id);
+            List<BaseAttachment> baseAttachmentListOld = baseAttachmentService.selectBaseAttachmentList(baseAttachmentQuery);
+            baseAttachmentService.removeBatchByIds(baseAttachmentListOld);
+        }
+        return result;
     }
 
     /**
@@ -257,9 +276,26 @@ public class CheckCorrectionServiceImpl extends ServiceImpl<CheckCorrectionMappe
      * @param id 问题整改主键
      * @return 结果
      */
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public int deleteCheckCorrectionById(Long id) {
-        return checkCorrectionMapper.deleteCheckCorrectionById(id);
+        int result = checkCorrectionMapper.deleteCheckCorrectionById(id);
+        CheckProjectItem checkProjectItemQuery = new CheckProjectItem();
+        checkProjectItemQuery.setType(CheckProjectItemTypeEnum.CHECK_CORRECTION.getCode());
+        checkProjectItemQuery.setSourceId(id);
+        List<CheckProjectItem> checkProjectItemListOld = checkProjectItemService.selectCheckProjectItemList(checkProjectItemQuery);
+        checkProjectItemService.removeBatchByIds(checkProjectItemListOld);
+        LambdaQueryWrapper<CheckUser> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(CheckUser::getType, CheckUserTypeEnum.PROBLEM_RECTIFICATION_INSPECTION_ITEM_DETAILS.getCode())
+                .in(CheckUser::getSourceId, checkProjectItemListOld.stream().map(CheckProjectItem::getId).toArray());
+        List<CheckUser> checkUserListOld = checkUserService.getBaseMapper().selectList(wrapper);
+        checkUserService.removeBatchByIds(checkUserListOld);
+        BaseAttachment baseAttachmentQuery = new BaseAttachment();
+        baseAttachmentQuery.setSourceType(BaseAttachmentSourceTypeEnum.CHECK_CORRECTION.getCode());
+        baseAttachmentQuery.setSourceId(id);
+        List<BaseAttachment> baseAttachmentListOld = baseAttachmentService.selectBaseAttachmentList(baseAttachmentQuery);
+        baseAttachmentService.removeBatchByIds(baseAttachmentListOld);
+        return result;
     }
 
     /**

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

@@ -290,9 +290,29 @@ public class CheckRecordServiceImpl extends ServiceImpl<CheckRecordMapper, Check
      * @param ids 需要删除的检查记录主键
      * @return 结果
      */
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public int deleteCheckRecordByIds(Long[] ids) {
-        return checkRecordMapper.deleteCheckRecordByIds(ids);
+        int result = checkRecordMapper.deleteCheckRecordByIds(ids);
+        for (Long id : ids) {
+            CheckProjectItem checkProjectItemQuery = new CheckProjectItem();
+            checkProjectItemQuery.setType(CheckProjectItemTypeEnum.CHECK_RECORDS.getCode());
+            checkProjectItemQuery.setSourceId(id);
+            List<CheckProjectItem> checkProjectItemListTemp = checkProjectItemService.selectCheckProjectItemList(checkProjectItemQuery);
+            checkProjectItemService.removeBatchByIds(checkProjectItemListTemp);
+            LambdaQueryWrapper<CheckUser> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(CheckUser::getType, CheckUserTypeEnum.INSPECT_RECORDS_INSPECTION_ITEM_DETAILS.getCode())
+                    .in(CheckUser::getSourceId, checkProjectItemListTemp.stream().map(CheckProjectItem::getId).toArray());
+            List<CheckUser> checkUserListTemp = checkUserService.getBaseMapper().selectList(wrapper);
+            checkUserService.removeBatchByIds(checkUserListTemp);
+            //附件列表
+            BaseAttachment baseAttachmentQuery = new BaseAttachment();
+            baseAttachmentQuery.setSourceType(BaseAttachmentSourceTypeEnum.CHECK_RECORD.getCode());
+            baseAttachmentQuery.setSourceId(id);
+            List<BaseAttachment> baseAttachmentListTemp = baseAttachmentService.selectBaseAttachmentList(baseAttachmentQuery);
+            baseAttachmentService.removeBatchByIds(baseAttachmentListTemp);
+        }
+        return result;
     }
 
     /**
@@ -301,9 +321,27 @@ public class CheckRecordServiceImpl extends ServiceImpl<CheckRecordMapper, Check
      * @param id 检查记录主键
      * @return 结果
      */
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public int deleteCheckRecordById(Long id) {
-        return checkRecordMapper.deleteCheckRecordById(id);
+        int result = checkRecordMapper.deleteCheckRecordById(id);
+        CheckProjectItem checkProjectItemQuery = new CheckProjectItem();
+        checkProjectItemQuery.setType(CheckProjectItemTypeEnum.CHECK_RECORDS.getCode());
+        checkProjectItemQuery.setSourceId(id);
+        List<CheckProjectItem> checkProjectItemListTemp = checkProjectItemService.selectCheckProjectItemList(checkProjectItemQuery);
+        checkProjectItemService.removeBatchByIds(checkProjectItemListTemp);
+        LambdaQueryWrapper<CheckUser> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(CheckUser::getType, CheckUserTypeEnum.INSPECT_RECORDS_INSPECTION_ITEM_DETAILS.getCode())
+                .in(CheckUser::getSourceId, checkProjectItemListTemp.stream().map(CheckProjectItem::getId).toArray());
+        List<CheckUser> checkUserListTemp = checkUserService.getBaseMapper().selectList(wrapper);
+        checkUserService.removeBatchByIds(checkUserListTemp);
+        //附件列表
+        BaseAttachment baseAttachmentQuery = new BaseAttachment();
+        baseAttachmentQuery.setSourceType(BaseAttachmentSourceTypeEnum.CHECK_RECORD.getCode());
+        baseAttachmentQuery.setSourceId(id);
+        List<BaseAttachment> baseAttachmentListTemp = baseAttachmentService.selectBaseAttachmentList(baseAttachmentQuery);
+        baseAttachmentService.removeBatchByIds(baseAttachmentListTemp);
+        return result;
     }
 
     /**
@@ -367,16 +405,25 @@ public class CheckRecordServiceImpl extends ServiceImpl<CheckRecordMapper, Check
                 throw new ServiceException("被检查人员[" + userId + "]所属部门上下级为空");
             }
             SysDept teams = deptList.stream().filter(x -> StrUtil.equals(DeptType.TEAMS.getCode(), x.getDeptType())).findFirst().orElse(null);
-            SysDept department = deptList.stream().filter(x -> StrUtil.equals(DeptType.DEPARTMENT.getCode(), x.getDeptType())).findFirst().orElse(null);
+            SysDept department = deptList.stream().filter(x -> StrUtil.equals(DeptType.MANAGER.getCode(), x.getDeptType())).findFirst().orElse(null);
+            SysDept brigade = deptList.stream().filter(x -> StrUtil.equals(DeptType.BRIGADE.getCode(), x.getDeptType())).findFirst().orElse(null);
             SysDept station = deptList.stream().filter(x -> StrUtil.equals(DeptType.STATION.getCode(), x.getDeptType())).findFirst().orElse(null);
 
             if (Objects.isNull(teams)) {
                 throw new ServiceException("被检查人员[" + userId + "]所属班组信息为空");
             }
             if (Objects.isNull(department)) {
-                throw new ServiceException("被检查人员[" + userId + "]所属科室信息为空");
+                throw new ServiceException("被检查人员[" + userId + "]所属主管信息为空");
+            }
+            if (Objects.isNull(brigade)) {
+                throw new ServiceException("被检查人员[" + userId + "]所属大队信息为空");
+            }
+            if (Objects.isNull(station)) {
+                throw new ServiceException("被检查人员[" + userId + "]所属机构站信息为空");
             }
 
+            checkRecord.setCheckedBrigadeId(brigade.getDeptId());
+            checkRecord.setCheckedBrigadeName(brigade.getDeptName());
             checkRecord.setCheckedDepartmentId(department.getDeptId());
             checkRecord.setCheckedDepartmentName(department.getDeptName());
             checkRecord.setCheckedTeamId(teams.getDeptId());

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

@@ -29,6 +29,7 @@ import org.springframework.stereotype.Service;
 import com.sundot.airport.check.mapper.CheckTaskMapper;
 import com.sundot.airport.check.domain.CheckTask;
 import com.sundot.airport.check.service.ICheckTaskService;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 检查任务Service业务层处理
@@ -161,6 +162,7 @@ public class CheckTaskServiceImpl extends ServiceImpl<CheckTaskMapper, CheckTask
      * @param checkTask 检查任务
      * @return 结果
      */
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public int insertCheckTask(CheckTask checkTask) {
         checkTask.setCreateTime(DateUtils.getNowDate());
@@ -184,6 +186,7 @@ public class CheckTaskServiceImpl extends ServiceImpl<CheckTaskMapper, CheckTask
      * @param checkTask 检查任务
      * @return 结果
      */
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public int updateCheckTask(CheckTask checkTask) {
         checkTask.setUpdateTime(DateUtils.getNowDate());
@@ -212,9 +215,18 @@ public class CheckTaskServiceImpl extends ServiceImpl<CheckTaskMapper, CheckTask
      * @param ids 需要删除的检查任务主键
      * @return 结果
      */
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public int deleteCheckTaskByIds(Long[] ids) {
-        return checkTaskMapper.deleteCheckTaskByIds(ids);
+        int result = checkTaskMapper.deleteCheckTaskByIds(ids);
+        for (Long id : ids) {
+            CheckProjectItem checkProjectItemQuery = new CheckProjectItem();
+            checkProjectItemQuery.setType(CheckProjectItemTypeEnum.CHECK_TASK.getCode());
+            checkProjectItemQuery.setSourceId(id);
+            List<CheckProjectItem> checkProjectItemListOld = checkProjectItemService.selectCheckProjectItemList(checkProjectItemQuery);
+            checkProjectItemService.removeBatchByIds(checkProjectItemListOld);
+        }
+        return result;
     }
 
     /**
@@ -223,9 +235,16 @@ public class CheckTaskServiceImpl extends ServiceImpl<CheckTaskMapper, CheckTask
      * @param id 检查任务主键
      * @return 结果
      */
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public int deleteCheckTaskById(Long id) {
-        return checkTaskMapper.deleteCheckTaskById(id);
+        int result = checkTaskMapper.deleteCheckTaskById(id);
+        CheckProjectItem checkProjectItemQuery = new CheckProjectItem();
+        checkProjectItemQuery.setType(CheckProjectItemTypeEnum.CHECK_TASK.getCode());
+        checkProjectItemQuery.setSourceId(id);
+        List<CheckProjectItem> checkProjectItemListOld = checkProjectItemService.selectCheckProjectItemList(checkProjectItemQuery);
+        checkProjectItemService.removeBatchByIds(checkProjectItemListOld);
+        return result;
     }
 
     /**

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

@@ -73,6 +73,10 @@
         <result property="isSelfCheck" column="is_self_check"/>
         <result property="completionTime" column="completion_time"/>
         <result property="instanceId" column="instance_id"/>
+        <result property="checkedBrigadeId" column="checked_brigade_id"/>
+        <result property="checkedBrigadeName" column="checked_brigade_name"/>
+        <result property="checkedBrigadeLeaderId" column="checked_brigade_leader_id"/>
+        <result property="checkedBrigadeLeaderName" column="checked_brigade_leader_name"/>
     </resultMap>
 
     <sql id="selectCheckCorrectionVo">
@@ -143,7 +147,11 @@
                is_select_team,
                is_self_check,
                completion_time,
-               instance_id
+               instance_id,
+               checked_brigade_id,
+               checked_brigade_name,
+               checked_brigade_leader_id,
+               checked_brigade_leader_name
         from check_correction
     </sql>
 
@@ -265,6 +273,14 @@
             <if test="isSelfCheck != null ">and is_self_check = #{isSelfCheck}</if>
             <if test="completionTime != null ">and completion_time = #{completionTime}</if>
             <if test="instanceId != null ">and instance_id = #{instanceId}</if>
+            <if test="checkedBrigadeId != null ">and checked_brigade_id = #{checkedBrigadeId}</if>
+            <if test="checkedBrigadeName != null  and checkedBrigadeName != ''">and checked_brigade_name like
+                concat('%', #{checkedBrigadeName}, '%')
+            </if>
+            <if test="checkedBrigadeLeaderId != null ">and checked_brigade_leader_id = #{checkedBrigadeLeaderId}</if>
+            <if test="checkedBrigadeLeaderName != null  and checkedBrigadeLeaderName != ''">and
+                checked_brigade_leader_name like concat('%', #{checkedBrigadeLeaderName}, '%')
+            </if>
             <if test="startDate != null and endDate != null">
                 and (check_time >= #{startDate}
                 and check_time <![CDATA[ < ]]> date_add(#{endDate} , interval 1 day))
@@ -348,6 +364,10 @@
             <if test="isSelfCheck != null">is_self_check,</if>
             <if test="completionTime != null">completion_time,</if>
             <if test="instanceId != null">instance_id,</if>
+            <if test="checkedBrigadeId != null">checked_brigade_id,</if>
+            <if test="checkedBrigadeName != null">checked_brigade_name,</if>
+            <if test="checkedBrigadeLeaderId != null">checked_brigade_leader_id,</if>
+            <if test="checkedBrigadeLeaderName != null">checked_brigade_leader_name,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="tenantId != null">#{tenantId},</if>
@@ -417,6 +437,10 @@
             <if test="isSelfCheck != null">#{isSelfCheck},</if>
             <if test="completionTime != null">#{completionTime},</if>
             <if test="instanceId != null">#{instanceId},</if>
+            <if test="checkedBrigadeId != null">#{checkedBrigadeId},</if>
+            <if test="checkedBrigadeName != null">#{checkedBrigadeName},</if>
+            <if test="checkedBrigadeLeaderId != null">#{checkedBrigadeLeaderId},</if>
+            <if test="checkedBrigadeLeaderName != null">#{checkedBrigadeLeaderName},</if>
         </trim>
     </insert>
 
@@ -497,6 +521,10 @@
             <if test="isSelfCheck != null">is_self_check = #{isSelfCheck},</if>
             <if test="completionTime != null">completion_time = #{completionTime},</if>
             <if test="instanceId != null">instance_id = #{instanceId},</if>
+            <if test="checkedBrigadeId != null">checked_brigade_id = #{checkedBrigadeId},</if>
+            <if test="checkedBrigadeName != null">checked_brigade_name = #{checkedBrigadeName},</if>
+            <if test="checkedBrigadeLeaderId != null">checked_brigade_leader_id = #{checkedBrigadeLeaderId},</if>
+            <if test="checkedBrigadeLeaderName != null">checked_brigade_leader_name = #{checkedBrigadeLeaderName},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -76,6 +76,10 @@
         <result property="checkEndTime" column="check_end_time"/>
         <result property="description" column="description"/>
         <result property="isSelfCheck" column="is_self_check"/>
+        <result property="checkedBrigadeId" column="checked_brigade_id"/>
+        <result property="checkedBrigadeName" column="checked_brigade_name"/>
+        <result property="checkedBrigadeLeaderId" column="checked_brigade_leader_id"/>
+        <result property="checkedBrigadeLeaderName" column="checked_brigade_leader_name"/>
     </resultMap>
 
     <sql id="selectCheckRecordVo">
@@ -149,7 +153,11 @@
                check_start_time,
                check_end_time,
                description,
-               is_self_check
+               is_self_check,
+               checked_brigade_id,
+               checked_brigade_name,
+               checked_brigade_leader_id,
+               checked_brigade_leader_name
         from check_record
     </sql>
 
@@ -273,6 +281,14 @@
             <if test="checkEndTime != null ">and check_end_time = #{checkEndTime}</if>
             <if test="description != null  and description != ''">and description = #{description}</if>
             <if test="isSelfCheck != null ">and is_self_check = #{isSelfCheck}</if>
+            <if test="checkedBrigadeId != null ">and checked_brigade_id = #{checkedBrigadeId}</if>
+            <if test="checkedBrigadeName != null  and checkedBrigadeName != ''">and checked_brigade_name like
+                concat('%', #{checkedBrigadeName}, '%')
+            </if>
+            <if test="checkedBrigadeLeaderId != null ">and checked_brigade_leader_id = #{checkedBrigadeLeaderId}</if>
+            <if test="checkedBrigadeLeaderName != null  and checkedBrigadeLeaderName != ''">and
+                checked_brigade_leader_name like concat('%', #{checkedBrigadeLeaderName}, '%')
+            </if>
             <if test="startDate != null and endDate != null">
                 and (check_time >= #{startDate}
                 and check_time <![CDATA[ < ]]> date_add(#{endDate} , interval 1 day))
@@ -365,6 +381,10 @@
             <if test="checkEndTime != null">check_end_time,</if>
             <if test="description != null">description,</if>
             <if test="isSelfCheck != null">is_self_check,</if>
+            <if test="checkedBrigadeId != null">checked_brigade_id,</if>
+            <if test="checkedBrigadeName != null">checked_brigade_name,</if>
+            <if test="checkedBrigadeLeaderId != null">checked_brigade_leader_id,</if>
+            <if test="checkedBrigadeLeaderName != null">checked_brigade_leader_name,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="tenantId != null">#{tenantId},</if>
@@ -437,6 +457,10 @@
             <if test="checkEndTime != null">#{checkEndTime},</if>
             <if test="description != null">#{description},</if>
             <if test="isSelfCheck != null">#{isSelfCheck},</if>
+            <if test="checkedBrigadeId != null">#{checkedBrigadeId},</if>
+            <if test="checkedBrigadeName != null">#{checkedBrigadeName},</if>
+            <if test="checkedBrigadeLeaderId != null">#{checkedBrigadeLeaderId},</if>
+            <if test="checkedBrigadeLeaderName != null">#{checkedBrigadeLeaderName},</if>
         </trim>
     </insert>
 
@@ -517,6 +541,10 @@
             <if test="checkEndTime != null">check_end_time = #{checkEndTime},</if>
             <if test="description != null">description = #{description},</if>
             <if test="isSelfCheck != null">is_self_check = #{isSelfCheck},</if>
+            <if test="checkedBrigadeId != null">checked_brigade_id = #{checkedBrigadeId},</if>
+            <if test="checkedBrigadeName != null">checked_brigade_name = #{checkedBrigadeName},</if>
+            <if test="checkedBrigadeLeaderId != null">checked_brigade_leader_id = #{checkedBrigadeLeaderId},</if>
+            <if test="checkedBrigadeLeaderName != null">checked_brigade_leader_name = #{checkedBrigadeLeaderName},</if>
         </trim>
         where id = #{id}
     </update>