查询人事绩效用户列表

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

@@ -20,6 +20,7 @@ import com.sundot.airport.check.domain.CheckLargeScreenCorrectionQueryParamDto;
 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.SysPersonnelUserConditionDto;
 import com.sundot.airport.common.dto.SysUserConditionDto;
 import com.sundot.airport.common.dto.SysUserLeaderConditionDto;
 import com.sundot.airport.common.enums.RoleTypeEnum;
@@ -161,6 +162,15 @@ public class SysUserController extends BaseController {
     }
 
     /**
+     * 查询人事绩效用户列表
+     */
+    @PostMapping("/selectPersonnelUserList")
+    public AjaxResult selectPersonnelUserList(@RequestBody SysPersonnelUserConditionDto dto) {
+        List<SysUser> result = userService.selectPersonnelUserList(dto);
+        return success(result);
+    }
+
+    /**
      * 能力画像-协同配合
      */
     @Cacheable(

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

@@ -0,0 +1,52 @@
+package com.sundot.airport.common.dto;
+
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 查询用户列表参数
+ *
+ * @Author: wangchong
+ * @Date: 2025/7/15 16:12
+ **/
+@Data
+public class SysPersonnelUserConditionDto {
+
+    /**
+     * 部门id
+     */
+    private Long deptId;
+
+    /**
+     * 角色编码列表
+     */
+    private List<String> roleKeyList;
+
+    /**
+     * 用工形式列表
+     */
+    private List<String> employmentTypeList;
+
+    /**
+     * 用户昵称
+     */
+    private String nickName;
+
+    /**
+     * 月份值（yyyyMM）
+     */
+    private String month;
+
+    /**
+     * 月份开始时间
+     */
+    private Date monthStartTime;
+
+    /**
+     * 月份结束时间
+     */
+    private Date monthEndTime;
+
+}

airport-common/src/main/java/com/sundot/airport/common/utils/MonthUtils.java

@@ -1,8 +1,12 @@
 package com.sundot.airport.common.utils;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.time.YearMonth;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -236,4 +240,83 @@ public class MonthUtils {
         }
     }
 
+
+    /**
+     * 获取指定月份的第一天开始时间（yyyy-MM-dd 00:00:00）
+     * @param yearMonth 月份字符串，格式 yyyyMM
+     * @return 开始时间的 Date 对象
+     */
+    public static Date getMonthStartTime(String yearMonth) {
+        try {
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMM");
+            Date date = sdf.parse(yearMonth);
+
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(date);
+            calendar.set(Calendar.DAY_OF_MONTH, 1);
+            calendar.set(Calendar.HOUR_OF_DAY, 0);
+            calendar.set(Calendar.MINUTE, 0);
+            calendar.set(Calendar.SECOND, 0);
+            calendar.set(Calendar.MILLISECOND, 0);
+
+            return calendar.getTime();
+        } catch (ParseException e) {
+            throw new IllegalArgumentException("月份格式无效,请使用【yyyyMM】格式");
+        }
+    }
+
+    /**
+     * 获取指定月份的最后一天开始时间（yyyy-MM-dd 00:00:00）
+     * @param yearMonth 月份字符串，格式 yyyyMM
+     * @return 最后一天开始时间的 Date 对象
+     */
+    public static Date getMonthLastDayStartTime(String yearMonth) {
+        try {
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMM");
+            Date date = sdf.parse(yearMonth);
+
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(date);
+            // 获取该月的最大天数
+            int lastDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH);
+            calendar.set(Calendar.DAY_OF_MONTH, lastDay);
+            calendar.set(Calendar.HOUR_OF_DAY, 0);
+            calendar.set(Calendar.MINUTE, 0);
+            calendar.set(Calendar.SECOND, 0);
+            calendar.set(Calendar.MILLISECOND, 0);
+
+            return calendar.getTime();
+        } catch (ParseException e) {
+            throw new IllegalArgumentException("Invalid month format. Please use yyyyMM.");
+        }
+    }
+
+    /**
+     * 获取指定月份的最后一天结束时间（yyyy-MM-dd 23:59:59）
+     * @param yearMonth 月份字符串，格式 yyyyMM
+     * @return 结束时间的 Date 对象
+     */
+    public static Date getMonthEndTime(String yearMonth) {
+        try {
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMM");
+            Date date = sdf.parse(yearMonth);
+
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(date);
+            // 设置为下个月第一天
+            calendar.add(Calendar.MONTH, 1);
+            calendar.set(Calendar.DAY_OF_MONTH, 1);
+            calendar.set(Calendar.HOUR_OF_DAY, 0);
+            calendar.set(Calendar.MINUTE, 0);
+            calendar.set(Calendar.SECOND, 0);
+            calendar.set(Calendar.MILLISECOND, 0);
+            // 减去一秒得到当月最后一秒
+            calendar.add(Calendar.SECOND, -1);
+
+            return calendar.getTime();
+        } catch (ParseException e) {
+            throw new IllegalArgumentException("月份格式无效,请使用【yyyyMM】格式");
+        }
+    }
+
 }

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

@@ -1,5 +1,6 @@
 package com.sundot.airport.system.mapper;
 
+import java.util.Date;
 import java.util.List;
 
 import com.sundot.airport.common.core.domain.LargeScreenHomePageUserInfoSqlDto;
@@ -240,6 +241,19 @@ public interface SysUserMapper {
     public List<SysUser> selectUserListByDeptIdAndRoleKeyListAndUserName(@Param("deptId") Long deptId, @Param("list") List<String> list, @Param("nickName") String nickName);
 
     /**
+     * 查询人事绩效用户列表
+     *
+     * @param nickName 用户昵称
+     * @return 用户信息集合
+     */
+    public List<SysUser> selectPersonnelUserList(@Param("deptId") Long deptId,
+                                                 @Param("roleKeyList") List<String> roleKeyList,
+                                                 @Param("employmentTypeList") List<String> employmentTypeList,
+                                                 @Param("monthStartTime") Date monthStartTime,
+                                                 @Param("monthEndTime") Date monthEndTime,
+                                                 @Param("nickName") String nickName);
+
+    /**
      * 首页 - 用户信息（按大队 ID 筛选）
      *
      * @param brigadeId 大队 ID

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

@@ -7,6 +7,7 @@ import com.sundot.airport.common.core.domain.LargeScreenHomePageUserInfoSqlDto;
 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.SysPersonnelUserConditionDto;
 import com.sundot.airport.common.dto.SysUserConditionDto;
 import com.sundot.airport.common.dto.SysUserLeaderConditionDto;
 import com.sundot.airport.system.domain.SysLargeScreenCooperationDto;
@@ -331,6 +332,14 @@ public interface ISysUserService {
     public List<SysUser> selectUserListByDeptIdAndRoleKeyListAndUserName(SysUserConditionDto dto);
 
     /**
+     * 查询人事绩效用户列表
+     *
+     * @param dto 查询用户列表参数
+     * @return 用户信息集合
+     */
+    public List<SysUser> selectPersonnelUserList(SysPersonnelUserConditionDto dto);
+
+    /**
      * 首页 - 用户信息（按大队 ID 筛选）
      *
      * @param brigadeId 大队 ID

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

@@ -23,11 +23,15 @@ import com.sundot.airport.common.core.domain.ResetUserPostDto;
 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.SysPersonnelUserConditionDto;
 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.DeptType;
+import com.sundot.airport.common.enums.EmploymentTypeEnum;
 import com.sundot.airport.common.enums.RoleTypeEnum;
+import com.sundot.airport.common.utils.DeptUtils;
+import com.sundot.airport.common.utils.MonthUtils;
 import com.sundot.airport.system.domain.SysLargeScreenCooperationDto;
 import com.sundot.airport.system.domain.SysLargeScreenCooperationItemDto;
 import com.sundot.airport.system.domain.SysLargeScreenCooperationQueryParamDto;
@@ -97,6 +101,9 @@ public class SysUserServiceImpl implements ISysUserService {
     @Autowired
     private ISysDictDataService sysDictDataService;
 
+    @Autowired
+    private ISysDeptService sysDeptService;
+
     /**
      * 根据条件分页查询用户列表
      *
@@ -1342,6 +1349,35 @@ public class SysUserServiceImpl implements ISysUserService {
         return userMapper.selectUserListByDeptIdAndRoleKeyListAndUserName(dto.getDeptId(), dto.getRoleKeyList(), dto.getNickName());
     }
 
+    /**
+     * 查询人事绩效用户列表
+     *
+     * @param dto 查询用户列表参数
+     * @return 用户信息集合
+     */
+    @Override
+    public List<SysUser> selectPersonnelUserList(SysPersonnelUserConditionDto dto) {
+        if (ObjUtil.isNull(dto.getMonth())) {
+            throw new ServiceException("请选择月份");
+        }
+        dto.setMonthStartTime(MonthUtils.getMonthStartTime(dto.getMonth()));
+        dto.setMonthEndTime(MonthUtils.getMonthLastDayStartTime(dto.getMonth()));
+        if (ObjUtil.isNull(dto.getDeptId())) {
+            Long topSiteId = DeptUtils.getTopSiteId(sysDeptService.selectDeptById(SecurityUtils.getDeptId()));
+            if (topSiteId == null) {
+                throw new ServiceException("无法找到有效的站点信息");
+            }
+            dto.setDeptId(topSiteId);
+        }
+        if (CollUtil.isEmpty(dto.getRoleKeyList())) {
+            dto.setRoleKeyList(Arrays.asList(RoleTypeEnum.SecurityCheck.getCode(), RoleTypeEnum.banzuzhang.getCode(), RoleTypeEnum.kezhang.getCode()));
+        }
+        if (CollUtil.isEmpty(dto.getEmploymentTypeList())) {
+            dto.setEmploymentTypeList(Arrays.asList(EmploymentTypeEnum.DISPATCHED_WORKER.getCode(), EmploymentTypeEnum.REGULAR_EMPLOYEE.getCode()));
+        }
+        return userMapper.selectPersonnelUserList(dto.getDeptId(), dto.getRoleKeyList(), dto.getEmploymentTypeList(), dto.getMonthStartTime(), dto.getMonthEndTime(), dto.getNickName());
+    }
+
     @Override
     public List<LargeScreenHomePageUserInfoSqlDto> homePageUserInfoByBrigadeId(Long brigadeId) {
         return userMapper.homePageUserInfoByBrigadeId(brigadeId);

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

@@ -1111,6 +1111,32 @@
         </if>
     </select>
 
+    <select id="selectPersonnelUserList" resultMap="SysUserResult">
+        <include refid="selectUserVo"/>
+        where (u.dept_id = #{deptId} OR u.dept_id IN (
+        SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors)))
+        and u.del_flag = '0'
+        and (u.take_assessment = 'Y' or
+        (u.take_assessment = 'N' and
+        (u.exempt_take_assessment_start_time <![CDATA[>]]> #{monthStartTime} or
+        u.exempt_take_assessment_end_time <![CDATA[<]]> #{monthEndTime})))
+        <if test="roleKeyList != null and roleKeyList.size() > 0">
+            and r.role_key in
+            <foreach collection="roleKeyList" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="employmentTypeList != null and employmentTypeList.size() > 0">
+            and u.employment_type in
+            <foreach collection="employmentTypeList" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="nickName != null and nickName != ''">
+            and u.nick_name like concat('%', #{nickName}, '%')
+        </if>
+    </select>
+
     <select id="homePageUserInfo" resultType="com.sundot.airport.common.core.domain.LargeScreenHomePageUserInfoSqlDto">
         select su.user_id      userId,
                su.user_name    userName,
@@ -1209,14 +1235,14 @@
         <include refid="selectUserVo"/>
         where u.del_flag = '0'
         and (
-            u.user_name in
-            <foreach collection="names" item="name" open="(" separator="," close=")">
-                #{name}
-            </foreach>
-            or u.nick_name in
-            <foreach collection="names" item="name" open="(" separator="," close=")">
-                #{name}
-            </foreach>
+        u.user_name in
+        <foreach collection="names" item="name" open="(" separator="," close=")">
+            #{name}
+        </foreach>
+        or u.nick_name in
+        <foreach collection="names" item="name" open="(" separator="," close=")">
+            #{name}
+        </foreach>
         )
     </select>
 </mapper>