chenshudong 1 месяц назад
Родитель
Сommit
261b4e5230

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

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

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

@@ -59,6 +59,13 @@ public class PersonnelMonthlyAssessmentIndicatorDetail extends BaseEntity {
59
     @Excel(name = "单位")
59
     @Excel(name = "单位")
60
     private String unit;
60
     private String unit;
61
 
61
 
62
+    /** 事/病假 */
63
+    @Excel(name = "事/病假",
64
+            readConverterExp = "PERSONAL_LEAVE=事假," +
65
+                    "SICK_LEAVE=病假,",
66
+            combo = "事假,病假")
67
+    private String leaveType;
68
+
62
     /** 奖罚类型 */
69
     /** 奖罚类型 */
63
     @Excel(name = "奖罚类型")
70
     @Excel(name = "奖罚类型")
64
     private String rewardPunishmentType;
71
     private String rewardPunishmentType;
@@ -162,6 +169,14 @@ public class PersonnelMonthlyAssessmentIndicatorDetail extends BaseEntity {
162
         return unit;
169
         return unit;
163
     }
170
     }
164
 
171
 
172
+    public String getLeaveType() {
173
+        return leaveType;
174
+    }
175
+
176
+    public void setLeaveType(String leaveType) {
177
+        this.leaveType = leaveType;
178
+    }
179
+
165
     public void setRewardPunishmentType(String rewardPunishmentType) {
180
     public void setRewardPunishmentType(String rewardPunishmentType) {
166
         this.rewardPunishmentType = rewardPunishmentType;
181
         this.rewardPunishmentType = rewardPunishmentType;
167
     }
182
     }
@@ -228,6 +243,7 @@ public class PersonnelMonthlyAssessmentIndicatorDetail extends BaseEntity {
228
                 .append("indicatorName", getIndicatorName())
243
                 .append("indicatorName", getIndicatorName())
229
                 .append("score", getScore())
244
                 .append("score", getScore())
230
                 .append("unit", getUnit())
245
                 .append("unit", getUnit())
246
+                .append("leaveType", getLeaveType())
231
                 .append("rewardPunishmentType", getRewardPunishmentType())
247
                 .append("rewardPunishmentType", getRewardPunishmentType())
232
                 .append("qcDeptType", getQcDeptType())
248
                 .append("qcDeptType", getQcDeptType())
233
                 .append("occurCount", getOccurCount())
249
                 .append("occurCount", getOccurCount())

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

@@ -208,6 +208,14 @@ public class PersonnelNonCadreMonthlyAssessment extends BaseEntity {
208
     @TableField(exist = false)
208
     @TableField(exist = false)
209
     private List<PersonnelMonthlyAssessmentIndicatorDetail> punishmentAccordList;
209
     private List<PersonnelMonthlyAssessmentIndicatorDetail> punishmentAccordList;
210
 
210
 
211
+    /** 查询开始考核月份(格式:YYYYMM) */
212
+    @TableField(exist = false)
213
+    private String assessmentMonthStart;
214
+
215
+    /** 查询结束考核月份(格式:YYYYMM) */
216
+    @TableField(exist = false)
217
+    private String assessmentMonthEnd;
218
+
211
     public void setTenantId(String tenantId) {
219
     public void setTenantId(String tenantId) {
212
         this.tenantId = tenantId;
220
         this.tenantId = tenantId;
213
     }
221
     }
@@ -584,6 +592,22 @@ public class PersonnelNonCadreMonthlyAssessment extends BaseEntity {
584
         this.punishmentAccordList = punishmentAccordList;
592
         this.punishmentAccordList = punishmentAccordList;
585
     }
593
     }
586
 
594
 
595
+    public String getAssessmentMonthStart() {
596
+        return assessmentMonthStart;
597
+    }
598
+
599
+    public void setAssessmentMonthStart(String assessmentMonthStart) {
600
+        this.assessmentMonthStart = assessmentMonthStart;
601
+    }
602
+
603
+    public String getAssessmentMonthEnd() {
604
+        return assessmentMonthEnd;
605
+    }
606
+
607
+    public void setAssessmentMonthEnd(String assessmentMonthEnd) {
608
+        this.assessmentMonthEnd = assessmentMonthEnd;
609
+    }
610
+
587
     @Override
611
     @Override
588
     public String toString() {
612
     public String toString() {
589
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
613
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

+ 7 - 0
airport-personnel/src/main/resources/mapper/personnel/PersonnelMonthlyAssessmentIndicatorDetailMapper.xml

@@ -20,6 +20,7 @@
20
         <result property="indicatorName" column="indicator_name"/>
20
         <result property="indicatorName" column="indicator_name"/>
21
         <result property="score" column="score"/>
21
         <result property="score" column="score"/>
22
         <result property="unit" column="unit"/>
22
         <result property="unit" column="unit"/>
23
+        <result property="leaveType" column="leave_type"/>
23
         <result property="rewardPunishmentType" column="reward_punishment_type"/>
24
         <result property="rewardPunishmentType" column="reward_punishment_type"/>
24
         <result property="qcDeptType" column="qc_dept_type"/>
25
         <result property="qcDeptType" column="qc_dept_type"/>
25
         <result property="occurCount" column="occur_count"/>
26
         <result property="occurCount" column="occur_count"/>
@@ -43,6 +44,7 @@
43
                indicator_name,
44
                indicator_name,
44
                score,
45
                score,
45
                unit,
46
                unit,
47
+               leave_type,
46
                reward_punishment_type,
48
                reward_punishment_type,
47
                qc_dept_type,
49
                qc_dept_type,
48
                occur_count,
50
                occur_count,
@@ -67,6 +69,7 @@
67
             </if>
69
             </if>
68
             <if test="score != null ">and score = #{score}</if>
70
             <if test="score != null ">and score = #{score}</if>
69
             <if test="unit != null  and unit != ''">and unit = #{unit}</if>
71
             <if test="unit != null  and unit != ''">and unit = #{unit}</if>
72
+            <if test="leaveType != null  and leaveType != ''">and leave_type = #{leaveType}</if>
70
             <if test="rewardPunishmentType != null  and rewardPunishmentType != ''">and reward_punishment_type =
73
             <if test="rewardPunishmentType != null  and rewardPunishmentType != ''">and reward_punishment_type =
71
                 #{rewardPunishmentType}
74
                 #{rewardPunishmentType}
72
             </if>
75
             </if>
@@ -75,6 +78,7 @@
75
             <if test="scoreResult != null ">and score_result = #{scoreResult}</if>
78
             <if test="scoreResult != null ">and score_result = #{scoreResult}</if>
76
             <if test="amountResult != null ">and amount_result = #{amountResult}</if>
79
             <if test="amountResult != null ">and amount_result = #{amountResult}</if>
77
         </where>
80
         </where>
81
+        order by create_time desc
78
     </select>
82
     </select>
79
 
83
 
80
     <select id="selectPersonnelMonthlyAssessmentIndicatorDetailById" parameterType="Long"
84
     <select id="selectPersonnelMonthlyAssessmentIndicatorDetailById" parameterType="Long"
@@ -101,6 +105,7 @@
101
             <if test="indicatorName != null and indicatorName != ''">indicator_name,</if>
105
             <if test="indicatorName != null and indicatorName != ''">indicator_name,</if>
102
             <if test="score != null">score,</if>
106
             <if test="score != null">score,</if>
103
             <if test="unit != null">unit,</if>
107
             <if test="unit != null">unit,</if>
108
+            <if test="leaveType != null">leave_type,</if>
104
             <if test="rewardPunishmentType != null and rewardPunishmentType != ''">reward_punishment_type,</if>
109
             <if test="rewardPunishmentType != null and rewardPunishmentType != ''">reward_punishment_type,</if>
105
             <if test="qcDeptType != null and qcDeptType != ''">qc_dept_type,</if>
110
             <if test="qcDeptType != null and qcDeptType != ''">qc_dept_type,</if>
106
             <if test="occurCount != null">occur_count,</if>
111
             <if test="occurCount != null">occur_count,</if>
@@ -122,6 +127,7 @@
122
             <if test="indicatorName != null and indicatorName != ''">#{indicatorName},</if>
127
             <if test="indicatorName != null and indicatorName != ''">#{indicatorName},</if>
123
             <if test="score != null">#{score},</if>
128
             <if test="score != null">#{score},</if>
124
             <if test="unit != null">#{unit},</if>
129
             <if test="unit != null">#{unit},</if>
130
+            <if test="leaveType != null">#{leaveType},</if>
125
             <if test="rewardPunishmentType != null and rewardPunishmentType != ''">#{rewardPunishmentType},</if>
131
             <if test="rewardPunishmentType != null and rewardPunishmentType != ''">#{rewardPunishmentType},</if>
126
             <if test="qcDeptType != null and qcDeptType != ''">#{qcDeptType},</if>
132
             <if test="qcDeptType != null and qcDeptType != ''">#{qcDeptType},</if>
127
             <if test="occurCount != null">#{occurCount},</if>
133
             <if test="occurCount != null">#{occurCount},</if>
@@ -148,6 +154,7 @@
148
             <if test="indicatorName != null and indicatorName != ''">indicator_name = #{indicatorName},</if>
154
             <if test="indicatorName != null and indicatorName != ''">indicator_name = #{indicatorName},</if>
149
             <if test="score != null">score = #{score},</if>
155
             <if test="score != null">score = #{score},</if>
150
             <if test="unit != null">unit = #{unit},</if>
156
             <if test="unit != null">unit = #{unit},</if>
157
+            <if test="leaveType != null">leave_type = #{leaveType},</if>
151
             <if test="rewardPunishmentType != null and rewardPunishmentType != ''">reward_punishment_type =
158
             <if test="rewardPunishmentType != null and rewardPunishmentType != ''">reward_punishment_type =
152
                 #{rewardPunishmentType},
159
                 #{rewardPunishmentType},
153
             </if>
160
             </if>

+ 1 - 0
airport-personnel/src/main/resources/mapper/personnel/PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailMapper.xml

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

+ 5 - 0
airport-personnel/src/main/resources/mapper/personnel/PersonnelNonCadreMonthlyAssessmentMapper.xml

@@ -168,7 +168,12 @@
168
             <if test="exemptionReasonRemark != null  and exemptionReasonRemark != ''">and exemption_reason_remark =
168
             <if test="exemptionReasonRemark != null  and exemptionReasonRemark != ''">and exemption_reason_remark =
169
                 #{exemptionReasonRemark}
169
                 #{exemptionReasonRemark}
170
             </if>
170
             </if>
171
+            <if test="assessmentMonthStart != null and assessmentMonthEnd != null">
172
+                and (assessment_month >= #{assessmentMonthStart}
173
+                and assessment_month <![CDATA[ <= ]]> #{assessmentMonthEnd})
174
+            </if>
171
         </where>
175
         </where>
176
+        order by create_time desc
172
     </select>
177
     </select>
173
 
178
 
174
     <select id="selectPersonnelNonCadreMonthlyAssessmentById" parameterType="Long"
179
     <select id="selectPersonnelNonCadreMonthlyAssessmentById" parameterType="Long"