chenshudong недель назад: 3
Родитель
Сommit
a32d4fe1ca

+ 18 - 0
airport-personnel/src/main/java/com/sundot/airport/personnel/domain/PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail.java

@@ -1,14 +1,17 @@
1
 package com.sundot.airport.personnel.domain;
1
 package com.sundot.airport.personnel.domain;
2
 
2
 
3
 import java.math.BigDecimal;
3
 import java.math.BigDecimal;
4
+import java.util.Date;
4
 
5
 
5
 import com.baomidou.mybatisplus.annotation.IdType;
6
 import com.baomidou.mybatisplus.annotation.IdType;
6
 import com.baomidou.mybatisplus.annotation.TableId;
7
 import com.baomidou.mybatisplus.annotation.TableId;
7
 import com.baomidou.mybatisplus.annotation.TableName;
8
 import com.baomidou.mybatisplus.annotation.TableName;
9
+import com.fasterxml.jackson.annotation.JsonFormat;
8
 import org.apache.commons.lang3.builder.ToStringBuilder;
10
 import org.apache.commons.lang3.builder.ToStringBuilder;
9
 import org.apache.commons.lang3.builder.ToStringStyle;
11
 import org.apache.commons.lang3.builder.ToStringStyle;
10
 import com.sundot.airport.common.annotation.Excel;
12
 import com.sundot.airport.common.annotation.Excel;
11
 import com.sundot.airport.common.core.domain.BaseEntity;
13
 import com.sundot.airport.common.core.domain.BaseEntity;
14
+import org.springframework.format.annotation.DateTimeFormat;
12
 
15
 
13
 /**
16
 /**
14
  * 月度考核指标奖罚明细对象 personnel_monthly_assessment_indicator_reward_punishment_detail
17
  * 月度考核指标奖罚明细对象 personnel_monthly_assessment_indicator_reward_punishment_detail
@@ -58,6 +61,12 @@ public class PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail extends B
58
     @Excel(name = "奖罚金额(元)")
61
     @Excel(name = "奖罚金额(元)")
59
     private BigDecimal amount;
62
     private BigDecimal amount;
60
 
63
 
64
+    /** 日期 */
65
+    @Excel(name = "日期", width = 30, dateFormat = "yyyy-MM-dd")
66
+    @JsonFormat(pattern = "yyyy-MM-dd")
67
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
68
+    private Date recordDate;
69
+
61
     public void setTenantId(String tenantId) {
70
     public void setTenantId(String tenantId) {
62
         this.tenantId = tenantId;
71
         this.tenantId = tenantId;
63
     }
72
     }
@@ -138,6 +147,14 @@ public class PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail extends B
138
         return amount;
147
         return amount;
139
     }
148
     }
140
 
149
 
150
+    public Date getRecordDate() {
151
+        return recordDate;
152
+    }
153
+
154
+    public void setRecordDate(Date recordDate) {
155
+        this.recordDate = recordDate;
156
+    }
157
+
141
     @Override
158
     @Override
142
     public String toString() {
159
     public String toString() {
143
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
160
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -156,6 +173,7 @@ public class PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail extends B
156
                 .append("rewardPunishmentType", getRewardPunishmentType())
173
                 .append("rewardPunishmentType", getRewardPunishmentType())
157
                 .append("rewardPunishmentDetail", getRewardPunishmentDetail())
174
                 .append("rewardPunishmentDetail", getRewardPunishmentDetail())
158
                 .append("amount", getAmount())
175
                 .append("amount", getAmount())
176
+                .append("recordDate", getRecordDate())
159
                 .toString();
177
                 .toString();
160
     }
178
     }
161
 }
179
 }

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

@@ -21,6 +21,7 @@
21
         <result property="rewardPunishmentType" column="reward_punishment_type"/>
21
         <result property="rewardPunishmentType" column="reward_punishment_type"/>
22
         <result property="rewardPunishmentDetail" column="reward_punishment_detail"/>
22
         <result property="rewardPunishmentDetail" column="reward_punishment_detail"/>
23
         <result property="amount" column="amount"/>
23
         <result property="amount" column="amount"/>
24
+        <result property="recordDate" column="record_date"/>
24
     </resultMap>
25
     </resultMap>
25
 
26
 
26
     <sql id="selectPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailVo">
27
     <sql id="selectPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailVo">
@@ -38,7 +39,8 @@
38
                score,
39
                score,
39
                reward_punishment_type,
40
                reward_punishment_type,
40
                reward_punishment_detail,
41
                reward_punishment_detail,
41
-               amount
42
+               amount,
43
+               record_date
42
         from personnel_monthly_assessment_indicator_reward_punishment_detail
44
         from personnel_monthly_assessment_indicator_reward_punishment_detail
43
     </sql>
45
     </sql>
44
 
46
 
@@ -62,6 +64,7 @@
62
                 #{rewardPunishmentDetail}
64
                 #{rewardPunishmentDetail}
63
             </if>
65
             </if>
64
             <if test="amount != null ">and amount = #{amount}</if>
66
             <if test="amount != null ">and amount = #{amount}</if>
67
+            <if test="recordDate != null ">and record_date = #{recordDate}</if>
65
         </where>
68
         </where>
66
         order by create_time desc
69
         order by create_time desc
67
     </select>
70
     </select>
@@ -91,6 +94,7 @@
91
             <if test="rewardPunishmentType != null and rewardPunishmentType != ''">reward_punishment_type,</if>
94
             <if test="rewardPunishmentType != null and rewardPunishmentType != ''">reward_punishment_type,</if>
92
             <if test="rewardPunishmentDetail != null and rewardPunishmentDetail != ''">reward_punishment_detail,</if>
95
             <if test="rewardPunishmentDetail != null and rewardPunishmentDetail != ''">reward_punishment_detail,</if>
93
             <if test="amount != null">amount,</if>
96
             <if test="amount != null">amount,</if>
97
+            <if test="recordDate != null">record_date,</if>
94
         </trim>
98
         </trim>
95
         <trim prefix="values (" suffix=")" suffixOverrides=",">
99
         <trim prefix="values (" suffix=")" suffixOverrides=",">
96
             <if test="tenantId != null">#{tenantId},</if>
100
             <if test="tenantId != null">#{tenantId},</if>
@@ -107,6 +111,7 @@
107
             <if test="rewardPunishmentType != null and rewardPunishmentType != ''">#{rewardPunishmentType},</if>
111
             <if test="rewardPunishmentType != null and rewardPunishmentType != ''">#{rewardPunishmentType},</if>
108
             <if test="rewardPunishmentDetail != null and rewardPunishmentDetail != ''">#{rewardPunishmentDetail},</if>
112
             <if test="rewardPunishmentDetail != null and rewardPunishmentDetail != ''">#{rewardPunishmentDetail},</if>
109
             <if test="amount != null">#{amount},</if>
113
             <if test="amount != null">#{amount},</if>
114
+            <if test="recordDate != null">#{recordDate},</if>
110
         </trim>
115
         </trim>
111
     </insert>
116
     </insert>
112
 
117
 
@@ -134,6 +139,7 @@
134
                 #{rewardPunishmentDetail},
139
                 #{rewardPunishmentDetail},
135
             </if>
140
             </if>
136
             <if test="amount != null">amount = #{amount},</if>
141
             <if test="amount != null">amount = #{amount},</if>
142
+            <if test="recordDate != null">record_date = #{recordDate},</if>
137
         </trim>
143
         </trim>
138
         where id = #{id}
144
         where id = #{id}
139
     </update>
145
     </update>