人事绩效

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

@@ -11,7 +11,8 @@ import lombok.Getter;
 public enum BasePerformanceIndicatorLeaveTypeEnum {
 
     PERSONAL_LEAVE("PERSONAL_LEAVE", "事假"),
-    SICK_LEAVE("SICK_LEAVE", "病假");
+    SICK_LEAVE("SICK_LEAVE", "病假"),
+    PERSONAL_SICK_LEAVE("PERSONAL_SICK_LEAVE", "事/病假");
 
     private final String code;
     private final String desc;

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

@@ -59,6 +59,13 @@ public class PersonnelMonthlyAssessmentIndicatorDetail extends BaseEntity {
     @Excel(name = "单位")
     private String unit;
 
+    /** 事/病假 */
+    @Excel(name = "事/病假",
+            readConverterExp = "PERSONAL_LEAVE=事假," +
+                    "SICK_LEAVE=病假,",
+            combo = "事假,病假")
+    private String leaveType;
+
     /** 奖罚类型 */
     @Excel(name = "奖罚类型")
     private String rewardPunishmentType;
@@ -162,6 +169,14 @@ public class PersonnelMonthlyAssessmentIndicatorDetail extends BaseEntity {
         return unit;
     }
 
+    public String getLeaveType() {
+        return leaveType;
+    }
+
+    public void setLeaveType(String leaveType) {
+        this.leaveType = leaveType;
+    }
+
     public void setRewardPunishmentType(String rewardPunishmentType) {
         this.rewardPunishmentType = rewardPunishmentType;
     }
@@ -228,6 +243,7 @@ public class PersonnelMonthlyAssessmentIndicatorDetail extends BaseEntity {
                 .append("indicatorName", getIndicatorName())
                 .append("score", getScore())
                 .append("unit", getUnit())
+                .append("leaveType", getLeaveType())
                 .append("rewardPunishmentType", getRewardPunishmentType())
                 .append("qcDeptType", getQcDeptType())
                 .append("occurCount", getOccurCount())

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

@@ -208,6 +208,14 @@ public class PersonnelNonCadreMonthlyAssessment extends BaseEntity {
     @TableField(exist = false)
     private List<PersonnelMonthlyAssessmentIndicatorDetail> punishmentAccordList;
 
+    /** 查询开始考核月份（格式:YYYYMM） */
+    @TableField(exist = false)
+    private String assessmentMonthStart;
+
+    /** 查询结束考核月份（格式:YYYYMM） */
+    @TableField(exist = false)
+    private String assessmentMonthEnd;
+
     public void setTenantId(String tenantId) {
         this.tenantId = tenantId;
     }
@@ -584,6 +592,22 @@ public class PersonnelNonCadreMonthlyAssessment extends BaseEntity {
         this.punishmentAccordList = punishmentAccordList;
     }
 
+    public String getAssessmentMonthStart() {
+        return assessmentMonthStart;
+    }
+
+    public void setAssessmentMonthStart(String assessmentMonthStart) {
+        this.assessmentMonthStart = assessmentMonthStart;
+    }
+
+    public String getAssessmentMonthEnd() {
+        return assessmentMonthEnd;
+    }
+
+    public void setAssessmentMonthEnd(String assessmentMonthEnd) {
+        this.assessmentMonthEnd = assessmentMonthEnd;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

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

@@ -20,6 +20,7 @@
         <result property="indicatorName" column="indicator_name"/>
         <result property="score" column="score"/>
         <result property="unit" column="unit"/>
+        <result property="leaveType" column="leave_type"/>
         <result property="rewardPunishmentType" column="reward_punishment_type"/>
         <result property="qcDeptType" column="qc_dept_type"/>
         <result property="occurCount" column="occur_count"/>
@@ -43,6 +44,7 @@
                indicator_name,
                score,
                unit,
+               leave_type,
                reward_punishment_type,
                qc_dept_type,
                occur_count,
@@ -67,6 +69,7 @@
             </if>
             <if test="score != null ">and score = #{score}</if>
             <if test="unit != null  and unit != ''">and unit = #{unit}</if>
+            <if test="leaveType != null  and leaveType != ''">and leave_type = #{leaveType}</if>
             <if test="rewardPunishmentType != null  and rewardPunishmentType != ''">and reward_punishment_type =
                 #{rewardPunishmentType}
             </if>
@@ -75,6 +78,7 @@
             <if test="scoreResult != null ">and score_result = #{scoreResult}</if>
             <if test="amountResult != null ">and amount_result = #{amountResult}</if>
         </where>
+        order by create_time desc
     </select>
 
     <select id="selectPersonnelMonthlyAssessmentIndicatorDetailById" parameterType="Long"
@@ -101,6 +105,7 @@
             <if test="indicatorName != null and indicatorName != ''">indicator_name,</if>
             <if test="score != null">score,</if>
             <if test="unit != null">unit,</if>
+            <if test="leaveType != null">leave_type,</if>
             <if test="rewardPunishmentType != null and rewardPunishmentType != ''">reward_punishment_type,</if>
             <if test="qcDeptType != null and qcDeptType != ''">qc_dept_type,</if>
             <if test="occurCount != null">occur_count,</if>
@@ -122,6 +127,7 @@
             <if test="indicatorName != null and indicatorName != ''">#{indicatorName},</if>
             <if test="score != null">#{score},</if>
             <if test="unit != null">#{unit},</if>
+            <if test="leaveType != null">#{leaveType},</if>
             <if test="rewardPunishmentType != null and rewardPunishmentType != ''">#{rewardPunishmentType},</if>
             <if test="qcDeptType != null and qcDeptType != ''">#{qcDeptType},</if>
             <if test="occurCount != null">#{occurCount},</if>
@@ -148,6 +154,7 @@
             <if test="indicatorName != null and indicatorName != ''">indicator_name = #{indicatorName},</if>
             <if test="score != null">score = #{score},</if>
             <if test="unit != null">unit = #{unit},</if>
+            <if test="leaveType != null">leave_type = #{leaveType},</if>
             <if test="rewardPunishmentType != null and rewardPunishmentType != ''">reward_punishment_type =
                 #{rewardPunishmentType},
             </if>

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

@@ -55,6 +55,7 @@
             </if>
             <if test="amount != null ">and amount = #{amount}</if>
         </where>
+        order by create_time desc
     </select>
 
     <select id="selectPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailById" parameterType="Long"

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

@@ -168,7 +168,12 @@
             <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>
         </where>
+        order by create_time desc
     </select>
 
     <select id="selectPersonnelNonCadreMonthlyAssessmentById" parameterType="Long"