巡检模块

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

@@ -7,9 +7,7 @@ import java.util.Objects;
 import java.util.stream.Collectors;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjUtil;
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sundot.airport.check.domain.CheckCorrection;
@@ -19,17 +17,16 @@ import com.sundot.airport.check.service.ICheckCorrectionService;
 import com.sundot.airport.check.service.ICheckProjectItemService;
 import com.sundot.airport.check.service.ICheckUserService;
 import com.sundot.airport.common.constant.Constants;
-import com.sundot.airport.common.core.domain.entity.SysDept;
 import com.sundot.airport.common.core.domain.entity.SysUser;
 import com.sundot.airport.common.core.redis.RedisSerialGenerator;
 import com.sundot.airport.common.domain.BaseAttachment;
+import com.sundot.airport.common.dto.DeptInfo;
 import com.sundot.airport.common.enums.BaseAttachmentSourceTypeEnum;
 import com.sundot.airport.common.enums.CheckLevelEnum;
 import com.sundot.airport.common.enums.CheckProjectItemTypeEnum;
 import com.sundot.airport.common.enums.CheckRecordStatusEnum;
 import com.sundot.airport.common.enums.CheckScoreLevelEnum;
 import com.sundot.airport.common.enums.CheckUserTypeEnum;
-import com.sundot.airport.common.enums.DeptType;
 import com.sundot.airport.common.exception.ServiceException;
 import com.sundot.airport.common.service.IBaseAttachmentService;
 import com.sundot.airport.common.utils.DateUtils;
@@ -400,34 +397,37 @@ public class CheckRecordServiceImpl extends ServiceImpl<CheckRecordMapper, Check
             if (Objects.isNull(sysUser.getDeptId())) {
                 throw new ServiceException("被检查人员[" + userId + "]所属部门为空");
             }
-            List<SysDept> deptList = deptService.selectAllDept(sysUser.getDeptId());
-            if (CollectionUtil.isEmpty(deptList)) {
-                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.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)) {
+            DeptInfo deptInfo = deptService.getDeptInfoByDeptId(sysUser.getDeptId());
+            if (Objects.isNull(deptInfo.getTeamId())) {
                 throw new ServiceException("被检查人员[" + userId + "]所属班组信息为空");
             }
-            if (Objects.isNull(department)) {
+            if (Objects.isNull(deptInfo.getDepartmentId())) {
                 throw new ServiceException("被检查人员[" + userId + "]所属主管信息为空");
             }
-            if (Objects.isNull(brigade)) {
+            if (Objects.isNull(deptInfo.getBrigadeId())) {
                 throw new ServiceException("被检查人员[" + userId + "]所属大队信息为空");
             }
-            if (Objects.isNull(station)) {
+            if (Objects.isNull(deptInfo.getStationId())) {
                 throw new ServiceException("被检查人员[" + userId + "]所属机构站信息为空");
             }
-
-            checkRecord.setCheckedBrigadeId(brigade.getDeptId());
-            checkRecord.setCheckedBrigadeName(brigade.getDeptName());
-            checkRecord.setCheckedDepartmentId(department.getDeptId());
-            checkRecord.setCheckedDepartmentName(department.getDeptName());
-            checkRecord.setCheckedTeamId(teams.getDeptId());
-            checkRecord.setCheckedTeamName(teams.getDeptName());
+            checkRecord.setCheckedBrigadeId(deptInfo.getBrigadeId());
+            checkRecord.setCheckedBrigadeName(deptInfo.getBrigadeName());
+            checkRecord.setCheckedDepartmentId(deptInfo.getDepartmentId());
+            checkRecord.setCheckedDepartmentName(deptInfo.getDepartmentName());
+            checkRecord.setCheckedTeamId(deptInfo.getTeamId());
+            checkRecord.setCheckedTeamName(deptInfo.getTeamName());
+        } else {
+            Long deptId = checkRecord.getCheckedDeptId();
+            if (Objects.isNull(deptId)) {
+                throw new ServiceException("请选择被检查部门");
+            }
+            DeptInfo deptInfo = deptService.getDeptInfoByDeptId(deptId);
+            checkRecord.setCheckedBrigadeId(deptInfo.getBrigadeId());
+            checkRecord.setCheckedBrigadeName(deptInfo.getBrigadeName());
+            checkRecord.setCheckedDepartmentId(deptInfo.getDepartmentId());
+            checkRecord.setCheckedDepartmentName(deptInfo.getDepartmentName());
+            checkRecord.setCheckedTeamId(deptInfo.getTeamId());
+            checkRecord.setCheckedTeamName(deptInfo.getTeamName());
         }
     }
 

airport-common/src/main/java/com/sundot/airport/common/dto/DeptInfo.java

@@ -0,0 +1,58 @@
+package com.sundot.airport.common.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 部门信息
+ *
+ * @Author: wangchong
+ * @Date: 2025/7/11 14:19
+ **/
+@Data
+public class DeptInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 班组 id
+     */
+    private Long teamId;
+
+    /**
+     * 班组名称
+     */
+    private String teamName;
+
+    /**
+     * 部门 id
+     */
+    private Long departmentId;
+
+    /**
+     * 部门名称
+     */
+    private String departmentName;
+
+    /**
+     * 大队 id
+     */
+    private Long brigadeId;
+
+    /**
+     * 大队名称
+     */
+    private String brigadeName;
+
+    /**
+     * 机构站 id
+     */
+    private Long stationId;
+
+    /**
+     * 机构站名称
+     */
+    private String stationName;
+
+}