airport-admin/src/main/java/com/sundot/airport/web/controller/system/SysUserController.java

@@ -21,6 +21,7 @@ import com.sundot.airport.common.core.domain.ResetUserPostDto;
 import com.sundot.airport.common.core.domain.ResetUserRoleDto;
 import com.sundot.airport.common.core.domain.SysLargeScreenWorkingPortraitDto;
 import com.sundot.airport.common.dto.SysUserConditionDto;
+import com.sundot.airport.common.dto.SysUserLeaderConditionDto;
 import com.sundot.airport.common.enums.RoleTypeEnum;
 import com.sundot.airport.exam.domain.DailyTask;
 import com.sundot.airport.attendance.portrait.AttendanceModuleIndicatorResult;
@@ -924,4 +925,14 @@ public class SysUserController extends BaseController {
 
         return result;
     }
+
+    /**
+     * 根据用户ID和角色编码列表查询各级直属领导列表
+     */
+    @PostMapping("/selectUserLeaderListByCondition")
+    public AjaxResult selectUserLeaderListByCondition(@RequestBody SysUserLeaderConditionDto dto) {
+        List<SysUser> result = userService.selectUserLeaderListByCondition(dto);
+        return success(result);
+    }
+
 }

airport-blocked/src/main/java/com/sundot/airport/blocked/domain/BlockedMissCheckStatistics.java

@@ -106,12 +106,14 @@ public class BlockedMissCheckStatistics extends BaseEntity {
     /** 回查日期 */
     @Excel(name = "回查日期", width = 30, dateFormat = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty("回查日期")
     private Date reviewDate;
 
     /** 漏检时间 */
     @Excel(name = "漏检时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     @ApiModelProperty("漏检时间")
     private Date missCheckTime;
 
@@ -148,7 +150,7 @@ public class BlockedMissCheckStatistics extends BaseEntity {
     /** 开机年限 */
     @Excel(name = "开机年限")
     @ApiModelProperty("开机年限")
-    private Integer machineOperatingYears;
+    private String machineOperatingYears;
 
     /** 证书级别 */
     @Excel(name = "证书级别")
@@ -409,11 +411,11 @@ public class BlockedMissCheckStatistics extends BaseEntity {
         return isRecovered;
     }
 
-    public void setMachineOperatingYears(Integer machineOperatingYears) {
+    public void setMachineOperatingYears(String machineOperatingYears) {
         this.machineOperatingYears = machineOperatingYears;
     }
 
-    public Integer getMachineOperatingYears() {
+    public String getMachineOperatingYears() {
         return machineOperatingYears;
     }
 

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

@@ -0,0 +1,26 @@
+package com.sundot.airport.common.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 查询用户各级直属领导列表参数
+ *
+ * @Author: wangchong
+ * @Date: 2025/7/15 16:12
+ **/
+@Data
+public class SysUserLeaderConditionDto {
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 角色编码列表
+     */
+    private List<String> roleKeyList;
+
+}

airport-system/src/main/java/com/sundot/airport/system/mapper/SysUserMapper.java

@@ -254,4 +254,13 @@ public interface SysUserMapper {
      * @return 用户信息列表
      */
     public List<LargeScreenHomePageUserInfoSqlDto> homePageUserInfoByDepartmentId(@Param("departmentId") Long departmentId);
+
+    /**
+     * 根据部门ID和角色编码列表查询用户列表
+     *
+     * @param deptId 组织ID
+     * @param list   角色编码列表
+     * @return 用户信息集合
+     */
+    public List<SysUser> selectUserLeaderByDeptIdAndRoleKeyList(@Param("deptId") Long deptId, @Param("list") List<String> list);
 }

airport-system/src/main/java/com/sundot/airport/system/service/ISysUserService.java

@@ -8,6 +8,7 @@ import com.sundot.airport.common.core.domain.ResetUserPostDto;
 import com.sundot.airport.common.core.domain.ResetUserRoleDto;
 import com.sundot.airport.common.core.domain.entity.SysUser;
 import com.sundot.airport.common.dto.SysUserConditionDto;
+import com.sundot.airport.common.dto.SysUserLeaderConditionDto;
 import com.sundot.airport.system.domain.SysLargeScreenCooperationDto;
 import com.sundot.airport.system.domain.SysLargeScreenCooperationQueryParamDto;
 
@@ -344,4 +345,12 @@ public interface ISysUserService {
      * @return 用户信息列表
      */
     public List<LargeScreenHomePageUserInfoSqlDto> homePageUserInfoByDepartmentId(Long departmentId);
+
+    /**
+     * 根据用户ID和角色编码列表查询各级直属领导列表
+     *
+     * @param dto 查询用户列表参数
+     * @return 用户信息集合
+     */
+    public List<SysUser> selectUserLeaderListByCondition(SysUserLeaderConditionDto dto);
 }

airport-system/src/main/java/com/sundot/airport/system/service/impl/SysUserServiceImpl.java

@@ -24,6 +24,7 @@ import com.sundot.airport.common.core.domain.ResetUserRoleDto;
 import com.sundot.airport.common.core.domain.entity.SysDept;
 import com.sundot.airport.common.core.domain.entity.SysDictData;
 import com.sundot.airport.common.dto.SysUserConditionDto;
+import com.sundot.airport.common.dto.SysUserLeaderConditionDto;
 import com.sundot.airport.common.dto.UserInfo;
 import com.sundot.airport.common.enums.AssessmentTeamEnum;
 import com.sundot.airport.common.enums.DeptType;
@@ -1249,4 +1250,43 @@ public class SysUserServiceImpl implements ISysUserService {
     public List<LargeScreenHomePageUserInfoSqlDto> homePageUserInfoByDepartmentId(Long departmentId) {
         return userMapper.homePageUserInfoByDepartmentId(departmentId);
     }
+
+    /**
+     * 根据用户ID和角色编码列表查询各级直属领导列表
+     *
+     * @param dto 查询用户列表参数
+     * @return 用户信息集合
+     */
+    @Override
+    public List<SysUser> selectUserLeaderListByCondition(SysUserLeaderConditionDto dto) {
+        if (dto.getUserId() == null) {
+            return userMapper.selectUserListByRoleKey(dto.getRoleKeyList());
+        }
+        if (CollUtil.isEmpty(dto.getRoleKeyList())) {
+            return Collections.emptyList();
+        }
+        List<SysUser> result = new ArrayList<>();
+        SysUser sysUser = userMapper.selectUserById(dto.getUserId());
+        List<SysDept> deptList = deptService.selectAllDept(sysUser.getDeptId());
+        if (CollUtil.isEmpty(deptList)) {
+            return result;
+        }
+        Collections.reverse(deptList);
+        SysDept teams = deptList.stream().filter(x -> StrUtil.equals(DeptType.TEAMS.getCode(), x.getDeptType())).findFirst().orElse(new SysDept());
+        SysDept department = deptList.stream().filter(x -> StrUtil.equals(DeptType.MANAGER.getCode(), x.getDeptType())).findFirst().orElse(new SysDept());
+        SysDept brigade = deptList.stream().filter(x -> StrUtil.equals(DeptType.BRIGADE.getCode(), x.getDeptType())).findFirst().orElse(new SysDept());
+        SysDept station = deptList.stream().filter(x -> StrUtil.equals(DeptType.STATION.getCode(), x.getDeptType())).findFirst().orElse(new SysDept());
+        dto.getRoleKeyList().forEach(roleKey -> {
+            if (StrUtil.equals(roleKey, RoleTypeEnum.banzuzhang.getCode())) {
+                result.addAll(userMapper.selectUserLeaderByDeptIdAndRoleKeyList(teams.getDeptId(), Collections.singletonList(roleKey)));
+            } else if (StrUtil.equals(roleKey, RoleTypeEnum.kezhang.getCode())) {
+                result.addAll(userMapper.selectUserLeaderByDeptIdAndRoleKeyList(department.getDeptId(), Collections.singletonList(roleKey)));
+            } else if (StrUtil.equals(roleKey, RoleTypeEnum.xingzheng.getCode()) || StrUtil.equals(roleKey, RoleTypeEnum.jingli.getCode())) {
+                result.addAll(userMapper.selectUserLeaderByDeptIdAndRoleKeyList(brigade.getDeptId(), Collections.singletonList(roleKey)));
+            } else if (StrUtil.equals(roleKey, RoleTypeEnum.test.getCode())) {
+                result.addAll(userMapper.selectUserLeaderByDeptIdAndRoleKeyList(station.getDeptId(), Collections.singletonList(roleKey)));
+            }
+        });
+        return result.stream().distinct().collect(Collectors.toList());
+    }
 }

airport-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -1183,4 +1183,25 @@
           and sr.role_key in ('banzuzhang', 'SecurityCheck')
           and sd_ks.dept_id = #{departmentId}
     </select>
+
+    <select id="selectUserLeaderByDeptIdAndRoleKeyList" resultType="sysUser">
+        select distinct su.user_id userId,
+        su.user_name userName,
+        su.nick_name nickName
+        from sys_user su
+        inner join sys_dept sd on sd.dept_id = su.dept_id
+        inner join sys_user_role sur on sur.user_id = su.user_id
+        inner join sys_role sr on sr.role_id = sur.role_id
+        where su.del_flag = '0'
+        and su.status = '0'
+        and sd.del_flag = '0'
+        and sd.status = '0'
+        and sr.del_flag = '0'
+        and sr.status = '0'
+        and su.dept_id = #{deptId}
+        and sr.role_key in
+        <foreach collection="list" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
 </mapper>