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

airport-common/src/main/java/com/sundot/airport/common/enums/BasePerformanceIndicatorApplicationMethodRuleEnum.java

@@ -0,0 +1,24 @@
+package com.sundot.airport.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 考核指标表应用方式规则枚举
+ */
+@Getter
+@AllArgsConstructor
+public enum BasePerformanceIndicatorApplicationMethodRuleEnum {
+
+    APPLICATION_METHOD_RULE_ONE("面谈督导", "当月评价为待改进"),
+    APPLICATION_METHOD_RULE_TWO("停岗并脱产培训1周", "当月评价为不称职或当年连续2次出现待改进"),
+    APPLICATION_METHOD_RULE_THREE("降职降薪", "考核组为安检员兼X光机操作员（旅检、员工），连续3个月待改进或当年累计4次待改进或近12个月累计2次评价不称职"),
+    APPLICATION_METHOD_RULE_FOUR("解除合同", "培训返岗后，当年再次出现待改进或不称职，则评价不胜任，上报公司解除合同"),
+    APPLICATION_METHOD_RULE_FIVE("岗位重新竞聘", "面谈后近12个月累计出现3次待改进"),
+    APPLICATION_METHOD_RULE_SIX("降职降薪", "面谈后当年再次出现不称职"),
+    APPLICATION_METHOD_RULE_OTHER("其他", "其他");
+
+    private final String name;
+    private final String desc;
+
+}

airport-common/src/main/java/com/sundot/airport/common/enums/BasePerformanceIndicatorAssessmentResultRuleEnum.java

@@ -0,0 +1,25 @@
+package com.sundot.airport.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 考核指标表考核结果规则枚举
+ */
+@Getter
+@AllArgsConstructor
+public enum BasePerformanceIndicatorAssessmentResultRuleEnum {
+
+    ASSESSMENT_RESULT_RULE_ONE("待改进", "评价分数排名后5%，考核组内"),
+    ASSESSMENT_RESULT_RULE_TWO("不称职", "评价分数低于75分（不含75分）"),
+    ASSESSMENT_RESULT_RULE_THREE("不称职", "当月非核心安全+核心扣分字段扣分达10分"),
+    ASSESSMENT_RESULT_RULE_FOUR("不称职", "当月触发任一红线行为（=当月评价分不超过70分）"),
+    ASSESSMENT_RESULT_RULE_FIVE("取消班组长资格", "管理范围内有2名及以上组员当月评价为不称职"),
+    ASSESSMENT_RESULT_RULE_SIX("取消班组长资格", "本人近12月累计两次评价为不称职"),
+    ASSESSMENT_RESULT_RULE_SEVEN("待改进", "管理评价得分在本评价组内排名最后1名（不可豁免）"),
+    ASSESSMENT_RESULT_RULE_OTHER("其他", "其他");
+
+    private final String name;
+    private final String desc;
+
+}

airport-common/src/main/java/com/sundot/airport/common/enums/BasePerformanceIndicatorExemptionRuleEnum.java

@@ -0,0 +1,20 @@
+package com.sundot.airport.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 考核指标表是否豁免规则枚举
+ */
+@Getter
+@AllArgsConstructor
+public enum BasePerformanceIndicatorExemptionRuleEnum {
+
+    EXEMPTION_RULE_ONE("豁免", "没有扣分项"),
+    EXEMPTION_RULE_TWO("豁免", "仅因病假、事假等扣分导致排名/分数进入待改进、不称职区域的"),
+    EXEMPTION_RULE_OTHER("其他", "其他");
+
+    private final String name;
+    private final String desc;
+
+}

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

@@ -0,0 +1,239 @@
+package com.sundot.airport.common.utils;
+
+import java.time.YearMonth;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 月份工具类-人事绩效模块
+ */
+public class MonthUtils {
+
+    /**
+     * 月份范围对象
+     */
+    public static class MonthRange {
+        private String startMonth;
+        private String endMonth;
+
+        public MonthRange(String startMonth, String endMonth) {
+            this.startMonth = startMonth;
+            this.endMonth = endMonth;
+        }
+
+        public String getStartMonth() {
+            return startMonth;
+        }
+
+        public String getEndMonth() {
+            return endMonth;
+        }
+
+        @Override
+        public String toString() {
+            return "MonthRange{startMonth='" + startMonth + "', endMonth='" + endMonth + "'}";
+        }
+    }
+
+    private static final DateTimeFormatter MONTH_FORMATTER = DateTimeFormatter.ofPattern("yyyyMM");
+
+    /**
+     * 根据月份值查询上个月月份值
+     * @param month 月份值，格式：yyyyMM
+     * @return 上个月月份值，格式：yyyyMM
+     */
+    public static String getPreviousMonth(String month) {
+        if (month == null || month.length() != 6) {
+            throw new IllegalArgumentException("月份格式错误，应为yyyyMM");
+        }
+
+        try {
+            YearMonth yearMonth = YearMonth.parse(month, MONTH_FORMATTER);
+            YearMonth previousMonth = yearMonth.minusMonths(1);
+            return previousMonth.format(MONTH_FORMATTER);
+        } catch (Exception e) {
+            throw new IllegalArgumentException("月份解析失败: " + month);
+        }
+    }
+
+    /**
+     * 根据月份值查询下个月月份值
+     * @param month 月份值，格式：yyyyMM
+     * @return 下个月月份值，格式：yyyyMM
+     */
+    public static String getNextMonth(String month) {
+        if (month == null || month.length() != 6) {
+            throw new IllegalArgumentException("月份格式错误，应为yyyyMM");
+        }
+
+        try {
+            YearMonth yearMonth = YearMonth.parse(month, MONTH_FORMATTER);
+            YearMonth nextMonth = yearMonth.plusMonths(1);
+            return nextMonth.format(MONTH_FORMATTER);
+        } catch (Exception e) {
+            throw new IllegalArgumentException("月份解析失败: " + month);
+        }
+    }
+
+    /**
+     * 查询近3个月月份值（不包含当月）
+     * @param month 月份值，格式：yyyyMM
+     * @return 开始月份和结束月份
+     */
+    public static MonthRange getLast3Months(String month) {
+        return getLastNMonths(month, 3);
+    }
+
+    /**
+     * 查询近12个月月份值（不包含当月）
+     * @param month 月份值，格式：yyyyMM
+     * @return 开始月份和结束月份
+     */
+    public static MonthRange getLast12Months(String month) {
+        return getLastNMonths(month, 12);
+    }
+
+    /**
+     * 查询近N个月月份值（不包含当月）
+     * @param month 月份值，格式：yyyyMM
+     * @param n 月数
+     * @return 开始月份和结束月份
+     */
+    private static MonthRange getLastNMonths(String month, int n) {
+        if (month == null || month.length() != 6) {
+            throw new IllegalArgumentException("月份格式错误，应为yyyyMM");
+        }
+
+        try {
+            YearMonth currentMonth = YearMonth.parse(month, MONTH_FORMATTER);
+            YearMonth startMonth = currentMonth.minusMonths(n);
+            YearMonth endMonth = currentMonth.minusMonths(1);
+
+            return new MonthRange(
+                    startMonth.format(MONTH_FORMATTER),
+                    endMonth.format(MONTH_FORMATTER)
+            );
+        } catch (Exception e) {
+            throw new IllegalArgumentException("月份解析失败: " + month);
+        }
+    }
+
+    /**
+     * 查询此年度12个月月份值
+     * @param month 月份值，格式：yyyyMM
+     * @return 开始月份（当年1月）和结束月份（当年12月）
+     */
+    public static MonthRange getCurrentYearMonths(String month) {
+        if (month == null || month.length() != 6) {
+            throw new IllegalArgumentException("月份格式错误，应为yyyyMM");
+        }
+
+        try {
+            YearMonth currentMonth = YearMonth.parse(month, MONTH_FORMATTER);
+            int year = currentMonth.getYear();
+
+            YearMonth startMonth = YearMonth.of(year, 1);
+            YearMonth endMonth = YearMonth.of(year, 12);
+
+            return new MonthRange(
+                    startMonth.format(MONTH_FORMATTER),
+                    endMonth.format(MONTH_FORMATTER)
+            );
+        } catch (Exception e) {
+            throw new IllegalArgumentException("月份解析失败: " + month);
+        }
+    }
+
+    /**
+     * 查询近3个月月份值（包含当月）
+     * @param month 月份值，格式：yyyyMM
+     * @return 开始月份和结束月份
+     */
+    public static MonthRange getLast3MonthsIncludeCurrent(String month) {
+        return getLastNMonthsIncludeCurrent(month, 3);
+    }
+
+    /**
+     * 查询近12个月月份值（包含当月）
+     * @param month 月份值，格式：yyyyMM
+     * @return 开始月份和结束月份
+     */
+    public static MonthRange getLast12MonthsIncludeCurrent(String month) {
+        return getLastNMonthsIncludeCurrent(month, 12);
+    }
+
+    /**
+     * 查询近N个月月份值（包含当月）
+     * @param month 月份值，格式：yyyyMM
+     * @param n 月数
+     * @return 开始月份和结束月份
+     */
+    private static MonthRange getLastNMonthsIncludeCurrent(String month, int n) {
+        if (month == null || month.length() != 6) {
+            throw new IllegalArgumentException("月份格式错误，应为yyyyMM");
+        }
+
+        try {
+            YearMonth currentMonth = YearMonth.parse(month, MONTH_FORMATTER);
+            YearMonth startMonth = currentMonth.minusMonths(n - 1);
+
+            return new MonthRange(
+                    startMonth.format(MONTH_FORMATTER),
+                    month  // 结束月份就是传入的月份（包含当月）
+            );
+        } catch (Exception e) {
+            throw new IllegalArgumentException("月份解析失败: " + month);
+        }
+    }
+
+    /**
+     * 查询此年度12个月月份值（1月份到输入的月份）
+     * @param month 月份值，格式：yyyyMM
+     * @return 开始月份（当年1月）和结束月份（输入的月份）
+     */
+    public static MonthRange getCurrentYearToMonth(String month) {
+        if (month == null || month.length() != 6) {
+            throw new IllegalArgumentException("月份格式错误，应为yyyyMM");
+        }
+
+        try {
+            YearMonth currentMonth = YearMonth.parse(month, MONTH_FORMATTER);
+            int year = currentMonth.getYear();
+
+            YearMonth startMonth = YearMonth.of(year, 1);
+
+            return new MonthRange(
+                    startMonth.format(MONTH_FORMATTER),
+                    month  // 结束月份就是传入的月份
+            );
+        } catch (Exception e) {
+            throw new IllegalArgumentException("月份解析失败: " + month);
+        }
+    }
+
+    /**
+     * 获取指定月份范围内的所有月份列表
+     * @param startMonth 开始月份，格式：yyyyMM
+     * @param endMonth 结束月份，格式：yyyyMM
+     * @return 月份列表
+     */
+    public static List<String> getMonthList(String startMonth, String endMonth) {
+        List<String> monthList = new ArrayList<>();
+
+        try {
+            YearMonth start = YearMonth.parse(startMonth, MONTH_FORMATTER);
+            YearMonth end = YearMonth.parse(endMonth, MONTH_FORMATTER);
+
+            while (!start.isAfter(end)) {
+                monthList.add(start.format(MONTH_FORMATTER));
+                start = start.plusMonths(1);
+            }
+
+            return monthList;
+        } catch (Exception e) {
+            throw new IllegalArgumentException("月份解析失败");
+        }
+    }
+
+}

airport-personnel/src/main/java/com/sundot/airport/personnel/domain/PersonnelMonthlyAssessmentIndicatorDetail.java

@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -87,6 +88,7 @@ public class PersonnelMonthlyAssessmentIndicatorDetail extends BaseEntity {
     private BigDecimal amountResult;
 
     /** 奖罚明细列表 */
+    @TableField(exist = false)
     private List<PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail> personnelMonthlyAssessmentIndicatorRewardPunishmentDetailList;
 
     public void setTenantId(String tenantId) {

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

@@ -3,6 +3,7 @@ package com.sundot.airport.personnel.service.impl;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -12,17 +13,25 @@ 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.common.core.domain.entity.SysUser;
+import com.sundot.airport.common.enums.AssessmentTeamEnum;
+import com.sundot.airport.common.enums.BasePerformanceIndicatorApplicationMethodRuleEnum;
+import com.sundot.airport.common.enums.BasePerformanceIndicatorAssessmentResultRuleEnum;
+import com.sundot.airport.common.enums.BasePerformanceIndicatorExemptionRuleEnum;
+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.exception.ServiceException;
 import com.sundot.airport.common.utils.DateUtils;
+import com.sundot.airport.common.utils.MonthUtils;
 import com.sundot.airport.personnel.domain.PersonnelMonthlyAssessmentIndicatorDetail;
 import com.sundot.airport.personnel.domain.PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail;
 import com.sundot.airport.personnel.service.IPersonnelMonthlyAssessmentIndicatorDetailService;
 import com.sundot.airport.personnel.service.IPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailService;
 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.stereotype.Service;
 import com.sundot.airport.personnel.mapper.PersonnelNonCadreMonthlyAssessmentMapper;
@@ -51,6 +60,8 @@ public class PersonnelNonCadreMonthlyAssessmentServiceImpl extends ServiceImpl<P
     private IPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailService personnelMonthlyAssessmentIndicatorRewardPunishmentDetailService;
     @Autowired
     private IBasePerformanceIndicatorCategoryService basePerformanceIndicatorCategoryService;
+    @Autowired
+    private ISysUserService sysUserService;
 
     /**
      * 查询非干部月度考核
@@ -68,136 +79,21 @@ public class PersonnelNonCadreMonthlyAssessmentServiceImpl extends ServiceImpl<P
         LambdaQueryWrapper<PersonnelMonthlyAssessmentIndicatorDetail> detailQueryWrapper = new LambdaQueryWrapper<>();
         detailQueryWrapper.eq(PersonnelMonthlyAssessmentIndicatorDetail::getSourceId, result.getId());
         List<PersonnelMonthlyAssessmentIndicatorDetail> personnelMonthlyAssessmentIndicatorDetailList = personnelMonthlyAssessmentIndicatorDetailService.getBaseMapper().selectList(detailQueryWrapper);
-        if (CollUtil.isEmpty(personnelMonthlyAssessmentIndicatorDetailList)) {
-            return result;
-        }
         result.setPersonnelMonthlyAssessmentIndicatorDetailList(personnelMonthlyAssessmentIndicatorDetailList);
-        // 奖罚明细列表
-        LambdaQueryWrapper<PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail> rewardPunishmentDetailQueryWrapper = new LambdaQueryWrapper<>();
-        rewardPunishmentDetailQueryWrapper.in(PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail::getSourceId, personnelMonthlyAssessmentIndicatorDetailList.stream().map(PersonnelMonthlyAssessmentIndicatorDetail::getId).toArray());
-        List<PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail> personnelMonthlyAssessmentIndicatorRewardPunishmentDetailList = personnelMonthlyAssessmentIndicatorRewardPunishmentDetailService.getBaseMapper().selectList(rewardPunishmentDetailQueryWrapper);
-        if (CollUtil.isEmpty(personnelMonthlyAssessmentIndicatorRewardPunishmentDetailList)) {
-            return result;
-        }
-        Map<Long, List<PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail>> rewardPunishmentDetailMap = personnelMonthlyAssessmentIndicatorRewardPunishmentDetailList.stream().collect(Collectors.groupingBy(PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail::getSourceId));
-        personnelMonthlyAssessmentIndicatorDetailList.forEach(item -> {
-            item.setPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailList(rewardPunishmentDetailMap.get(item.getId()));
-        });
-
-        List<BasePerformanceIndicatorCategory> indicatorCategoryyList = basePerformanceIndicatorCategoryService.selectBasePerformanceIndicatorCategoryListTree(new BasePerformanceIndicatorCategory());
-        // 红线指标
-        BasePerformanceIndicatorCategory redLineIndexCategory = indicatorCategoryyList.stream().filter(item -> StrUtil.equals("红线指标", item.getName())).findFirst().orElse(null);
-        List<BasePerformanceIndicatorCategory> redLineIndexCategoryChildren = (List<BasePerformanceIndicatorCategory>) redLineIndexCategory.getChildren();
-        List<String> redLineIndexCategoryCodeList = redLineIndexCategoryChildren.stream().map(BasePerformanceIndicatorCategory::getCode).collect(Collectors.toList());
-        List<PersonnelMonthlyAssessmentIndicatorDetail> redLineIndexAccordList = result.getPersonnelMonthlyAssessmentIndicatorDetailList().stream().filter(item -> redLineIndexCategoryCodeList.contains(item.getIndicatorCode())).collect(Collectors.toList());
-        Integer redLineIndexTriggerCount = redLineIndexAccordList.stream().map(PersonnelMonthlyAssessmentIndicatorDetail::getOccurCount).filter(ObjUtil::isNotNull).reduce(0, Integer::sum);
-        result.setRedLineIndexTriggerCount(redLineIndexTriggerCount);
-        result.setRedLineIndexAccordList(redLineIndexAccordList);
-        // 核心指标
-        BasePerformanceIndicatorCategory coreIndexCategory = indicatorCategoryyList.stream().filter(item -> StrUtil.equals("核心指标", item.getName())).findFirst().orElse(null);
-        List<BasePerformanceIndicatorCategory> coreIndexCategoryChildren = (List<BasePerformanceIndicatorCategory>) coreIndexCategory.getChildren();
-        List<String> coreIndexCategoryCodeList = coreIndexCategoryChildren.stream().map(BasePerformanceIndicatorCategory::getCode).collect(Collectors.toList());
-        List<PersonnelMonthlyAssessmentIndicatorDetail> coreIndexAccordList = result.getPersonnelMonthlyAssessmentIndicatorDetailList().stream().filter(item -> coreIndexCategoryCodeList.contains(item.getIndicatorCode())).collect(Collectors.toList());
-        BigDecimal coreIndexScore = coreIndexAccordList.stream().map(PersonnelMonthlyAssessmentIndicatorDetail::getScoreResult).filter(ObjUtil::isNotNull).reduce(BigDecimal.ZERO, BigDecimal::add);
-        result.setCoreIndexScore(coreIndexScore);
-        result.setCoreIndexAccordList(coreIndexAccordList);
-        // 其他指标
-        BasePerformanceIndicatorCategory otherIndexCategory = indicatorCategoryyList.stream().filter(item -> StrUtil.equals("其他指标", item.getName())).findFirst().orElse(null);
-        List<BasePerformanceIndicatorCategory> otherIndexCategoryChildren = (List<BasePerformanceIndicatorCategory>) otherIndexCategory.getChildren();
-        List<String> otherIndexCategoryCodeList = otherIndexCategoryChildren.stream().map(BasePerformanceIndicatorCategory::getCode).collect(Collectors.toList());
-        List<PersonnelMonthlyAssessmentIndicatorDetail> otherIndexAccordList = result.getPersonnelMonthlyAssessmentIndicatorDetailList().stream().filter(item -> otherIndexCategoryCodeList.contains(item.getIndicatorCode())).collect(Collectors.toList());
-        BigDecimal otherIndexScore = otherIndexAccordList.stream().map(PersonnelMonthlyAssessmentIndicatorDetail::getScoreResult).filter(ObjUtil::isNotNull).reduce(BigDecimal.ZERO, BigDecimal::add);
-        result.setOtherIndexScore(otherIndexScore);
-        result.setOtherIndexAccordList(otherIndexAccordList);
-        // 其他指标-安全
-        List<BasePerformanceIndicatorCategory> otherIndexSafetyCategory = otherIndexCategoryChildren.stream().filter(item -> StrUtil.equals("安全", item.getName())).collect(Collectors.toList());
-        List<String> otherIndexSafetyCategoryCodeList = otherIndexSafetyCategory.stream().map(BasePerformanceIndicatorCategory::getCode).collect(Collectors.toList());
-        // 其他指标-安全-仅含SOC/站品控检查扣分
-        List<PersonnelMonthlyAssessmentIndicatorDetail> otherIndexWithSocStationQcAccordList = result.getPersonnelMonthlyAssessmentIndicatorDetailList().stream()
-                .filter(item -> otherIndexSafetyCategoryCodeList.contains(item.getIndicatorCode()))
-                .filter(item -> StrUtil.equals(BasePerformanceIndicatorQcDeptTypeEnum.SOC.getCode(), item.getIndicatorCode()) || StrUtil.equals(BasePerformanceIndicatorQcDeptTypeEnum.STATION_QC.getCode(), item.getIndicatorCode()))
-                .filter(item -> StrUtil.equals(BasePerformanceIndicatorRewardPunishmentTypeTypeEnum.PUNISHMENT.getCode(), item.getRewardPunishmentType()))
-                .collect(Collectors.toList());
-        BigDecimal otherIndexSafetyScoreWithSocStationQcDeduction = otherIndexWithSocStationQcAccordList.stream().map(PersonnelMonthlyAssessmentIndicatorDetail::getScoreResult).filter(ObjUtil::isNotNull).reduce(BigDecimal.ZERO, BigDecimal::add);
-        result.setOtherIndexSafetyScoreWithSocStationQcDeduction(otherIndexSafetyScoreWithSocStationQcDeduction);
-        result.setOtherIndexSafetyScoreWithSocStationQcAccordList(otherIndexWithSocStationQcAccordList);
-        // 其他指标-安全-不仅含SOC/站品控检查扣分
-        List<PersonnelMonthlyAssessmentIndicatorDetail> otherIndexWithoutSocStationQcAccordList = result.getPersonnelMonthlyAssessmentIndicatorDetailList().stream()
-                .filter(item -> otherIndexSafetyCategoryCodeList.contains(item.getIndicatorCode()))
-                .filter(item -> !(StrUtil.equals(BasePerformanceIndicatorQcDeptTypeEnum.SOC.getCode(), item.getIndicatorCode()) || StrUtil.equals(BasePerformanceIndicatorQcDeptTypeEnum.STATION_QC.getCode(), item.getIndicatorCode())))
-                .filter(item -> StrUtil.equals(BasePerformanceIndicatorRewardPunishmentTypeTypeEnum.PUNISHMENT.getCode(), item.getRewardPunishmentType()))
-                .collect(Collectors.toList());
-        BigDecimal otherIndexSafetyScoreWithoutSocStationQcDeduction = otherIndexWithoutSocStationQcAccordList.stream().map(PersonnelMonthlyAssessmentIndicatorDetail::getScoreResult).filter(ObjUtil::isNotNull).reduce(BigDecimal.ZERO, BigDecimal::add);
-        result.setOtherIndexSafetyScoreWithoutSocStationQcDeduction(otherIndexSafetyScoreWithoutSocStationQcDeduction);
-        result.setOtherIndexSafetyScoreWithoutSocStationQcAccordList(otherIndexWithoutSocStationQcAccordList);
-        // 其他指标-非安全
-        List<BasePerformanceIndicatorCategory> otherIndexNonSafetyCategory = otherIndexCategoryChildren.stream().filter(item -> !StrUtil.equals("安全", item.getName())).collect(Collectors.toList());
-        List<String> otherIndexNonSafetyCategoryCodeList = otherIndexNonSafetyCategory.stream().map(BasePerformanceIndicatorCategory::getCode).collect(Collectors.toList());
-        List<PersonnelMonthlyAssessmentIndicatorDetail> otherIndexNonSafetyAccordList = result.getPersonnelMonthlyAssessmentIndicatorDetailList().stream()
-                .filter(item -> otherIndexNonSafetyCategoryCodeList.contains(item.getIndicatorCode()))
-                .filter(item -> StrUtil.equals(BasePerformanceIndicatorRewardPunishmentTypeTypeEnum.PUNISHMENT.getCode(), item.getRewardPunishmentType()))
-                .collect(Collectors.toList());
-        BigDecimal otherIndexNonSafetyDeduction = otherIndexNonSafetyAccordList.stream().map(PersonnelMonthlyAssessmentIndicatorDetail::getScoreResult).filter(ObjUtil::isNotNull).reduce(BigDecimal.ZERO, BigDecimal::add);
-        result.setOtherIndexNonSafetyDeduction(otherIndexNonSafetyDeduction);
-        result.setOtherIndexNonSafetyAccordList(otherIndexNonSafetyAccordList);
-        // 非核心安全+核心扣分
-        BigDecimal nonCoreSafetyPlusCoreDeduction = result.getOtherIndexSafetyScoreWithSocStationQcDeduction().add(result.getOtherIndexSafetyScoreWithoutSocStationQcDeduction()).add(result.getOtherIndexNonSafetyDeduction());
-        result.setNonCoreSafetyPlusCoreDeduction(nonCoreSafetyPlusCoreDeduction);
-        // 核心指标+其他指标-安全
-        List<String> socStationQcInvolvedCoreSafetyCodeList = new ArrayList<>();
-        socStationQcInvolvedCoreSafetyCodeList.addAll(coreIndexCategoryCodeList);
-        socStationQcInvolvedCoreSafetyCodeList.addAll(otherIndexSafetyCategoryCodeList);
-        List<PersonnelMonthlyAssessmentIndicatorDetail> socStationQcInvolvedCoreSafetyAccordList = result.getPersonnelMonthlyAssessmentIndicatorDetailList().stream()
-                .filter(item -> socStationQcInvolvedCoreSafetyCodeList.contains(item.getIndicatorCode()))
-                .filter(item -> !(StrUtil.equals(BasePerformanceIndicatorQcDeptTypeEnum.SOC.getCode(), item.getIndicatorCode()) || StrUtil.equals(BasePerformanceIndicatorQcDeptTypeEnum.STATION_QC.getCode(), item.getIndicatorCode())))
-                .filter(item -> StrUtil.equals(BasePerformanceIndicatorRewardPunishmentTypeTypeEnum.PUNISHMENT.getCode(), item.getRewardPunishmentType()))
-                .collect(Collectors.toList());
-        BigDecimal socStationQcInvolvedCoreSafetyDeduction = socStationQcInvolvedCoreSafetyAccordList.stream().map(PersonnelMonthlyAssessmentIndicatorDetail::getScoreResult).filter(ObjUtil::isNotNull).reduce(BigDecimal.ZERO, BigDecimal::add);
-        result.setSocStationQcInvolvedCoreSafetyDeduction(socStationQcInvolvedCoreSafetyDeduction);
-        result.setSocStationQcInvolvedCoreSafetyAccordList(socStationQcInvolvedCoreSafetyAccordList);
-        // 分管员工数量+扣分平均值
-        if (StrUtil.equals(RoleTypeEnum.kezhang.getCode(), result.getRoleKey())) {
-            PersonnelNonCadreMonthlyAssessment queryKeZhang = new PersonnelNonCadreMonthlyAssessment();
-            queryKeZhang.setAssessmentMonth(result.getAssessmentMonth());
-            queryKeZhang.setDeputySupervisorId(result.getUserId());
-            List<PersonnelNonCadreMonthlyAssessment> personnelNonCadreMonthlyAssessmentKeZhangList = personnelNonCadreMonthlyAssessmentMapper.selectPersonnelNonCadreMonthlyAssessmentList(queryKeZhang);
-            result.setInChargeEmployeeCount(personnelNonCadreMonthlyAssessmentKeZhangList.size());
-            result.setDeductionAverage(CollUtil.isEmpty(personnelNonCadreMonthlyAssessmentKeZhangList) ? BigDecimal.ZERO : result.getSocStationQcInvolvedCoreSafetyDeduction().divide(BigDecimal.valueOf(personnelNonCadreMonthlyAssessmentKeZhangList.size()), 2, RoundingMode.HALF_UP));
-        }
-        // 总分
-        BigDecimal totalScore = BASE_SCORE.add(result.getCoreIndexScore()).add(result.getOtherIndexScore());
-        if (result.getRedLineIndexTriggerCount() > 0) {
-            totalScore = RED_LINE_SCORE;
+        if (CollUtil.isNotEmpty(result.getPersonnelMonthlyAssessmentIndicatorDetailList())) {
+            // 奖罚明细列表
+            LambdaQueryWrapper<PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail> rewardPunishmentDetailQueryWrapper = new LambdaQueryWrapper<>();
+            rewardPunishmentDetailQueryWrapper.in(PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail::getSourceId, result.getPersonnelMonthlyAssessmentIndicatorDetailList().stream().map(PersonnelMonthlyAssessmentIndicatorDetail::getId).toArray());
+            List<PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail> personnelMonthlyAssessmentIndicatorRewardPunishmentDetailList = personnelMonthlyAssessmentIndicatorRewardPunishmentDetailService.getBaseMapper().selectList(rewardPunishmentDetailQueryWrapper);
+            if (CollUtil.isNotEmpty(personnelMonthlyAssessmentIndicatorRewardPunishmentDetailList)) {
+                Map<Long, List<PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail>> rewardPunishmentDetailMap = personnelMonthlyAssessmentIndicatorRewardPunishmentDetailList.stream().collect(Collectors.groupingBy(PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail::getSourceId));
+                result.getPersonnelMonthlyAssessmentIndicatorDetailList().forEach(item -> {
+                    item.setPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailList(rewardPunishmentDetailMap.get(item.getId()));
+                });
+            }
         }
-        result.setTotalScore(totalScore);
-        // 奖励明细+惩罚明细
-        List<String> coreAndOtherCategoryCodeList = new ArrayList<>();
-        coreAndOtherCategoryCodeList.addAll(coreIndexCategoryCodeList);
-        coreAndOtherCategoryCodeList.addAll(otherIndexCategoryCodeList);
-        List<PersonnelMonthlyAssessmentIndicatorDetail> rewardAccordList = result.getPersonnelMonthlyAssessmentIndicatorDetailList().stream()
-                .filter(item -> coreAndOtherCategoryCodeList.contains(item.getIndicatorCode()))
-                .filter(item -> StrUtil.equals(BasePerformanceIndicatorRewardPunishmentTypeTypeEnum.REWARD.getCode(), item.getRewardPunishmentType()))
-                .collect(Collectors.toList());
-        result.setRewardAccordList(rewardAccordList);
-        List<PersonnelMonthlyAssessmentIndicatorDetail> punishmentAccordList = result.getPersonnelMonthlyAssessmentIndicatorDetailList().stream()
-                .filter(item -> coreAndOtherCategoryCodeList.contains(item.getIndicatorCode()))
-                .filter(item -> StrUtil.equals(BasePerformanceIndicatorRewardPunishmentTypeTypeEnum.PUNISHMENT.getCode(), item.getRewardPunishmentType()))
-                .collect(Collectors.toList());
-        punishmentAccordList.addAll(result.getRedLineIndexAccordList());
-        result.setPunishmentAccordList(punishmentAccordList);
-        // 奖励金额+惩罚金额
-        BigDecimal rewardAmount = result.getPersonnelMonthlyAssessmentIndicatorDetailList().stream()
-                .filter(item -> StrUtil.equals(BasePerformanceIndicatorRewardPunishmentTypeTypeEnum.REWARD.getCode(), item.getRewardPunishmentType()))
-                .map(PersonnelMonthlyAssessmentIndicatorDetail::getAmountResult)
-                .filter(ObjUtil::isNotNull)
-                .reduce(BigDecimal.ZERO, BigDecimal::add);
-        result.setRewardAmount(rewardAmount);
-        BigDecimal punishmentAmount = result.getPersonnelMonthlyAssessmentIndicatorDetailList().stream()
-                .filter(item -> StrUtil.equals(BasePerformanceIndicatorRewardPunishmentTypeTypeEnum.PUNISHMENT.getCode(), item.getRewardPunishmentType()))
-                .map(PersonnelMonthlyAssessmentIndicatorDetail::getAmountResult)
-                .filter(ObjUtil::isNotNull)
-                .reduce(BigDecimal.ZERO, BigDecimal::add);
-        result.setPunishmentAmount(punishmentAmount);
+        // 完善数据
+        doImprove(result);
         return result;
     }
 
@@ -246,6 +142,8 @@ public class PersonnelNonCadreMonthlyAssessmentServiceImpl extends ServiceImpl<P
                 }
             });
         }
+        PersonnelNonCadreMonthlyAssessment dto = selectPersonnelNonCadreMonthlyAssessmentById(personnelNonCadreMonthlyAssessment.getId());
+        personnelNonCadreMonthlyAssessmentMapper.updatePersonnelNonCadreMonthlyAssessment(dto);
         return result;
     }
 
@@ -294,6 +192,8 @@ public class PersonnelNonCadreMonthlyAssessmentServiceImpl extends ServiceImpl<P
                 }
             });
         }
+        PersonnelNonCadreMonthlyAssessment dto = selectPersonnelNonCadreMonthlyAssessmentById(personnelNonCadreMonthlyAssessment.getId());
+        personnelNonCadreMonthlyAssessmentMapper.updatePersonnelNonCadreMonthlyAssessment(dto);
         return result;
     }
 
@@ -348,4 +248,595 @@ public class PersonnelNonCadreMonthlyAssessmentServiceImpl extends ServiceImpl<P
         }
         return result;
     }
+
+    /**
+     * 完善数据
+     *
+     * @param result 非干部月度考核
+     * @return 非干部月度考核
+     */
+    private void doImprove(PersonnelNonCadreMonthlyAssessment result) {
+        List<BasePerformanceIndicatorCategory> indicatorCategoryyList = basePerformanceIndicatorCategoryService.selectBasePerformanceIndicatorCategoryListTree(new BasePerformanceIndicatorCategory());
+        // 红线指标
+        BasePerformanceIndicatorCategory redLineIndexCategory = indicatorCategoryyList.stream().filter(item -> StrUtil.equals("红线指标", item.getName())).findFirst().orElse(null);
+        List<BasePerformanceIndicatorCategory> redLineIndexCategoryChildren = (List<BasePerformanceIndicatorCategory>) redLineIndexCategory.getChildren();
+        List<String> redLineIndexCategoryCodeList = redLineIndexCategoryChildren.stream().map(BasePerformanceIndicatorCategory::getCode).collect(Collectors.toList());
+        List<PersonnelMonthlyAssessmentIndicatorDetail> redLineIndexAccordList = result.getPersonnelMonthlyAssessmentIndicatorDetailList().stream().filter(item -> redLineIndexCategoryCodeList.contains(item.getIndicatorCode())).collect(Collectors.toList());
+        Integer redLineIndexTriggerCount = redLineIndexAccordList.stream().map(PersonnelMonthlyAssessmentIndicatorDetail::getOccurCount).filter(ObjUtil::isNotNull).reduce(0, Integer::sum);
+        result.setRedLineIndexTriggerCount(redLineIndexTriggerCount);
+        result.setRedLineIndexAccordList(redLineIndexAccordList);
+        // 核心指标
+        BasePerformanceIndicatorCategory coreIndexCategory = indicatorCategoryyList.stream().filter(item -> StrUtil.equals("核心指标", item.getName())).findFirst().orElse(null);
+        List<BasePerformanceIndicatorCategory> coreIndexCategoryChildren = (List<BasePerformanceIndicatorCategory>) coreIndexCategory.getChildren();
+        List<String> coreIndexCategoryCodeList = coreIndexCategoryChildren.stream().map(BasePerformanceIndicatorCategory::getCode).collect(Collectors.toList());
+        List<PersonnelMonthlyAssessmentIndicatorDetail> coreIndexAccordList = result.getPersonnelMonthlyAssessmentIndicatorDetailList().stream().filter(item -> coreIndexCategoryCodeList.contains(item.getIndicatorCode())).collect(Collectors.toList());
+        BigDecimal coreIndexScore = coreIndexAccordList.stream().map(PersonnelMonthlyAssessmentIndicatorDetail::getScoreResult).filter(ObjUtil::isNotNull).reduce(BigDecimal.ZERO, BigDecimal::add);
+        result.setCoreIndexScore(coreIndexScore);
+        result.setCoreIndexAccordList(coreIndexAccordList);
+        // 其他指标
+        BasePerformanceIndicatorCategory otherIndexCategory = indicatorCategoryyList.stream().filter(item -> StrUtil.equals("其他指标", item.getName())).findFirst().orElse(null);
+        List<BasePerformanceIndicatorCategory> otherIndexCategoryChildren = (List<BasePerformanceIndicatorCategory>) otherIndexCategory.getChildren();
+        List<String> otherIndexCategoryCodeList = otherIndexCategoryChildren.stream().map(BasePerformanceIndicatorCategory::getCode).collect(Collectors.toList());
+        List<PersonnelMonthlyAssessmentIndicatorDetail> otherIndexAccordList = result.getPersonnelMonthlyAssessmentIndicatorDetailList().stream().filter(item -> otherIndexCategoryCodeList.contains(item.getIndicatorCode())).collect(Collectors.toList());
+        BigDecimal otherIndexScore = otherIndexAccordList.stream().map(PersonnelMonthlyAssessmentIndicatorDetail::getScoreResult).filter(ObjUtil::isNotNull).reduce(BigDecimal.ZERO, BigDecimal::add);
+        result.setOtherIndexScore(otherIndexScore);
+        result.setOtherIndexAccordList(otherIndexAccordList);
+        // 其他指标-安全
+        List<BasePerformanceIndicatorCategory> otherIndexSafetyCategory = otherIndexCategoryChildren.stream().filter(item -> StrUtil.equals("安全", item.getName())).collect(Collectors.toList());
+        List<String> otherIndexSafetyCategoryCodeList = otherIndexSafetyCategory.stream().map(BasePerformanceIndicatorCategory::getCode).collect(Collectors.toList());
+        // 其他指标-安全-仅含SOC/站品控检查扣分
+        List<PersonnelMonthlyAssessmentIndicatorDetail> otherIndexWithSocStationQcAccordList = result.getPersonnelMonthlyAssessmentIndicatorDetailList().stream()
+                .filter(item -> otherIndexSafetyCategoryCodeList.contains(item.getIndicatorCode()))
+                .filter(item -> StrUtil.equals(BasePerformanceIndicatorQcDeptTypeEnum.SOC.getCode(), item.getIndicatorCode()) || StrUtil.equals(BasePerformanceIndicatorQcDeptTypeEnum.STATION_QC.getCode(), item.getIndicatorCode()))
+                .filter(item -> StrUtil.equals(BasePerformanceIndicatorRewardPunishmentTypeTypeEnum.PUNISHMENT.getCode(), item.getRewardPunishmentType()))
+                .collect(Collectors.toList());
+        BigDecimal otherIndexSafetyScoreWithSocStationQcDeduction = otherIndexWithSocStationQcAccordList.stream().map(PersonnelMonthlyAssessmentIndicatorDetail::getScoreResult).filter(ObjUtil::isNotNull).reduce(BigDecimal.ZERO, BigDecimal::add);
+        result.setOtherIndexSafetyScoreWithSocStationQcDeduction(otherIndexSafetyScoreWithSocStationQcDeduction);
+        result.setOtherIndexSafetyScoreWithSocStationQcAccordList(otherIndexWithSocStationQcAccordList);
+        // 其他指标-安全-不仅含SOC/站品控检查扣分
+        List<PersonnelMonthlyAssessmentIndicatorDetail> otherIndexWithoutSocStationQcAccordList = result.getPersonnelMonthlyAssessmentIndicatorDetailList().stream()
+                .filter(item -> otherIndexSafetyCategoryCodeList.contains(item.getIndicatorCode()))
+                .filter(item -> !(StrUtil.equals(BasePerformanceIndicatorQcDeptTypeEnum.SOC.getCode(), item.getIndicatorCode()) || StrUtil.equals(BasePerformanceIndicatorQcDeptTypeEnum.STATION_QC.getCode(), item.getIndicatorCode())))
+                .filter(item -> StrUtil.equals(BasePerformanceIndicatorRewardPunishmentTypeTypeEnum.PUNISHMENT.getCode(), item.getRewardPunishmentType()))
+                .collect(Collectors.toList());
+        BigDecimal otherIndexSafetyScoreWithoutSocStationQcDeduction = otherIndexWithoutSocStationQcAccordList.stream().map(PersonnelMonthlyAssessmentIndicatorDetail::getScoreResult).filter(ObjUtil::isNotNull).reduce(BigDecimal.ZERO, BigDecimal::add);
+        result.setOtherIndexSafetyScoreWithoutSocStationQcDeduction(otherIndexSafetyScoreWithoutSocStationQcDeduction);
+        result.setOtherIndexSafetyScoreWithoutSocStationQcAccordList(otherIndexWithoutSocStationQcAccordList);
+        // 其他指标-非安全
+        List<BasePerformanceIndicatorCategory> otherIndexNonSafetyCategory = otherIndexCategoryChildren.stream().filter(item -> !StrUtil.equals("安全", item.getName())).collect(Collectors.toList());
+        List<String> otherIndexNonSafetyCategoryCodeList = otherIndexNonSafetyCategory.stream().map(BasePerformanceIndicatorCategory::getCode).collect(Collectors.toList());
+        List<PersonnelMonthlyAssessmentIndicatorDetail> otherIndexNonSafetyAccordList = result.getPersonnelMonthlyAssessmentIndicatorDetailList().stream()
+                .filter(item -> otherIndexNonSafetyCategoryCodeList.contains(item.getIndicatorCode()))
+                .filter(item -> StrUtil.equals(BasePerformanceIndicatorRewardPunishmentTypeTypeEnum.PUNISHMENT.getCode(), item.getRewardPunishmentType()))
+                .collect(Collectors.toList());
+        BigDecimal otherIndexNonSafetyDeduction = otherIndexNonSafetyAccordList.stream().map(PersonnelMonthlyAssessmentIndicatorDetail::getScoreResult).filter(ObjUtil::isNotNull).reduce(BigDecimal.ZERO, BigDecimal::add);
+        result.setOtherIndexNonSafetyDeduction(otherIndexNonSafetyDeduction);
+        result.setOtherIndexNonSafetyAccordList(otherIndexNonSafetyAccordList);
+        // 非核心安全+核心扣分
+        BigDecimal nonCoreSafetyPlusCoreDeduction = result.getOtherIndexSafetyScoreWithSocStationQcDeduction().add(result.getOtherIndexSafetyScoreWithoutSocStationQcDeduction()).add(result.getOtherIndexNonSafetyDeduction());
+        result.setNonCoreSafetyPlusCoreDeduction(nonCoreSafetyPlusCoreDeduction);
+        // 核心指标+其他指标-安全
+        List<String> socStationQcInvolvedCoreSafetyCodeList = new ArrayList<>();
+        socStationQcInvolvedCoreSafetyCodeList.addAll(coreIndexCategoryCodeList);
+        socStationQcInvolvedCoreSafetyCodeList.addAll(otherIndexSafetyCategoryCodeList);
+        List<PersonnelMonthlyAssessmentIndicatorDetail> socStationQcInvolvedCoreSafetyAccordList = result.getPersonnelMonthlyAssessmentIndicatorDetailList().stream()
+                .filter(item -> socStationQcInvolvedCoreSafetyCodeList.contains(item.getIndicatorCode()))
+                .filter(item -> !(StrUtil.equals(BasePerformanceIndicatorQcDeptTypeEnum.SOC.getCode(), item.getIndicatorCode()) || StrUtil.equals(BasePerformanceIndicatorQcDeptTypeEnum.STATION_QC.getCode(), item.getIndicatorCode())))
+                .filter(item -> StrUtil.equals(BasePerformanceIndicatorRewardPunishmentTypeTypeEnum.PUNISHMENT.getCode(), item.getRewardPunishmentType()))
+                .collect(Collectors.toList());
+        BigDecimal socStationQcInvolvedCoreSafetyDeduction = socStationQcInvolvedCoreSafetyAccordList.stream().map(PersonnelMonthlyAssessmentIndicatorDetail::getScoreResult).filter(ObjUtil::isNotNull).reduce(BigDecimal.ZERO, BigDecimal::add);
+        result.setSocStationQcInvolvedCoreSafetyDeduction(socStationQcInvolvedCoreSafetyDeduction);
+        result.setSocStationQcInvolvedCoreSafetyAccordList(socStationQcInvolvedCoreSafetyAccordList);
+        // 分管员工数量+扣分平均值
+        if (StrUtil.equals(RoleTypeEnum.kezhang.getCode(), result.getRoleKey())) {
+            PersonnelNonCadreMonthlyAssessment queryKeZhang = new PersonnelNonCadreMonthlyAssessment();
+            queryKeZhang.setAssessmentMonth(result.getAssessmentMonth());
+            queryKeZhang.setDeputySupervisorId(result.getUserId());
+            List<PersonnelNonCadreMonthlyAssessment> personnelNonCadreMonthlyAssessmentKeZhangList = personnelNonCadreMonthlyAssessmentMapper.selectPersonnelNonCadreMonthlyAssessmentList(queryKeZhang);
+            result.setInChargeEmployeeCount(personnelNonCadreMonthlyAssessmentKeZhangList.size());
+            result.setDeductionAverage(CollUtil.isEmpty(personnelNonCadreMonthlyAssessmentKeZhangList) ? BigDecimal.ZERO : result.getSocStationQcInvolvedCoreSafetyDeduction().divide(BigDecimal.valueOf(personnelNonCadreMonthlyAssessmentKeZhangList.size()), 2, RoundingMode.HALF_UP));
+        }
+        // 总分
+        BigDecimal totalScore = BASE_SCORE.add(result.getCoreIndexScore()).add(result.getOtherIndexScore());
+        if (result.getRedLineIndexTriggerCount() > 0) {
+            totalScore = RED_LINE_SCORE;
+        }
+        result.setTotalScore(totalScore);
+        // 奖励明细+惩罚明细
+        List<String> coreAndOtherCategoryCodeList = new ArrayList<>();
+        coreAndOtherCategoryCodeList.addAll(coreIndexCategoryCodeList);
+        coreAndOtherCategoryCodeList.addAll(otherIndexCategoryCodeList);
+        List<PersonnelMonthlyAssessmentIndicatorDetail> rewardAccordList = result.getPersonnelMonthlyAssessmentIndicatorDetailList().stream()
+                .filter(item -> coreAndOtherCategoryCodeList.contains(item.getIndicatorCode()))
+                .filter(item -> StrUtil.equals(BasePerformanceIndicatorRewardPunishmentTypeTypeEnum.REWARD.getCode(), item.getRewardPunishmentType()))
+                .collect(Collectors.toList());
+        result.setRewardAccordList(rewardAccordList);
+        List<PersonnelMonthlyAssessmentIndicatorDetail> punishmentAccordList = result.getPersonnelMonthlyAssessmentIndicatorDetailList().stream()
+                .filter(item -> coreAndOtherCategoryCodeList.contains(item.getIndicatorCode()))
+                .filter(item -> StrUtil.equals(BasePerformanceIndicatorRewardPunishmentTypeTypeEnum.PUNISHMENT.getCode(), item.getRewardPunishmentType()))
+                .collect(Collectors.toList());
+        punishmentAccordList.addAll(result.getRedLineIndexAccordList());
+        result.setPunishmentAccordList(punishmentAccordList);
+        // 奖励金额+惩罚金额
+        BigDecimal rewardAmount = result.getPersonnelMonthlyAssessmentIndicatorDetailList().stream()
+                .filter(item -> StrUtil.equals(BasePerformanceIndicatorRewardPunishmentTypeTypeEnum.REWARD.getCode(), item.getRewardPunishmentType()))
+                .map(PersonnelMonthlyAssessmentIndicatorDetail::getAmountResult)
+                .filter(ObjUtil::isNotNull)
+                .reduce(BigDecimal.ZERO, BigDecimal::add);
+        result.setRewardAmount(rewardAmount);
+        BigDecimal punishmentAmount = result.getPersonnelMonthlyAssessmentIndicatorDetailList().stream()
+                .filter(item -> StrUtil.equals(BasePerformanceIndicatorRewardPunishmentTypeTypeEnum.PUNISHMENT.getCode(), item.getRewardPunishmentType()))
+                .map(PersonnelMonthlyAssessmentIndicatorDetail::getAmountResult)
+                .filter(ObjUtil::isNotNull)
+                .reduce(BigDecimal.ZERO, BigDecimal::add);
+        result.setPunishmentAmount(punishmentAmount);
+        // 考核结果+是否豁免+应用方式
+        if (StrUtil.equals(RoleTypeEnum.SecurityCheck.getCode(), result.getRoleKey())) {
+            doSecurityCheck(result);
+        } else if (StrUtil.equals(RoleTypeEnum.banzuzhang.getCode(), result.getRoleKey())) {
+            doTeamLeader(result);
+        } else if (StrUtil.equals(RoleTypeEnum.kezhang.getCode(), result.getRoleKey())) {
+            doSupervisor(result);
+        }
+    }
+
+    /**
+     * 安检员考核
+     *
+     * @param result
+     */
+    private void doSecurityCheck(PersonnelNonCadreMonthlyAssessment result) {
+        // 考核结果
+        PersonnelNonCadreMonthlyAssessment assessmentTeamQuery = new PersonnelNonCadreMonthlyAssessment();
+        assessmentTeamQuery.setAssessmentMonth(result.getAssessmentMonth());
+        assessmentTeamQuery.setAssessmentTeam(result.getAssessmentTeam());
+        List<PersonnelNonCadreMonthlyAssessment> assessmentTeamList = personnelNonCadreMonthlyAssessmentMapper.selectPersonnelNonCadreMonthlyAssessmentList(assessmentTeamQuery);
+        boolean assessmentResultRuleOne = isInBottom5Percent(result, assessmentTeamList, PersonnelNonCadreMonthlyAssessment::getTotalScore);
+        boolean assessmentResultRuleTwo = result.getTotalScore().compareTo(BigDecimal.valueOf(75)) < 0;
+        boolean assessmentResultRuleThree = result.getNonCoreSafetyPlusCoreDeduction().abs().compareTo(BigDecimal.valueOf(10)) >= 0;
+        boolean assessmentResultRuleFour = result.getRedLineIndexTriggerCount() > 0 || result.getTotalScore().compareTo(BigDecimal.valueOf(70)) < 0;
+        List<String> assessmentResultRuleList = new ArrayList<>();
+        if (assessmentResultRuleOne) {
+            result.setAssessmentResult(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_ONE.getName());
+            assessmentResultRuleList.add(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_ONE.getDesc());
+        }
+        if (assessmentResultRuleTwo) {
+            result.setAssessmentResult(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_TWO.getName());
+            assessmentResultRuleList.add(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_TWO.getDesc());
+        }
+        if (assessmentResultRuleThree) {
+            result.setAssessmentResult(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_THREE.getName());
+            assessmentResultRuleList.add(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_THREE.getDesc());
+        }
+        if (assessmentResultRuleFour) {
+            result.setAssessmentResult(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_FOUR.getName());
+            assessmentResultRuleList.add(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_FOUR.getDesc());
+        }
+        if (CollUtil.isNotEmpty(assessmentResultRuleList)) {
+            result.setAssessmentResultRemark(String.join(";", assessmentResultRuleList));
+        }
+        // 是否豁免
+        if (StrUtil.equals(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_ONE.getName(), result.getAssessmentResult())
+                || StrUtil.equals(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_TWO.getName(), result.getAssessmentResult())
+                || StrUtil.equals(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_THREE.getName(), result.getAssessmentResult())
+                || StrUtil.equals(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_FOUR.getName(), result.getAssessmentResult())) {
+            boolean exemptionRuleOne = CollUtil.isEmpty(result.getPunishmentAccordList());
+            boolean exemptionRuleTwo = result.getPunishmentAccordList().stream()
+                    .filter(item -> !(StrUtil.equals(BasePerformanceIndicatorLeaveTypeEnum.PERSONAL_LEAVE.getCode(), item.getLeaveType())
+                            || StrUtil.equals(BasePerformanceIndicatorLeaveTypeEnum.SICK_LEAVE.getCode(), item.getLeaveType())
+                            || StrUtil.equals(BasePerformanceIndicatorLeaveTypeEnum.PERSONAL_SICK_LEAVE.getCode(), item.getLeaveType())))
+                    .count() == 0;
+            if (exemptionRuleOne) {
+                result.setExemption(BasePerformanceIndicatorExemptionRuleEnum.EXEMPTION_RULE_ONE.getName());
+                result.setExemptionReasonRemark(BasePerformanceIndicatorExemptionRuleEnum.EXEMPTION_RULE_ONE.getDesc());
+                result.setAssessmentResult(null);
+            } else if (exemptionRuleTwo) {
+                result.setExemption(BasePerformanceIndicatorExemptionRuleEnum.EXEMPTION_RULE_TWO.getName());
+                result.setExemptionReasonRemark(BasePerformanceIndicatorExemptionRuleEnum.EXEMPTION_RULE_TWO.getDesc());
+                result.setAssessmentResult(null);
+            }
+        }
+        // 应用方式
+        boolean applicationMethodRuleOne = StrUtil.equals(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_ONE.getName(), result.getAssessmentResult());
+        boolean applicationMethodRuleTwo1 = StrUtil.equals(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_TWO.getName(), result.getAssessmentResult());
+        boolean applicationMethodRuleTwo2_1 = StrUtil.equals(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_ONE.getName(), result.getAssessmentResult());
+        String previousMonth = MonthUtils.getPreviousMonth(result.getAssessmentMonth());
+        PersonnelNonCadreMonthlyAssessment previousMonthQuery = new PersonnelNonCadreMonthlyAssessment();
+        previousMonthQuery.setUserId(result.getUserId());
+        previousMonthQuery.setAssessmentMonth(previousMonth);
+        previousMonthQuery.setAssessmentResult(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_ONE.getName());
+        List<PersonnelNonCadreMonthlyAssessment> previousMonthList = personnelNonCadreMonthlyAssessmentMapper.selectPersonnelNonCadreMonthlyAssessmentList(previousMonthQuery);
+        boolean applicationMethodRuleTwo2_2 = CollUtil.isNotEmpty(previousMonthList);
+        boolean applicationMethodRuleTwo2 = applicationMethodRuleTwo2_1 && applicationMethodRuleTwo2_2;
+        boolean applicationMethodRuleTwo = applicationMethodRuleTwo1 || applicationMethodRuleTwo2;
+        boolean applicationMethodRuleThree = false;
+        if (StrUtil.equals(AssessmentTeamEnum.SECURITY_INSPECTOR_AND_X_RAY_PASSENGER_INSPECTION_STAFF.getCode(), result.getAssessmentTeam())) {
+            MonthUtils.MonthRange last3Months = MonthUtils.getLast3MonthsIncludeCurrent(result.getAssessmentMonth());
+            PersonnelNonCadreMonthlyAssessment last3MonthsQuery = new PersonnelNonCadreMonthlyAssessment();
+            last3MonthsQuery.setUserId(result.getUserId());
+            last3MonthsQuery.setAssessmentMonthStart(last3Months.getStartMonth());
+            last3MonthsQuery.setAssessmentMonthEnd(last3Months.getEndMonth());
+            last3MonthsQuery.setAssessmentResult(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_ONE.getName());
+            List<PersonnelNonCadreMonthlyAssessment> last3MonthsList = personnelNonCadreMonthlyAssessmentMapper.selectPersonnelNonCadreMonthlyAssessmentList(last3MonthsQuery);
+            boolean applicationMethodRuleThree1 = last3MonthsList.size() >= 3;
+            MonthUtils.MonthRange currentYearMonths = MonthUtils.getCurrentYearToMonth(result.getAssessmentMonth());
+            PersonnelNonCadreMonthlyAssessment currentYearMonthsResultRuleQuery = new PersonnelNonCadreMonthlyAssessment();
+            currentYearMonthsResultRuleQuery.setUserId(result.getUserId());
+            currentYearMonthsResultRuleQuery.setAssessmentMonthStart(currentYearMonths.getStartMonth());
+            currentYearMonthsResultRuleQuery.setAssessmentMonthEnd(currentYearMonths.getEndMonth());
+            currentYearMonthsResultRuleQuery.setAssessmentResult(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_ONE.getName());
+            List<PersonnelNonCadreMonthlyAssessment> currentYearMonthsResultRuleList = personnelNonCadreMonthlyAssessmentMapper.selectPersonnelNonCadreMonthlyAssessmentList(currentYearMonthsResultRuleQuery);
+            boolean applicationMethodRuleThree2 = currentYearMonthsResultRuleList.size() >= 4;
+            MonthUtils.MonthRange last12Months = MonthUtils.getLast12MonthsIncludeCurrent(result.getAssessmentMonth());
+            PersonnelNonCadreMonthlyAssessment last12MonthsQuery = new PersonnelNonCadreMonthlyAssessment();
+            last12MonthsQuery.setUserId(result.getUserId());
+            last12MonthsQuery.setAssessmentMonthStart(last12Months.getStartMonth());
+            last12MonthsQuery.setAssessmentMonthEnd(last12Months.getEndMonth());
+            last12MonthsQuery.setAssessmentResult(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_TWO.getName());
+            List<PersonnelNonCadreMonthlyAssessment> last12MonthsList = personnelNonCadreMonthlyAssessmentMapper.selectPersonnelNonCadreMonthlyAssessmentList(last12MonthsQuery);
+            boolean applicationMethodRuleThree3 = last12MonthsList.size() >= 2;
+            applicationMethodRuleThree = applicationMethodRuleThree1 || applicationMethodRuleThree2 || applicationMethodRuleThree3;
+        }
+        boolean applicationMethodRuleFour = false;
+        MonthUtils.MonthRange currentYearMonthsMethod = MonthUtils.getCurrentYearToMonth(result.getAssessmentMonth());
+        PersonnelNonCadreMonthlyAssessment currentYearMonthsMethodQuery = new PersonnelNonCadreMonthlyAssessment();
+        currentYearMonthsMethodQuery.setUserId(result.getUserId());
+        currentYearMonthsMethodQuery.setAssessmentMonthStart(currentYearMonthsMethod.getStartMonth());
+        currentYearMonthsMethodQuery.setAssessmentMonthEnd(currentYearMonthsMethod.getEndMonth());
+        currentYearMonthsMethodQuery.setApplicationMethod(BasePerformanceIndicatorApplicationMethodRuleEnum.APPLICATION_METHOD_RULE_TWO.getName());
+        List<PersonnelNonCadreMonthlyAssessment> currentYearMonthsMethodList = personnelNonCadreMonthlyAssessmentMapper.selectPersonnelNonCadreMonthlyAssessmentList(currentYearMonthsMethodQuery);
+        String maxAssessmentMonth = currentYearMonthsMethodList.stream().map(PersonnelNonCadreMonthlyAssessment::getAssessmentMonth).max(String::compareTo).orElse(null);
+        if (ObjUtil.isNotNull(maxAssessmentMonth) && !StrUtil.equals(maxAssessmentMonth, result.getAssessmentMonth())) {
+            PersonnelNonCadreMonthlyAssessment remainingMonthsOfYearQuery = new PersonnelNonCadreMonthlyAssessment();
+            remainingMonthsOfYearQuery.setUserId(result.getUserId());
+            remainingMonthsOfYearQuery.setAssessmentMonthStart(MonthUtils.getNextMonth(maxAssessmentMonth));
+            remainingMonthsOfYearQuery.setAssessmentMonthEnd(result.getAssessmentMonth());
+            List<PersonnelNonCadreMonthlyAssessment> remainingMonthsOfYearQueryList = personnelNonCadreMonthlyAssessmentMapper.selectPersonnelNonCadreMonthlyAssessmentList(remainingMonthsOfYearQuery);
+            applicationMethodRuleFour = remainingMonthsOfYearQueryList.stream().filter(item -> StrUtil.equals(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_ONE.getName(), item.getAssessmentResult()) || StrUtil.equals(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_TWO.getName(), item.getAssessmentResult())).count() > 0;
+        }
+        if (applicationMethodRuleOne) {
+            result.setApplicationMethod(BasePerformanceIndicatorApplicationMethodRuleEnum.APPLICATION_METHOD_RULE_ONE.getName());
+            result.setApplicationMethodRemark(BasePerformanceIndicatorApplicationMethodRuleEnum.APPLICATION_METHOD_RULE_ONE.getDesc());
+        }
+        if (applicationMethodRuleTwo) {
+            result.setApplicationMethod(BasePerformanceIndicatorApplicationMethodRuleEnum.APPLICATION_METHOD_RULE_TWO.getName());
+            result.setApplicationMethodRemark(BasePerformanceIndicatorApplicationMethodRuleEnum.APPLICATION_METHOD_RULE_TWO.getDesc());
+        }
+        if (applicationMethodRuleThree) {
+            result.setApplicationMethod(BasePerformanceIndicatorApplicationMethodRuleEnum.APPLICATION_METHOD_RULE_THREE.getName());
+            result.setApplicationMethodRemark(BasePerformanceIndicatorApplicationMethodRuleEnum.APPLICATION_METHOD_RULE_THREE.getDesc());
+        }
+        if (applicationMethodRuleFour) {
+            result.setApplicationMethod(BasePerformanceIndicatorApplicationMethodRuleEnum.APPLICATION_METHOD_RULE_FOUR.getName());
+            result.setApplicationMethodRemark(BasePerformanceIndicatorApplicationMethodRuleEnum.APPLICATION_METHOD_RULE_FOUR.getDesc());
+        }
+    }
+
+    /**
+     * 班组长考核
+     *
+     * @param result
+     */
+    private void doTeamLeader(PersonnelNonCadreMonthlyAssessment result) {
+        // 考核结果
+        PersonnelNonCadreMonthlyAssessment assessmentTeamQuery = new PersonnelNonCadreMonthlyAssessment();
+        assessmentTeamQuery.setAssessmentMonth(result.getAssessmentMonth());
+        assessmentTeamQuery.setAssessmentTeam(result.getAssessmentTeam());
+        List<PersonnelNonCadreMonthlyAssessment> assessmentTeamList = personnelNonCadreMonthlyAssessmentMapper.selectPersonnelNonCadreMonthlyAssessmentList(assessmentTeamQuery);
+        boolean assessmentResultRuleOne = isInBottom5Percent(result, assessmentTeamList, PersonnelNonCadreMonthlyAssessment::getTotalScore);
+        boolean assessmentResultRuleTwo = result.getTotalScore().compareTo(BigDecimal.valueOf(75)) < 0;
+        boolean assessmentResultRuleThree = result.getNonCoreSafetyPlusCoreDeduction().abs().compareTo(BigDecimal.valueOf(10)) >= 0;
+        boolean assessmentResultRuleFour = result.getRedLineIndexTriggerCount() > 0 || result.getTotalScore().compareTo(BigDecimal.valueOf(70)) < 0;
+        SysUser sysUser = sysUserService.selectUserById(result.getUserId());
+        List<String> roleKeyList = Collections.singletonList(RoleTypeEnum.SecurityCheck.getCode());
+        List<SysUser> sysUserList = sysUserService.selectUserListByRoleKeyAndDeptId(roleKeyList, sysUser.getDeptId());
+        List<Long> userIdList = sysUserList.stream().map(SysUser::getUserId).collect(Collectors.toList());
+        PersonnelNonCadreMonthlyAssessment currentMonthQuery = new PersonnelNonCadreMonthlyAssessment();
+        currentMonthQuery.setAssessmentMonth(result.getAssessmentMonth());
+        currentMonthQuery.setAssessmentResult(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_TWO.getName());
+        List<PersonnelNonCadreMonthlyAssessment> currentMonthList = personnelNonCadreMonthlyAssessmentMapper.selectPersonnelNonCadreMonthlyAssessmentList(currentMonthQuery);
+        boolean assessmentResultRuleFive = currentMonthList.stream().filter(item -> userIdList.contains(item.getUserId())).count() >= 2;
+        MonthUtils.MonthRange last12MonthsCurrent = MonthUtils.getLast12MonthsIncludeCurrent(result.getAssessmentMonth());
+        PersonnelNonCadreMonthlyAssessment last12MonthsResultRuleQuery = new PersonnelNonCadreMonthlyAssessment();
+        last12MonthsResultRuleQuery.setUserId(result.getUserId());
+        last12MonthsResultRuleQuery.setAssessmentMonthStart(last12MonthsCurrent.getStartMonth());
+        last12MonthsResultRuleQuery.setAssessmentMonthEnd(last12MonthsCurrent.getEndMonth());
+        last12MonthsResultRuleQuery.setAssessmentResult(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_TWO.getName());
+        List<PersonnelNonCadreMonthlyAssessment> last12MonthsCurrentList = personnelNonCadreMonthlyAssessmentMapper.selectPersonnelNonCadreMonthlyAssessmentList(last12MonthsResultRuleQuery);
+        boolean assessmentResultRuleSix = last12MonthsCurrentList.size() >= 2;
+        List<String> assessmentResultRuleList = new ArrayList<>();
+        if (assessmentResultRuleOne) {
+            result.setAssessmentResult(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_ONE.getName());
+            assessmentResultRuleList.add(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_ONE.getDesc());
+        }
+        if (assessmentResultRuleTwo) {
+            result.setAssessmentResult(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_TWO.getName());
+            assessmentResultRuleList.add(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_TWO.getDesc());
+        }
+        if (assessmentResultRuleThree) {
+            result.setAssessmentResult(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_THREE.getName());
+            assessmentResultRuleList.add(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_THREE.getDesc());
+        }
+        if (assessmentResultRuleFour) {
+            result.setAssessmentResult(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_FOUR.getName());
+            assessmentResultRuleList.add(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_FOUR.getDesc());
+        }
+        if (assessmentResultRuleFive) {
+            result.setAssessmentResult(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_FIVE.getName());
+            assessmentResultRuleList.add(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_FIVE.getDesc());
+        }
+        if (assessmentResultRuleSix) {
+            result.setAssessmentResult(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_SIX.getName());
+            assessmentResultRuleList.add(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_SIX.getDesc());
+        }
+        if (CollUtil.isNotEmpty(assessmentResultRuleList)) {
+            result.setAssessmentResultRemark(String.join(";", assessmentResultRuleList));
+        }
+        // 是否豁免
+        if (StrUtil.equals(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_ONE.getName(), result.getAssessmentResult())
+                || StrUtil.equals(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_TWO.getName(), result.getAssessmentResult())
+                || StrUtil.equals(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_THREE.getName(), result.getAssessmentResult())
+                || StrUtil.equals(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_FOUR.getName(), result.getAssessmentResult())) {
+            boolean exemptionRuleOne = CollUtil.isEmpty(result.getPunishmentAccordList());
+            boolean exemptionRuleTwo = result.getPunishmentAccordList().stream()
+                    .filter(item -> !(StrUtil.equals(BasePerformanceIndicatorLeaveTypeEnum.PERSONAL_LEAVE.getCode(), item.getLeaveType())
+                            || StrUtil.equals(BasePerformanceIndicatorLeaveTypeEnum.SICK_LEAVE.getCode(), item.getLeaveType())
+                            || StrUtil.equals(BasePerformanceIndicatorLeaveTypeEnum.PERSONAL_SICK_LEAVE.getCode(), item.getLeaveType())))
+                    .count() == 0;
+            if (exemptionRuleOne) {
+                result.setExemption(BasePerformanceIndicatorExemptionRuleEnum.EXEMPTION_RULE_ONE.getName());
+                result.setExemptionReasonRemark(BasePerformanceIndicatorExemptionRuleEnum.EXEMPTION_RULE_ONE.getDesc());
+                result.setAssessmentResult(null);
+            } else if (exemptionRuleTwo) {
+                result.setExemption(BasePerformanceIndicatorExemptionRuleEnum.EXEMPTION_RULE_TWO.getName());
+                result.setExemptionReasonRemark(BasePerformanceIndicatorExemptionRuleEnum.EXEMPTION_RULE_TWO.getDesc());
+                result.setAssessmentResult(null);
+            }
+        }
+        // 应用方式
+        boolean applicationMethodRuleOne = StrUtil.equals(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_ONE.getName(), result.getAssessmentResult());
+        boolean applicationMethodRuleTwo1 = StrUtil.equals(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_TWO.getName(), result.getAssessmentResult());
+        boolean applicationMethodRuleTwo2_1 = StrUtil.equals(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_ONE.getName(), result.getAssessmentResult());
+        String previousMonth = MonthUtils.getPreviousMonth(result.getAssessmentMonth());
+        PersonnelNonCadreMonthlyAssessment previousMonthQuery = new PersonnelNonCadreMonthlyAssessment();
+        previousMonthQuery.setUserId(result.getUserId());
+        previousMonthQuery.setAssessmentMonth(previousMonth);
+        previousMonthQuery.setAssessmentResult(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_ONE.getName());
+        List<PersonnelNonCadreMonthlyAssessment> previousMonthList = personnelNonCadreMonthlyAssessmentMapper.selectPersonnelNonCadreMonthlyAssessmentList(previousMonthQuery);
+        boolean applicationMethodRuleTwo2_2 = CollUtil.isNotEmpty(previousMonthList);
+        boolean applicationMethodRuleTwo2 = applicationMethodRuleTwo2_1 && applicationMethodRuleTwo2_2;
+        boolean applicationMethodRuleTwo = applicationMethodRuleTwo1 || applicationMethodRuleTwo2;
+        boolean applicationMethodRuleThree = false;
+        if (StrUtil.equals(AssessmentTeamEnum.SECURITY_INSPECTOR_AND_X_RAY_PASSENGER_INSPECTION_STAFF.getCode(), result.getAssessmentTeam())) {
+            MonthUtils.MonthRange last3Months = MonthUtils.getLast3MonthsIncludeCurrent(result.getAssessmentMonth());
+            PersonnelNonCadreMonthlyAssessment last3MonthsQuery = new PersonnelNonCadreMonthlyAssessment();
+            last3MonthsQuery.setUserId(result.getUserId());
+            last3MonthsQuery.setAssessmentMonthStart(last3Months.getStartMonth());
+            last3MonthsQuery.setAssessmentMonthEnd(last3Months.getEndMonth());
+            last3MonthsQuery.setAssessmentResult(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_ONE.getName());
+            List<PersonnelNonCadreMonthlyAssessment> last3MonthsList = personnelNonCadreMonthlyAssessmentMapper.selectPersonnelNonCadreMonthlyAssessmentList(last3MonthsQuery);
+            boolean applicationMethodRuleThree1 = last3MonthsList.size() >= 3;
+            MonthUtils.MonthRange currentYearMonths = MonthUtils.getCurrentYearToMonth(result.getAssessmentMonth());
+            PersonnelNonCadreMonthlyAssessment currentYearMonthsQuery = new PersonnelNonCadreMonthlyAssessment();
+            currentYearMonthsQuery.setUserId(result.getUserId());
+            currentYearMonthsQuery.setAssessmentMonthStart(currentYearMonths.getStartMonth());
+            currentYearMonthsQuery.setAssessmentMonthEnd(currentYearMonths.getEndMonth());
+            currentYearMonthsQuery.setAssessmentResult(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_ONE.getName());
+            List<PersonnelNonCadreMonthlyAssessment> currentYearMonthsList = personnelNonCadreMonthlyAssessmentMapper.selectPersonnelNonCadreMonthlyAssessmentList(currentYearMonthsQuery);
+            boolean applicationMethodRuleThree2 = currentYearMonthsList.size() >= 4;
+            MonthUtils.MonthRange last12Months = MonthUtils.getLast12MonthsIncludeCurrent(result.getAssessmentMonth());
+            PersonnelNonCadreMonthlyAssessment last12MonthsQuery = new PersonnelNonCadreMonthlyAssessment();
+            last12MonthsQuery.setUserId(result.getUserId());
+            last12MonthsQuery.setAssessmentMonthStart(last12Months.getStartMonth());
+            last12MonthsQuery.setAssessmentMonthEnd(last12Months.getEndMonth());
+            last12MonthsQuery.setAssessmentResult(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_TWO.getName());
+            List<PersonnelNonCadreMonthlyAssessment> last12MonthsList = personnelNonCadreMonthlyAssessmentMapper.selectPersonnelNonCadreMonthlyAssessmentList(last12MonthsQuery);
+            boolean applicationMethodRuleThree3 = last12MonthsList.size() >= 2;
+            applicationMethodRuleThree = applicationMethodRuleThree1 || applicationMethodRuleThree2 || applicationMethodRuleThree3;
+        }
+        boolean applicationMethodRuleFour = false;
+        MonthUtils.MonthRange currentYearMonthsTraining = MonthUtils.getCurrentYearToMonth(result.getAssessmentMonth());
+        PersonnelNonCadreMonthlyAssessment currentYearMonthsTrainingQuery = new PersonnelNonCadreMonthlyAssessment();
+        currentYearMonthsTrainingQuery.setUserId(result.getUserId());
+        currentYearMonthsTrainingQuery.setAssessmentMonthStart(currentYearMonthsTraining.getStartMonth());
+        currentYearMonthsTrainingQuery.setAssessmentMonthEnd(currentYearMonthsTraining.getEndMonth());
+        currentYearMonthsTrainingQuery.setApplicationMethod(BasePerformanceIndicatorApplicationMethodRuleEnum.APPLICATION_METHOD_RULE_TWO.getName());
+        List<PersonnelNonCadreMonthlyAssessment> currentYearMonthsTrainingList = personnelNonCadreMonthlyAssessmentMapper.selectPersonnelNonCadreMonthlyAssessmentList(currentYearMonthsTrainingQuery);
+        String maxAssessmentMonth = currentYearMonthsTrainingList.stream().map(PersonnelNonCadreMonthlyAssessment::getAssessmentMonth).max(String::compareTo).orElse(null);
+        if (ObjUtil.isNotNull(maxAssessmentMonth) && !StrUtil.equals(maxAssessmentMonth, result.getAssessmentMonth())) {
+            PersonnelNonCadreMonthlyAssessment remainingMonthsOfYearQuery = new PersonnelNonCadreMonthlyAssessment();
+            remainingMonthsOfYearQuery.setUserId(result.getUserId());
+            remainingMonthsOfYearQuery.setAssessmentMonthStart(MonthUtils.getNextMonth(maxAssessmentMonth));
+            remainingMonthsOfYearQuery.setAssessmentMonthEnd(result.getAssessmentMonth());
+            List<PersonnelNonCadreMonthlyAssessment> remainingMonthsOfYearQueryList = personnelNonCadreMonthlyAssessmentMapper.selectPersonnelNonCadreMonthlyAssessmentList(remainingMonthsOfYearQuery);
+            applicationMethodRuleFour = remainingMonthsOfYearQueryList.stream().filter(item -> StrUtil.equals(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_ONE.getName(), item.getAssessmentResult()) || StrUtil.equals(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_TWO.getName(), item.getAssessmentResult())).count() > 0;
+        }
+        if (applicationMethodRuleOne) {
+            result.setApplicationMethod(BasePerformanceIndicatorApplicationMethodRuleEnum.APPLICATION_METHOD_RULE_ONE.getName());
+            result.setApplicationMethodRemark(BasePerformanceIndicatorApplicationMethodRuleEnum.APPLICATION_METHOD_RULE_ONE.getDesc());
+        }
+        if (applicationMethodRuleTwo) {
+            result.setApplicationMethod(BasePerformanceIndicatorApplicationMethodRuleEnum.APPLICATION_METHOD_RULE_TWO.getName());
+            result.setApplicationMethodRemark(BasePerformanceIndicatorApplicationMethodRuleEnum.APPLICATION_METHOD_RULE_TWO.getDesc());
+        }
+        if (applicationMethodRuleThree) {
+            result.setApplicationMethod(BasePerformanceIndicatorApplicationMethodRuleEnum.APPLICATION_METHOD_RULE_THREE.getName());
+            result.setApplicationMethodRemark(BasePerformanceIndicatorApplicationMethodRuleEnum.APPLICATION_METHOD_RULE_THREE.getDesc());
+        }
+        if (applicationMethodRuleFour) {
+            result.setApplicationMethod(BasePerformanceIndicatorApplicationMethodRuleEnum.APPLICATION_METHOD_RULE_FOUR.getName());
+            result.setApplicationMethodRemark(BasePerformanceIndicatorApplicationMethodRuleEnum.APPLICATION_METHOD_RULE_FOUR.getDesc());
+        }
+    }
+
+    /**
+     * 主管考核
+     *
+     * @param result
+     */
+    private void doSupervisor(PersonnelNonCadreMonthlyAssessment result) {
+        // 考核结果
+        PersonnelNonCadreMonthlyAssessment assessmentTeamQuery = new PersonnelNonCadreMonthlyAssessment();
+        assessmentTeamQuery.setAssessmentMonth(result.getAssessmentMonth());
+        assessmentTeamQuery.setAssessmentTeam(result.getAssessmentTeam());
+        List<PersonnelNonCadreMonthlyAssessment> assessmentTeamList = personnelNonCadreMonthlyAssessmentMapper.selectPersonnelNonCadreMonthlyAssessmentList(assessmentTeamQuery);
+        boolean assessmentResultRuleOne = isInBottom5Percent(result, assessmentTeamList, PersonnelNonCadreMonthlyAssessment::getTotalScore);
+        boolean assessmentResultRuleSeven = isInBottom1Ranking(result, assessmentTeamList, PersonnelNonCadreMonthlyAssessment::getTotalScore);
+        boolean assessmentResultRuleTwo = result.getTotalScore().compareTo(BigDecimal.valueOf(75)) < 0;
+        boolean assessmentResultRuleThree = result.getNonCoreSafetyPlusCoreDeduction().abs().compareTo(BigDecimal.valueOf(10)) >= 0;
+        boolean assessmentResultRuleFour = result.getRedLineIndexTriggerCount() > 0 || result.getTotalScore().compareTo(BigDecimal.valueOf(70)) < 0;
+        List<String> assessmentResultRuleList = new ArrayList<>();
+        if (assessmentResultRuleOne) {
+            result.setAssessmentResult(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_ONE.getName());
+            assessmentResultRuleList.add(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_ONE.getDesc());
+        }
+        if (assessmentResultRuleSeven) {
+            result.setAssessmentResult(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_SEVEN.getName());
+            assessmentResultRuleList.add(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_SEVEN.getDesc());
+        }
+        if (assessmentResultRuleTwo) {
+            result.setAssessmentResult(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_TWO.getName());
+            assessmentResultRuleList.add(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_TWO.getDesc());
+        }
+        if (assessmentResultRuleThree) {
+            result.setAssessmentResult(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_THREE.getName());
+            assessmentResultRuleList.add(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_THREE.getDesc());
+        }
+        if (assessmentResultRuleFour) {
+            result.setAssessmentResult(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_FOUR.getName());
+            assessmentResultRuleList.add(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_FOUR.getDesc());
+        }
+        if (CollUtil.isNotEmpty(assessmentResultRuleList)) {
+            result.setAssessmentResultRemark(String.join(";", assessmentResultRuleList));
+        }
+        // 是否豁免
+        if (StrUtil.equals(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_ONE.getName(), result.getAssessmentResult())
+                || StrUtil.equals(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_TWO.getName(), result.getAssessmentResult())
+                || StrUtil.equals(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_THREE.getName(), result.getAssessmentResult())
+                || StrUtil.equals(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_FOUR.getName(), result.getAssessmentResult())
+                || StrUtil.equals(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_SEVEN.getName(), result.getAssessmentResult())) {
+            if (!result.getAssessmentResultRemark().contains(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_SEVEN.getDesc())) {
+                boolean exemptionRuleOne = CollUtil.isEmpty(result.getPunishmentAccordList());
+                boolean exemptionRuleTwo = result.getPunishmentAccordList().stream()
+                        .filter(item -> !(StrUtil.equals(BasePerformanceIndicatorLeaveTypeEnum.PERSONAL_LEAVE.getCode(), item.getLeaveType())
+                                || StrUtil.equals(BasePerformanceIndicatorLeaveTypeEnum.SICK_LEAVE.getCode(), item.getLeaveType())
+                                || StrUtil.equals(BasePerformanceIndicatorLeaveTypeEnum.PERSONAL_SICK_LEAVE.getCode(), item.getLeaveType())))
+                        .count() == 0;
+                if (exemptionRuleOne) {
+                    result.setExemption(BasePerformanceIndicatorExemptionRuleEnum.EXEMPTION_RULE_ONE.getName());
+                    result.setExemptionReasonRemark(BasePerformanceIndicatorExemptionRuleEnum.EXEMPTION_RULE_ONE.getDesc());
+                    result.setAssessmentResult(null);
+                } else if (exemptionRuleTwo) {
+                    result.setExemption(BasePerformanceIndicatorExemptionRuleEnum.EXEMPTION_RULE_TWO.getName());
+                    result.setExemptionReasonRemark(BasePerformanceIndicatorExemptionRuleEnum.EXEMPTION_RULE_TWO.getDesc());
+                    result.setAssessmentResult(null);
+                }
+            }
+        }
+        // 应用方式
+        boolean applicationMethodRuleOne = StrUtil.equals(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_ONE.getName(), result.getAssessmentResult());
+        boolean applicationMethodRuleFive = false;
+        MonthUtils.MonthRange last12Months = MonthUtils.getLast12MonthsIncludeCurrent(result.getAssessmentMonth());
+        PersonnelNonCadreMonthlyAssessment last12MonthsQuery = new PersonnelNonCadreMonthlyAssessment();
+        last12MonthsQuery.setUserId(result.getUserId());
+        last12MonthsQuery.setAssessmentMonthStart(last12Months.getStartMonth());
+        last12MonthsQuery.setAssessmentMonthEnd(last12Months.getEndMonth());
+        last12MonthsQuery.setApplicationMethod(BasePerformanceIndicatorApplicationMethodRuleEnum.APPLICATION_METHOD_RULE_ONE.getName());
+        List<PersonnelNonCadreMonthlyAssessment> last12MonthsList = personnelNonCadreMonthlyAssessmentMapper.selectPersonnelNonCadreMonthlyAssessmentList(last12MonthsQuery);
+        String last12MonthsMaxAssessmentMonth = last12MonthsList.stream().map(PersonnelNonCadreMonthlyAssessment::getAssessmentMonth).max(String::compareTo).orElse(null);
+        if (ObjUtil.isNotNull(last12MonthsMaxAssessmentMonth) && !StrUtil.equals(last12MonthsMaxAssessmentMonth, result.getAssessmentMonth())) {
+            PersonnelNonCadreMonthlyAssessment lastMonthsQuery = new PersonnelNonCadreMonthlyAssessment();
+            lastMonthsQuery.setUserId(result.getUserId());
+            lastMonthsQuery.setAssessmentMonthStart(MonthUtils.getNextMonth(last12MonthsMaxAssessmentMonth));
+            lastMonthsQuery.setAssessmentMonthEnd(result.getAssessmentMonth());
+            lastMonthsQuery.setAssessmentResult(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_ONE.getName());
+            List<PersonnelNonCadreMonthlyAssessment> lastMonthsList = personnelNonCadreMonthlyAssessmentMapper.selectPersonnelNonCadreMonthlyAssessmentList(lastMonthsQuery);
+            applicationMethodRuleFive = lastMonthsList.size() >= 3;
+        }
+        boolean applicationMethodRuleSix = false;
+        MonthUtils.MonthRange currentYearMonthsTraining = MonthUtils.getCurrentYearToMonth(result.getAssessmentMonth());
+        PersonnelNonCadreMonthlyAssessment currentYearMonthsTrainingQuery = new PersonnelNonCadreMonthlyAssessment();
+        currentYearMonthsTrainingQuery.setUserId(result.getUserId());
+        currentYearMonthsTrainingQuery.setAssessmentMonthStart(currentYearMonthsTraining.getStartMonth());
+        currentYearMonthsTrainingQuery.setAssessmentMonthEnd(currentYearMonthsTraining.getEndMonth());
+        currentYearMonthsTrainingQuery.setApplicationMethod(BasePerformanceIndicatorApplicationMethodRuleEnum.APPLICATION_METHOD_RULE_ONE.getName());
+        List<PersonnelNonCadreMonthlyAssessment> currentYearMonthsTrainingList = personnelNonCadreMonthlyAssessmentMapper.selectPersonnelNonCadreMonthlyAssessmentList(currentYearMonthsTrainingQuery);
+        String maxAssessmentMonth = currentYearMonthsTrainingList.stream().map(PersonnelNonCadreMonthlyAssessment::getAssessmentMonth).max(String::compareTo).orElse(null);
+        if (ObjUtil.isNotNull(maxAssessmentMonth) && !StrUtil.equals(maxAssessmentMonth, result.getAssessmentMonth())) {
+            PersonnelNonCadreMonthlyAssessment remainingMonthsOfYearQuery = new PersonnelNonCadreMonthlyAssessment();
+            remainingMonthsOfYearQuery.setUserId(result.getUserId());
+            remainingMonthsOfYearQuery.setAssessmentMonthStart(MonthUtils.getNextMonth(maxAssessmentMonth));
+            remainingMonthsOfYearQuery.setAssessmentMonthEnd(result.getAssessmentMonth());
+            remainingMonthsOfYearQuery.setAssessmentResult(BasePerformanceIndicatorAssessmentResultRuleEnum.ASSESSMENT_RESULT_RULE_TWO.getName());
+            List<PersonnelNonCadreMonthlyAssessment> remainingMonthsOfYearQueryList = personnelNonCadreMonthlyAssessmentMapper.selectPersonnelNonCadreMonthlyAssessmentList(remainingMonthsOfYearQuery);
+            applicationMethodRuleSix = CollUtil.isNotEmpty(remainingMonthsOfYearQueryList);
+        }
+        if (applicationMethodRuleOne) {
+            result.setApplicationMethod(BasePerformanceIndicatorApplicationMethodRuleEnum.APPLICATION_METHOD_RULE_ONE.getName());
+            result.setApplicationMethodRemark(BasePerformanceIndicatorApplicationMethodRuleEnum.APPLICATION_METHOD_RULE_ONE.getDesc());
+        }
+        if (applicationMethodRuleFive) {
+            result.setApplicationMethod(BasePerformanceIndicatorApplicationMethodRuleEnum.APPLICATION_METHOD_RULE_FIVE.getName());
+            result.setApplicationMethodRemark(BasePerformanceIndicatorApplicationMethodRuleEnum.APPLICATION_METHOD_RULE_FIVE.getDesc());
+        }
+        if (applicationMethodRuleSix) {
+            result.setApplicationMethod(BasePerformanceIndicatorApplicationMethodRuleEnum.APPLICATION_METHOD_RULE_SIX.getName());
+            result.setApplicationMethodRemark(BasePerformanceIndicatorApplicationMethodRuleEnum.APPLICATION_METHOD_RULE_SIX.getDesc());
+        }
+    }
+
+    /**
+     * 判断当前用户分数是否处于最低的5%以内（包括并列）
+     *
+     * @param currentObj 当前用户对象
+     * @param list       列表
+     * @param scoreExtractor 分数提取器
+     * @return true表示处于最低的5%以内，false表示处于最低的5%以外
+     */
+    private boolean isInBottom5Percent(PersonnelNonCadreMonthlyAssessment currentObj, List<PersonnelNonCadreMonthlyAssessment> list, java.util.function.Function<PersonnelNonCadreMonthlyAssessment, BigDecimal> scoreExtractor) {
+        if (CollUtil.isEmpty(list)) {
+            return false;
+        }
+
+        // 获取当前用户的分数
+        BigDecimal currentScore = scoreExtractor.apply(currentObj);
+
+        // 统计分数大于当前用户分数的人数（包括并列）
+        long higherCount = list.stream()
+                .map(scoreExtractor)
+                .filter(score -> score.compareTo(currentScore) > 0)
+                .count();
+
+        // 计算百分比
+        BigDecimal percentage = BigDecimal.valueOf(higherCount).divide(BigDecimal.valueOf(list.size()), 2, RoundingMode.HALF_UP);
+
+        // 判断当前用户的分数是否处于最高的95%以外（包括并列）
+        return percentage.compareTo(BigDecimal.valueOf(0.95)) > 0;
+    }
+
+    /**
+     * 判断当前用户分数是否排名最后1名（包括并列）
+     *
+     * @param currentObj 当前用户对象
+     * @param list       列表
+     * @param scoreExtractor 分数提取器
+     * @return true表示排名最后1名，false表示排名非最后1名
+     */
+    private boolean isInBottom1Ranking(PersonnelNonCadreMonthlyAssessment currentObj, List<PersonnelNonCadreMonthlyAssessment> list, java.util.function.Function<PersonnelNonCadreMonthlyAssessment, BigDecimal> scoreExtractor) {
+        if (CollUtil.isEmpty(list)) {
+            return false;
+        }
+
+        // 获取当前用户的分数
+        BigDecimal currentScore = scoreExtractor.apply(currentObj);
+
+        // 统计分数小于当前用户分数的人数（包括并列）
+        long lowerOrEqualCount = list.stream()
+                .map(scoreExtractor)
+                .filter(score -> score.compareTo(currentScore) < 0)
+                .count();
+
+        // 判断当前用户分数是否分数最低（包括并列）
+        return lowerOrEqualCount == 0;
+    }
 }

airport-personnel/src/main/resources/mapper/personnel/PersonnelNonCadreMonthlyAssessmentMapper.xml

@@ -168,9 +168,11 @@
             <if test="exemptionReasonRemark != null  and exemptionReasonRemark != ''">and exemption_reason_remark =
                 #{exemptionReasonRemark}
             </if>
-            <if test="assessmentMonthStart != null and assessmentMonthEnd != null">
-                and (assessment_month >= #{assessmentMonthStart}
-                and assessment_month <![CDATA[ <= ]]> #{assessmentMonthEnd})
+            <if test="assessmentMonthStart != null">
+                and assessment_month >= #{assessmentMonthStart}
+            </if>
+            <if test="assessmentMonthEnd != null">
+                and assessment_month <![CDATA[ <= ]]> #{assessmentMonthEnd}
             </if>
         </where>
         order by create_time desc