Merge remote-tracking branch 'origin/feature/dev' into feature/dev

airport-admin/src/main/java/com/sundot/airport/web/controller/personnel/PersonnelNonCadreMonthlyAssessmentController.java

@@ -97,4 +97,13 @@ public class PersonnelNonCadreMonthlyAssessmentController extends BaseController
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(personnelNonCadreMonthlyAssessmentService.deletePersonnelNonCadreMonthlyAssessmentByIds(ids));
     }
+
+    /**
+     * 自动生成指定月份非干部月度考核
+     */
+    @PreAuthorize("@ss.hasPermi('personnel:assessment:add')")
+    @GetMapping(value = "/autoGenerate/{month}")
+    public AjaxResult autoGenerate(@PathVariable("month") String month) {
+        return success(personnelNonCadreMonthlyAssessmentService.autoGenerate(month));
+    }
 }

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/config/PersonnelAsyncConfig.java

@@ -0,0 +1,43 @@
+package com.sundot.airport.common.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+
+import java.util.concurrent.Executor;
+import java.util.concurrent.ThreadPoolExecutor;
+
+/**
+ * 非干部月度考核异步配置
+ *
+ * @author ruoyi
+ */
+@Configuration
+@EnableAsync
+public class PersonnelAsyncConfig {
+
+    // 核心线程池大小
+    private int corePoolSize = 50;
+    // 最大可创建的线程数
+    private int maxPoolSize = 200;
+    // 队列最大长度
+    private int queueCapacity = 1000;
+    // 线程池维护线程所允许的空闲时间
+    private int keepAliveSeconds = 300;
+
+    @Bean(name = "personnelAsyncExecutor")
+    public Executor personnelAsyncExecutor() {
+        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+        executor.setMaxPoolSize(maxPoolSize);
+        executor.setCorePoolSize(corePoolSize);
+        executor.setQueueCapacity(queueCapacity);
+        executor.setKeepAliveSeconds(keepAliveSeconds);
+        executor.setThreadNamePrefix("personnel-event-async-"); // 线程名前缀
+        // 线程池对拒绝任务(无线程可用)的处理策略
+        executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
+        executor.initialize();
+        return executor;
+    }
+
+}

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/event/PersonnelEvent.java

@@ -0,0 +1,26 @@
+package com.sundot.airport.common.event;
+
+import org.springframework.context.ApplicationEvent;
+
+/**
+ * 非干部月度考核事件
+ *
+ * @author ruoyi
+ */
+public class PersonnelEvent extends ApplicationEvent {
+
+    /**
+     * 非干部月度考核月份
+     */
+    private String month;
+
+    public PersonnelEvent(Object source, String month) {
+        super(source);
+        this.month = month;
+    }
+
+    public String getMonth() {
+        return month;
+    }
+
+}

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-personnel/src/main/java/com/sundot/airport/personnel/listener/PersonnelEventListener.java

@@ -0,0 +1,53 @@
+package com.sundot.airport.personnel.listener;
+
+import com.sundot.airport.common.event.PersonnelEvent;
+import com.sundot.airport.personnel.domain.PersonnelNonCadreMonthlyAssessment;
+import com.sundot.airport.personnel.service.IPersonnelNonCadreMonthlyAssessmentService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.event.EventListener;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 非干部月度考核事件监听器
+ *
+ * @author sundot
+ */
+@Slf4j
+@Component
+public class PersonnelEventListener {
+
+    @Autowired
+    private IPersonnelNonCadreMonthlyAssessmentService personnelNonCadreMonthlyAssessmentService;
+
+    /**
+     * 异步处理事件
+     */
+    @Async("personnelAsyncExecutor")  // 关键：标记为异步方法
+    @EventListener  // 监听PersonnelEvent事件
+    public void handlePersonnel(PersonnelEvent event) {
+        long start = System.currentTimeMillis();
+        String month = event.getMonth();
+        log.info("【异步处理】开始非干部月度考核【month={}】", month);
+        PersonnelNonCadreMonthlyAssessment query = new PersonnelNonCadreMonthlyAssessment();
+        query.setAssessmentMonthStart(month);
+        List<PersonnelNonCadreMonthlyAssessment> list = personnelNonCadreMonthlyAssessmentService.selectPersonnelNonCadreMonthlyAssessmentList(query);
+        list = list.stream()
+                .sorted(Comparator.comparing(PersonnelNonCadreMonthlyAssessment::getAssessmentMonth))
+                .collect(Collectors.toList());
+        list.forEach(item -> {
+            PersonnelNonCadreMonthlyAssessment data = personnelNonCadreMonthlyAssessmentService.selectPersonnelNonCadreMonthlyAssessmentById(item.getId());
+            // 完善数据
+            personnelNonCadreMonthlyAssessmentService.doImprove(data);
+            // 修改非干部月度考核-仅更新主表数据
+            personnelNonCadreMonthlyAssessmentService.updatePersonnelNonCadreMonthlyAssessmentOnly(data);
+        });
+        long end = System.currentTimeMillis();
+        log.info("【异步处理】完成非干部月度考核【month={}】,耗时【{}】", month, end - start);
+    }
+}

airport-personnel/src/main/java/com/sundot/airport/personnel/service/IPersonnelNonCadreMonthlyAssessmentService.java

@@ -59,4 +59,28 @@ public interface IPersonnelNonCadreMonthlyAssessmentService extends IService<Per
      * @return 结果
      */
     public int deletePersonnelNonCadreMonthlyAssessmentById(Long id);
+
+    /**
+     * 完善数据
+     *
+     * @param personnelNonCadreMonthlyAssessment 完善数据
+     * @return 完善数据
+     */
+    public void doImprove(PersonnelNonCadreMonthlyAssessment personnelNonCadreMonthlyAssessment);
+
+    /**
+     * 修改非干部月度考核-仅更新主表数据
+     *
+     * @param personnelNonCadreMonthlyAssessment 非干部月度考核
+     * @return 结果
+     */
+    public int updatePersonnelNonCadreMonthlyAssessmentOnly(PersonnelNonCadreMonthlyAssessment personnelNonCadreMonthlyAssessment);
+
+    /**
+     * 自动生成指定月份非干部月度考核
+     *
+     * @param month 月份值
+     * @return 结果
+     */
+    public List<PersonnelNonCadreMonthlyAssessment> autoGenerate(String month);
 }

airport-personnel/src/main/java/com/sundot/airport/personnel/service/impl/PersonnelNonCadreMonthlyAssessmentServiceImpl.java

@@ -14,6 +14,8 @@ 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.common.core.domain.entity.SysUser;
+import com.sundot.airport.common.dto.SysPersonnelUserConditionDto;
+import com.sundot.airport.common.dto.SysUserLeaderConditionDto;
 import com.sundot.airport.common.enums.AssessmentTeamEnum;
 import com.sundot.airport.common.enums.BasePerformanceIndicatorApplicationMethodRuleEnum;
 import com.sundot.airport.common.enums.BasePerformanceIndicatorAssessmentResultRuleEnum;
@@ -22,9 +24,11 @@ import com.sundot.airport.common.enums.BasePerformanceIndicatorLeaveTypeEnum;
 import com.sundot.airport.common.enums.BasePerformanceIndicatorQcDeptTypeEnum;
 import com.sundot.airport.common.enums.BasePerformanceIndicatorRewardPunishmentTypeTypeEnum;
 import com.sundot.airport.common.enums.RoleTypeEnum;
+import com.sundot.airport.common.event.PersonnelEvent;
 import com.sundot.airport.common.exception.ServiceException;
 import com.sundot.airport.common.utils.DateUtils;
 import com.sundot.airport.common.utils.MonthUtils;
+import com.sundot.airport.common.utils.SecurityUtils;
 import com.sundot.airport.personnel.domain.PersonnelMonthlyAssessmentIndicatorDetail;
 import com.sundot.airport.personnel.domain.PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail;
 import com.sundot.airport.personnel.service.IPersonnelMonthlyAssessmentIndicatorDetailService;
@@ -33,6 +37,7 @@ import com.sundot.airport.system.domain.BasePerformanceIndicatorCategory;
 import com.sundot.airport.system.service.IBasePerformanceIndicatorCategoryService;
 import com.sundot.airport.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 import com.sundot.airport.personnel.mapper.PersonnelNonCadreMonthlyAssessmentMapper;
 import com.sundot.airport.personnel.domain.PersonnelNonCadreMonthlyAssessment;
@@ -62,6 +67,8 @@ public class PersonnelNonCadreMonthlyAssessmentServiceImpl extends ServiceImpl<P
     private IBasePerformanceIndicatorCategoryService basePerformanceIndicatorCategoryService;
     @Autowired
     private ISysUserService sysUserService;
+    @Autowired
+    private ApplicationEventPublisher eventPublisher;
 
     /**
      * 查询非干部月度考核
@@ -92,8 +99,6 @@ public class PersonnelNonCadreMonthlyAssessmentServiceImpl extends ServiceImpl<P
                 });
             }
         }
-        // 完善数据
-        doImprove(result);
         return result;
     }
 
@@ -125,6 +130,8 @@ public class PersonnelNonCadreMonthlyAssessmentServiceImpl extends ServiceImpl<P
             throw new ServiceException("该用户已存在该考核月份的考核记录");
         }
         personnelNonCadreMonthlyAssessment.setCreateTime(DateUtils.getNowDate());
+        // 完善数据
+        doImprove(personnelNonCadreMonthlyAssessment);
         int result = personnelNonCadreMonthlyAssessmentMapper.insertPersonnelNonCadreMonthlyAssessment(personnelNonCadreMonthlyAssessment);
         if (CollUtil.isNotEmpty(personnelNonCadreMonthlyAssessment.getPersonnelMonthlyAssessmentIndicatorDetailList())) {
             personnelNonCadreMonthlyAssessment.getPersonnelMonthlyAssessmentIndicatorDetailList().forEach(personnelMonthlyAssessmentIndicatorDetail -> {
@@ -142,8 +149,7 @@ public class PersonnelNonCadreMonthlyAssessmentServiceImpl extends ServiceImpl<P
                 }
             });
         }
-        PersonnelNonCadreMonthlyAssessment dto = selectPersonnelNonCadreMonthlyAssessmentById(personnelNonCadreMonthlyAssessment.getId());
-        personnelNonCadreMonthlyAssessmentMapper.updatePersonnelNonCadreMonthlyAssessment(dto);
+        eventPublisher.publishEvent(new PersonnelEvent(this, personnelNonCadreMonthlyAssessment.getAssessmentMonth()));
         return result;
     }
 
@@ -171,9 +177,12 @@ public class PersonnelNonCadreMonthlyAssessmentServiceImpl extends ServiceImpl<P
                 personnelMonthlyAssessmentIndicatorRewardPunishmentDetailService.removeBatchByIds(personnelMonthlyAssessmentIndicatorRewardPunishmentDetailListOld);
             }
         }
+        // 完善数据
+        doImprove(personnelNonCadreMonthlyAssessment);
         // 新增新数据
         if (CollUtil.isNotEmpty(personnelNonCadreMonthlyAssessment.getPersonnelMonthlyAssessmentIndicatorDetailList())) {
             personnelNonCadreMonthlyAssessment.getPersonnelMonthlyAssessmentIndicatorDetailList().forEach(personnelMonthlyAssessmentIndicatorDetail -> {
+                personnelMonthlyAssessmentIndicatorDetail.setId(null);
                 personnelMonthlyAssessmentIndicatorDetail.setSourceId(personnelNonCadreMonthlyAssessment.getId());
                 personnelMonthlyAssessmentIndicatorDetail.setCreateBy(personnelNonCadreMonthlyAssessment.getCreateBy());
                 personnelMonthlyAssessmentIndicatorDetail.setCreateTime(DateUtils.getNowDate());
@@ -182,6 +191,7 @@ public class PersonnelNonCadreMonthlyAssessmentServiceImpl extends ServiceImpl<P
                 personnelMonthlyAssessmentIndicatorDetailService.insertPersonnelMonthlyAssessmentIndicatorDetail(personnelMonthlyAssessmentIndicatorDetail);
                 if (CollUtil.isNotEmpty(personnelMonthlyAssessmentIndicatorDetail.getPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailList())) {
                     personnelMonthlyAssessmentIndicatorDetail.getPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailList().forEach(personnelMonthlyAssessmentIndicatorRewardPunishmentDetail -> {
+                        personnelMonthlyAssessmentIndicatorRewardPunishmentDetail.setId(null);
                         personnelMonthlyAssessmentIndicatorRewardPunishmentDetail.setSourceId(personnelMonthlyAssessmentIndicatorDetail.getId());
                         personnelMonthlyAssessmentIndicatorRewardPunishmentDetail.setCreateBy(personnelMonthlyAssessmentIndicatorDetail.getCreateBy());
                         personnelMonthlyAssessmentIndicatorRewardPunishmentDetail.setCreateTime(DateUtils.getNowDate());
@@ -192,8 +202,7 @@ public class PersonnelNonCadreMonthlyAssessmentServiceImpl extends ServiceImpl<P
                 }
             });
         }
-        PersonnelNonCadreMonthlyAssessment dto = selectPersonnelNonCadreMonthlyAssessmentById(personnelNonCadreMonthlyAssessment.getId());
-        personnelNonCadreMonthlyAssessmentMapper.updatePersonnelNonCadreMonthlyAssessment(dto);
+        eventPublisher.publishEvent(new PersonnelEvent(this, personnelNonCadreMonthlyAssessment.getAssessmentMonth()));
         return result;
     }
 
@@ -255,7 +264,8 @@ public class PersonnelNonCadreMonthlyAssessmentServiceImpl extends ServiceImpl<P
      * @param result 非干部月度考核
      * @return 非干部月度考核
      */
-    private void doImprove(PersonnelNonCadreMonthlyAssessment result) {
+    @Override
+    public void doImprove(PersonnelNonCadreMonthlyAssessment result) {
         List<BasePerformanceIndicatorCategory> indicatorCategoryyList = basePerformanceIndicatorCategoryService.selectBasePerformanceIndicatorCategoryListTree(new BasePerformanceIndicatorCategory());
         // 红线指标
         BasePerformanceIndicatorCategory redLineIndexCategory = indicatorCategoryyList.stream().filter(item -> StrUtil.equals("红线指标", item.getName())).findFirst().orElse(null);
@@ -839,4 +849,86 @@ public class PersonnelNonCadreMonthlyAssessmentServiceImpl extends ServiceImpl<P
         // 判断当前用户分数是否分数最低（包括并列）
         return lowerOrEqualCount == 0;
     }
+
+    /**
+     * 修改非干部月度考核-仅更新主表数据
+     *
+     * @param personnelNonCadreMonthlyAssessment 非干部月度考核
+     * @return 结果
+     */
+    @Override
+    public int updatePersonnelNonCadreMonthlyAssessmentOnly(PersonnelNonCadreMonthlyAssessment personnelNonCadreMonthlyAssessment) {
+        personnelNonCadreMonthlyAssessment.setUpdateTime(DateUtils.getNowDate());
+        return personnelNonCadreMonthlyAssessmentMapper.updatePersonnelNonCadreMonthlyAssessment(personnelNonCadreMonthlyAssessment);
+    }
+
+    /**
+     * 自动生成指定月份非干部月度考核
+     *
+     * @param month 月份值
+     * @return 结果
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public List<PersonnelNonCadreMonthlyAssessment> autoGenerate(String month) {
+        List<PersonnelNonCadreMonthlyAssessment> result = new ArrayList<>();
+        SysPersonnelUserConditionDto sysPersonnelUserConditionDtoQuery = new SysPersonnelUserConditionDto();
+        sysPersonnelUserConditionDtoQuery.setMonth(month);
+        List<SysUser> sysUserList = sysUserService.selectPersonnelUserList(sysPersonnelUserConditionDtoQuery);
+        PersonnelNonCadreMonthlyAssessment personnelNonCadreMonthlyAssessmentQuery = new PersonnelNonCadreMonthlyAssessment();
+        personnelNonCadreMonthlyAssessmentQuery.setAssessmentMonth(month);
+        List<PersonnelNonCadreMonthlyAssessment> existList = personnelNonCadreMonthlyAssessmentMapper.selectPersonnelNonCadreMonthlyAssessmentList(personnelNonCadreMonthlyAssessmentQuery);
+        List<Long> existUserIdList = existList.stream().map(PersonnelNonCadreMonthlyAssessment::getUserId).collect(Collectors.toList());
+        sysUserList = sysUserList.stream().filter(sysUser -> !existUserIdList.contains(sysUser.getUserId())).collect(Collectors.toList());
+        sysUserList.forEach(sysUser -> {
+            PersonnelNonCadreMonthlyAssessment personnelNonCadreMonthlyAssessmentNew = new PersonnelNonCadreMonthlyAssessment();
+            personnelNonCadreMonthlyAssessmentNew.setCreateBy(SecurityUtils.getLoginUser().getUsername());
+            personnelNonCadreMonthlyAssessmentNew.setCreateTime(DateUtils.getNowDate());
+            personnelNonCadreMonthlyAssessmentNew.setAssessmentMonth(month);
+            personnelNonCadreMonthlyAssessmentNew.setUserId(sysUser.getUserId());
+            personnelNonCadreMonthlyAssessmentNew.setUserName(sysUser.getUserName());
+            if (CollUtil.isNotEmpty(sysUser.getRoles())) {
+                personnelNonCadreMonthlyAssessmentNew.setRoleId(sysUser.getRoles().get(0).getRoleId());
+                personnelNonCadreMonthlyAssessmentNew.setRoleName(sysUser.getRoles().get(0).getRoleName());
+                personnelNonCadreMonthlyAssessmentNew.setRoleKey(sysUser.getRoles().get(0).getRoleKey());
+            }
+            personnelNonCadreMonthlyAssessmentNew.setEmploymentType(sysUser.getEmploymentType());
+            personnelNonCadreMonthlyAssessmentNew.setAssessmentTeam(sysUser.getAssessmentTeam());
+            personnelNonCadreMonthlyAssessmentNew.setPost(sysUser.getPost());
+            SysUserLeaderConditionDto teamLeaderDto = new SysUserLeaderConditionDto();
+            teamLeaderDto.setUserId(sysUser.getUserId());
+            teamLeaderDto.setRoleKeyList(Collections.singletonList(RoleTypeEnum.banzuzhang.getCode()));
+            List<SysUser> teamLeaderList = sysUserService.selectUserLeaderListByCondition(teamLeaderDto);
+            if (CollUtil.isNotEmpty(teamLeaderList)) {
+                personnelNonCadreMonthlyAssessmentNew.setDeputyTeamLeaderId(teamLeaderList.get(0).getUserId());
+                personnelNonCadreMonthlyAssessmentNew.setDeputyTeamLeaderName(teamLeaderList.get(0).getUserName());
+            }
+            SysUserLeaderConditionDto supervisorDto = new SysUserLeaderConditionDto();
+            supervisorDto.setUserId(sysUser.getUserId());
+            supervisorDto.setRoleKeyList(Collections.singletonList(RoleTypeEnum.kezhang.getCode()));
+            List<SysUser> supervisorList = sysUserService.selectUserLeaderListByCondition(supervisorDto);
+            if (CollUtil.isNotEmpty(supervisorList)) {
+                personnelNonCadreMonthlyAssessmentNew.setDeputySupervisorId(supervisorList.get(0).getUserId());
+                personnelNonCadreMonthlyAssessmentNew.setDeputySupervisorName(supervisorList.get(0).getUserName());
+            }
+            SysUserLeaderConditionDto managerDto = new SysUserLeaderConditionDto();
+            managerDto.setUserId(sysUser.getUserId());
+            managerDto.setRoleKeyList(Collections.singletonList(RoleTypeEnum.jingli.getCode()));
+            List<SysUser> managerList = sysUserService.selectUserLeaderListByCondition(managerDto);
+            if (CollUtil.isNotEmpty(managerList)) {
+                if (managerList.size() > 1) {
+                    managerList = managerList.stream().filter(item -> StrUtil.equals(item.getWorkArea(), sysUser.getWorkArea())).collect(Collectors.toList());
+                }
+                if (CollUtil.isNotEmpty(managerList)) {
+                    personnelNonCadreMonthlyAssessmentNew.setDeputyManagerId(managerList.get(0).getUserId());
+                    personnelNonCadreMonthlyAssessmentNew.setDeputyManagerName(managerList.get(0).getUserName());
+                }
+            }
+            personnelNonCadreMonthlyAssessmentNew.setPersonnelMonthlyAssessmentIndicatorDetailList(new ArrayList<>());
+            doImprove(personnelNonCadreMonthlyAssessmentNew);
+            personnelNonCadreMonthlyAssessmentMapper.insertPersonnelNonCadreMonthlyAssessment(personnelNonCadreMonthlyAssessmentNew);
+            result.add(personnelNonCadreMonthlyAssessmentNew);
+        });
+        return result;
+    }
 }

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>