人事绩效

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

@@ -1,14 +1,17 @@
 package com.sundot.airport.personnel.domain;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.sundot.airport.common.annotation.Excel;
 import com.sundot.airport.common.core.domain.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 月度考核指标奖罚明细对象 personnel_monthly_assessment_indicator_reward_punishment_detail
@@ -58,6 +61,12 @@ public class PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail extends B
     @Excel(name = "奖罚金额（元）")
     private BigDecimal amount;
 
+    /** 日期 */
+    @Excel(name = "日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date recordDate;
+
     public void setTenantId(String tenantId) {
         this.tenantId = tenantId;
     }
@@ -138,6 +147,14 @@ public class PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail extends B
         return amount;
     }
 
+    public Date getRecordDate() {
+        return recordDate;
+    }
+
+    public void setRecordDate(Date recordDate) {
+        this.recordDate = recordDate;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -156,6 +173,7 @@ public class PersonnelMonthlyAssessmentIndicatorRewardPunishmentDetail extends B
                 .append("rewardPunishmentType", getRewardPunishmentType())
                 .append("rewardPunishmentDetail", getRewardPunishmentDetail())
                 .append("amount", getAmount())
+                .append("recordDate", getRecordDate())
                 .toString();
     }
 }

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

@@ -21,6 +21,7 @@
         <result property="rewardPunishmentType" column="reward_punishment_type"/>
         <result property="rewardPunishmentDetail" column="reward_punishment_detail"/>
         <result property="amount" column="amount"/>
+        <result property="recordDate" column="record_date"/>
     </resultMap>
 
     <sql id="selectPersonnelMonthlyAssessmentIndicatorRewardPunishmentDetailVo">
@@ -38,7 +39,8 @@
                score,
                reward_punishment_type,
                reward_punishment_detail,
-               amount
+               amount,
+               record_date
         from personnel_monthly_assessment_indicator_reward_punishment_detail
     </sql>
 
@@ -62,6 +64,7 @@
                 #{rewardPunishmentDetail}
             </if>
             <if test="amount != null ">and amount = #{amount}</if>
+            <if test="recordDate != null ">and record_date = #{recordDate}</if>
         </where>
         order by create_time desc
     </select>
@@ -91,6 +94,7 @@
             <if test="rewardPunishmentType != null and rewardPunishmentType != ''">reward_punishment_type,</if>
             <if test="rewardPunishmentDetail != null and rewardPunishmentDetail != ''">reward_punishment_detail,</if>
             <if test="amount != null">amount,</if>
+            <if test="recordDate != null">record_date,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="tenantId != null">#{tenantId},</if>
@@ -107,6 +111,7 @@
             <if test="rewardPunishmentType != null and rewardPunishmentType != ''">#{rewardPunishmentType},</if>
             <if test="rewardPunishmentDetail != null and rewardPunishmentDetail != ''">#{rewardPunishmentDetail},</if>
             <if test="amount != null">#{amount},</if>
+            <if test="recordDate != null">#{recordDate},</if>
         </trim>
     </insert>
 
@@ -134,6 +139,7 @@
                 #{rewardPunishmentDetail},
             </if>
             <if test="amount != null">amount = #{amount},</if>
+            <if test="recordDate != null">record_date = #{recordDate},</if>
         </trim>
         where id = #{id}
     </update>