人事绩效

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

@@ -44,6 +44,18 @@ public class PersonnelNonCadreMonthlyAssessment extends BaseEntity {
     @Excel(name = "用户名称")
     private String userName;
 
+    /** 角色ID */
+    @Excel(name = "角色ID")
+    private Long roleId;
+
+    /** 角色权限字符串 */
+    @Excel(name = "角色权限字符串")
+    private String roleKey;
+
+    /** 角色名称 */
+    @Excel(name = "角色名称")
+    private String roleName;
+
     /** 用工形式 */
     @Excel(name = "用工形式")
     private String employmentType;
@@ -160,6 +172,34 @@ public class PersonnelNonCadreMonthlyAssessment extends BaseEntity {
     @TableField(exist = false)
     private List<PersonnelMonthlyAssessmentIndicatorDetail> personnelMonthlyAssessmentIndicatorDetailList;
 
+    /** 红线指标依据 */
+    @TableField(exist = false)
+    private List<PersonnelMonthlyAssessmentIndicatorDetail> redLineIndexAccordList;
+
+    /** 核心指标依据 */
+    @TableField(exist = false)
+    private List<PersonnelMonthlyAssessmentIndicatorDetail> coreIndexAccordList;
+
+    /** 其他指标依据  */
+    @TableField(exist = false)
+    private List<PersonnelMonthlyAssessmentIndicatorDetail> otherIndexAccordList;
+
+    /** 其他指标中的安全指标（仅含SOC/站品控检查扣分）依据 */
+    @TableField(exist = false)
+    private List<PersonnelMonthlyAssessmentIndicatorDetail> otherIndexSafetyScoreWithSocStationQcAccordList;
+
+    /** 其他指标中的安全指标（不含SOC/站品控检查扣分）依据 */
+    @TableField(exist = false)
+    private List<PersonnelMonthlyAssessmentIndicatorDetail> otherIndexSafetyScoreWithoutSocStationQcAccordList;
+
+    /** 其他指标中的非安全指标扣分依据 */
+    @TableField(exist = false)
+    private List<PersonnelMonthlyAssessmentIndicatorDetail> otherIndexNonSafetyAccordList;
+
+    /** SOC/站品控检查的涉及核心、安全指标扣分依据 */
+    @TableField(exist = false)
+    private List<PersonnelMonthlyAssessmentIndicatorDetail> socStationQcInvolvedCoreSafetyAccordList;
+
     public void setTenantId(String tenantId) {
         this.tenantId = tenantId;
     }
@@ -208,6 +248,30 @@ public class PersonnelNonCadreMonthlyAssessment extends BaseEntity {
         return userName;
     }
 
+    public Long getRoleId() {
+        return roleId;
+    }
+
+    public void setRoleId(Long roleId) {
+        this.roleId = roleId;
+    }
+
+    public String getRoleKey() {
+        return roleKey;
+    }
+
+    public void setRoleKey(String roleKey) {
+        this.roleKey = roleKey;
+    }
+
+    public String getRoleName() {
+        return roleName;
+    }
+
+    public void setRoleName(String roleName) {
+        this.roleName = roleName;
+    }
+
     public void setEmploymentType(String employmentType) {
         this.employmentType = employmentType;
     }
@@ -440,6 +504,62 @@ public class PersonnelNonCadreMonthlyAssessment extends BaseEntity {
         this.personnelMonthlyAssessmentIndicatorDetailList = personnelMonthlyAssessmentIndicatorDetailList;
     }
 
+    public List<PersonnelMonthlyAssessmentIndicatorDetail> getRedLineIndexAccordList() {
+        return redLineIndexAccordList;
+    }
+
+    public void setRedLineIndexAccordList(List<PersonnelMonthlyAssessmentIndicatorDetail> redLineIndexAccordList) {
+        this.redLineIndexAccordList = redLineIndexAccordList;
+    }
+
+    public List<PersonnelMonthlyAssessmentIndicatorDetail> getCoreIndexAccordList() {
+        return coreIndexAccordList;
+    }
+
+    public void setCoreIndexAccordList(List<PersonnelMonthlyAssessmentIndicatorDetail> coreIndexAccordList) {
+        this.coreIndexAccordList = coreIndexAccordList;
+    }
+
+    public List<PersonnelMonthlyAssessmentIndicatorDetail> getOtherIndexAccordList() {
+        return otherIndexAccordList;
+    }
+
+    public void setOtherIndexAccordList(List<PersonnelMonthlyAssessmentIndicatorDetail> otherIndexAccordList) {
+        this.otherIndexAccordList = otherIndexAccordList;
+    }
+
+    public List<PersonnelMonthlyAssessmentIndicatorDetail> getOtherIndexSafetyScoreWithSocStationQcAccordList() {
+        return otherIndexSafetyScoreWithSocStationQcAccordList;
+    }
+
+    public void setOtherIndexSafetyScoreWithSocStationQcAccordList(List<PersonnelMonthlyAssessmentIndicatorDetail> otherIndexSafetyScoreWithSocStationQcAccordList) {
+        this.otherIndexSafetyScoreWithSocStationQcAccordList = otherIndexSafetyScoreWithSocStationQcAccordList;
+    }
+
+    public List<PersonnelMonthlyAssessmentIndicatorDetail> getOtherIndexSafetyScoreWithoutSocStationQcAccordList() {
+        return otherIndexSafetyScoreWithoutSocStationQcAccordList;
+    }
+
+    public void setOtherIndexSafetyScoreWithoutSocStationQcAccordList(List<PersonnelMonthlyAssessmentIndicatorDetail> otherIndexSafetyScoreWithoutSocStationQcAccordList) {
+        this.otherIndexSafetyScoreWithoutSocStationQcAccordList = otherIndexSafetyScoreWithoutSocStationQcAccordList;
+    }
+
+    public List<PersonnelMonthlyAssessmentIndicatorDetail> getOtherIndexNonSafetyAccordList() {
+        return otherIndexNonSafetyAccordList;
+    }
+
+    public void setOtherIndexNonSafetyAccordList(List<PersonnelMonthlyAssessmentIndicatorDetail> otherIndexNonSafetyAccordList) {
+        this.otherIndexNonSafetyAccordList = otherIndexNonSafetyAccordList;
+    }
+
+    public List<PersonnelMonthlyAssessmentIndicatorDetail> getSocStationQcInvolvedCoreSafetyAccordList() {
+        return socStationQcInvolvedCoreSafetyAccordList;
+    }
+
+    public void setSocStationQcInvolvedCoreSafetyAccordList(List<PersonnelMonthlyAssessmentIndicatorDetail> socStationQcInvolvedCoreSafetyAccordList) {
+        this.socStationQcInvolvedCoreSafetyAccordList = socStationQcInvolvedCoreSafetyAccordList;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -454,6 +574,9 @@ public class PersonnelNonCadreMonthlyAssessment extends BaseEntity {
                 .append("assessmentMonth", getAssessmentMonth())
                 .append("userId", getUserId())
                 .append("userName", getUserName())
+                .append("roleId", getRoleId())
+                .append("roleKey", getRoleKey())
+                .append("roleName", getRoleName())
                 .append("employmentType", getEmploymentType())
                 .append("assessmentTeam", getAssessmentTeam())
                 .append("post", getPost())
@@ -483,6 +606,13 @@ public class PersonnelNonCadreMonthlyAssessment extends BaseEntity {
                 .append("exemption", getExemption())
                 .append("exemptionReasonRemark", getExemptionReasonRemark())
                 .append("personnelMonthlyAssessmentIndicatorDetailList", getPersonnelMonthlyAssessmentIndicatorDetailList())
+                .append("redLineIndexAccordList", getRedLineIndexAccordList())
+                .append("coreIndexAccordList", getCoreIndexAccordList())
+                .append("otherIndexAccordList", getOtherIndexAccordList())
+                .append("otherIndexSafetyScoreWithSocStationQcAccordList", getOtherIndexSafetyScoreWithSocStationQcAccordList())
+                .append("otherIndexSafetyScoreWithoutSocStationQcAccordList", getOtherIndexSafetyScoreWithoutSocStationQcAccordList())
+                .append("otherIndexNonSafetyAccordList", getOtherIndexNonSafetyAccordList())
+                .append("socStationQcInvolvedCoreSafetyAccordList", getSocStationQcInvolvedCoreSafetyAccordList())
                 .toString();
     }
 }

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

@@ -1,18 +1,26 @@
 package com.sundot.airport.personnel.service.impl;
 
+import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 import cn.hutool.core.collection.CollUtil;
 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.enums.BasePerformanceIndicatorQcDeptTypeEnum;
+import com.sundot.airport.common.enums.BasePerformanceIndicatorRewardPunishmentTypeTypeEnum;
 import com.sundot.airport.common.utils.DateUtils;
 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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.sundot.airport.personnel.mapper.PersonnelNonCadreMonthlyAssessmentMapper;
@@ -34,6 +42,8 @@ public class PersonnelNonCadreMonthlyAssessmentServiceImpl extends ServiceImpl<P
     private IPersonnelMonthlyAssessmentIndicatorDetailService personnelMonthlyAssessmentIndicatorDetailService;
     @Autowired
     private IPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailService personnelMonthlyAssessmentIndicatorRewardPunishmentDetailService;
+    @Autowired
+    private IBasePerformanceIndicatorCategoryService basePerformanceIndicatorCategoryService;
 
     /**
      * 查询非干部月度考核
@@ -66,6 +76,78 @@ public class PersonnelNonCadreMonthlyAssessmentServiceImpl extends ServiceImpl<P
         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);
         return result;
     }
 

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

@@ -16,6 +16,9 @@
         <result property="assessmentMonth" column="assessment_month"/>
         <result property="userId" column="user_id"/>
         <result property="userName" column="user_name"/>
+        <result property="roleId" column="role_id"/>
+        <result property="roleKey" column="role_key"/>
+        <result property="roleName" column="role_name"/>
         <result property="employmentType" column="employment_type"/>
         <result property="assessmentTeam" column="assessment_team"/>
         <result property="post" column="post"/>
@@ -61,6 +64,9 @@
                assessment_month,
                user_id,
                user_name,
+               role_id,
+               role_key,
+               role_name,
                employment_type,
                assessment_team,
                post,
@@ -101,6 +107,9 @@
             <if test="assessmentMonth != null  and assessmentMonth != ''">and assessment_month = #{assessmentMonth}</if>
             <if test="userId != null ">and user_id = #{userId}</if>
             <if test="userName != null  and userName != ''">and user_name like concat('%', #{userName}, '%')</if>
+            <if test="roleId != null ">and role_id = #{roleId}</if>
+            <if test="roleKey != null  and roleKey != ''">and role_key = #{roleKey}</if>
+            <if test="roleName != null  and roleName != ''">and role_name like concat('%', #{roleName}, '%')</if>
             <if test="employmentType != null  and employmentType != ''">and employment_type = #{employmentType}</if>
             <if test="assessmentTeam != null  and assessmentTeam != ''">and assessment_team = #{assessmentTeam}</if>
             <if test="post != null  and post != ''">and post = #{post}</if>
@@ -182,6 +191,9 @@
             <if test="assessmentMonth != null and assessmentMonth != ''">assessment_month,</if>
             <if test="userId != null">user_id,</if>
             <if test="userName != null and userName != ''">user_name,</if>
+            <if test="roleId != null">role_id,</if>
+            <if test="roleKey != null and roleKey != ''">role_key,</if>
+            <if test="roleName != null and roleName != ''">role_name,</if>
             <if test="employmentType != null">employment_type,</if>
             <if test="assessmentTeam != null">assessment_team,</if>
             <if test="post != null">post,</if>
@@ -227,6 +239,9 @@
             <if test="assessmentMonth != null and assessmentMonth != ''">#{assessmentMonth},</if>
             <if test="userId != null">#{userId},</if>
             <if test="userName != null and userName != ''">#{userName},</if>
+            <if test="roleId != null">#{roleId},</if>
+            <if test="roleKey != null and roleKey != ''">#{roleKey},</if>
+            <if test="roleName != null and roleName != ''">#{roleName},</if>
             <if test="employmentType != null">#{employmentType},</if>
             <if test="assessmentTeam != null">#{assessmentTeam},</if>
             <if test="post != null">#{post},</if>
@@ -275,6 +290,9 @@
             <if test="assessmentMonth != null and assessmentMonth != ''">assessment_month = #{assessmentMonth},</if>
             <if test="userId != null">user_id = #{userId},</if>
             <if test="userName != null and userName != ''">user_name = #{userName},</if>
+            <if test="roleId != null">role_id = #{roleId},</if>
+            <if test="roleKey != null and roleKey != ''">role_key = #{roleKey},</if>
+            <if test="roleName != null and roleName != ''">role_name = #{roleName},</if>
             <if test="employmentType != null">employment_type = #{employmentType},</if>
             <if test="assessmentTeam != null">assessment_team = #{assessmentTeam},</if>
             <if test="post != null">post = #{post},</if>