From b5d5b7676c92eee961ca34259848bfcb97115c7b Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 21 四月 2026 15:56:00 +0800
Subject: [PATCH] 奖惩记录迁移到绩效模块
---
cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonRewardPunishmentRecord.java | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonRewardPunishmentRecord.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonRewardPunishmentRecord.java
index 93f0262..e1683fa 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonRewardPunishmentRecord.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonRewardPunishmentRecord.java
@@ -7,6 +7,7 @@
import lombok.Setter;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
@@ -29,8 +30,8 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty("濂栨儵绾у埆")
- private String rewardPunishLevel;
+ @ApiModelProperty("鐢ㄦ埛id")
+ private Integer userId;
@ApiModelProperty("濂栨儵鍚嶇О")
private String rewardPunishName;
@@ -38,24 +39,34 @@
@ApiModelProperty("濂栨儵鏃堕棿")
private LocalDateTime rewardPunishTime;
- @ApiModelProperty("濂栨儵鍗曚綅")
- private String rewardPunishWorkUnit;
+ @ApiModelProperty("濂栨儵璁″垎")
+ private BigDecimal rewardPunishScore;
+
+ @ApiModelProperty("濂栨儵閲戦")
+ private BigDecimal rewardPunishSum;
@ApiModelProperty("濂栨儵鍐呭")
private String rewardPunishContent;
- @ApiModelProperty("鐢ㄦ埛id")
- private Integer userId;
+ @ApiModelProperty("濂栨儵绾у埆")
+ private String rewardPunishLevel;
+
+ @ApiModelProperty("濂栨儵鍗曚綅")
+ private String rewardPunishWorkUnit;
@ApiModelProperty(value = "鍒涘缓鏃堕棿", hidden = true)
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
@ApiModelProperty(value = "鏇存柊鏃堕棿", hidden = true)
- @TableField(fill = FieldFill.INSERT)
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
@ApiModelProperty(value = "鍒涘缓浜�", hidden = true)
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
+
+ @ApiModelProperty(value = "鏇存柊浜�", hidden = true)
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Integer updateUser;
}
--
Gitblit v1.9.3