From e8d08ebdd187f99f793cd839038dd5c392cdfbd8 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 09 二月 2026 17:56:36 +0800
Subject: [PATCH] fix: 修改人员薪资接口
---
src/main/java/com/ruoyi/compensationperformance/pojo/CompensationPerformance.java | 196 +++++++++++++++++++-----------------------------
1 files changed, 77 insertions(+), 119 deletions(-)
diff --git a/src/main/java/com/ruoyi/compensationperformance/pojo/CompensationPerformance.java b/src/main/java/com/ruoyi/compensationperformance/pojo/CompensationPerformance.java
index 5fb2c7a..686b975 100644
--- a/src/main/java/com/ruoyi/compensationperformance/pojo/CompensationPerformance.java
+++ b/src/main/java/com/ruoyi/compensationperformance/pojo/CompensationPerformance.java
@@ -8,70 +8,66 @@
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
+import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date;
/**
+ * 钖叕缁╂晥鏄庣粏
+ *
* @author :yys
- * @date : 2025/8/8 9:40
+ * @date : 2025/8/8
*/
@Data
@TableName("compensation_performance")
-@ApiModel
-public class CompensationPerformance {
-
+@ApiModel("钖叕缁╂晥鏄庣粏")
+public class CompensationPerformance implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
+ @ApiModelProperty("涓婚敭")
private Long id;
/**
* 鍛樺伐id
*/
@ApiModelProperty("鍛樺伐id")
- @Excel(name = "鍛樺伐id")
private Long staffId;
/**
- * 濮撳悕
+ * 鍛樺伐濮撳悕
*/
- @ApiModelProperty("濮撳悕")
- @Excel(name = "濮撳悕")
- private String name;
+ @ApiModelProperty("鍛樺伐濮撳悕")
+ @Excel(name = "鍛樺伐濮撳悕")
+ @TableField(exist = false)
+ private String staffName;
/**
- * 钖祫鏈堜唤(鏌ヨ)
+ * 宀椾綅鍚嶇О
*/
- @ApiModelProperty("钖祫鏈堜唤(鏌ヨ)")
+ @ApiModelProperty("宀椾綅鍚嶇О")
+ @Excel(name = "宀椾綅鍚嶇О")
@TableField(exist = false)
- private String payDateStr;
+ private String postName;
+
+ /**
+ * 閮ㄩ棬鍚嶇О
+ */
+ @ApiModelProperty("閮ㄩ棬鍚嶇О")
+ @Excel(name = "閮ㄩ棬鍚嶇О")
+ @TableField(exist = false)
+ private String deptName;
/**
* 钖祫鏈堜唤
*/
@ApiModelProperty("钖祫鏈堜唤")
- @Excel(name = "钖祫鏈堜唤", dateFormat = "yyyy-MM", width = 30)
+ @Excel(name = "鏈堜唤", dateFormat = "yyyy-MM", width = 20)
@JsonFormat(pattern = "yyyy-MM", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM")
private Date payDate;
-
-
- /**
- * 搴斿嚭鍕ゅぉ鏁�
- */
- @ApiModelProperty("搴斿嚭鍕ゅぉ鏁�")
- @Excel(name = "搴斿嚭鍕ゅぉ鏁�")
- private BigDecimal shouldAttendedNum;
-
- /**
- * 瀹為檯鍑哄嫟澶╂暟
- */
- @ApiModelProperty("瀹為檯鍑哄嫟澶╂暟")
- @Excel(name = "瀹為檯鍑哄嫟澶╂暟")
- private BigDecimal actualAttendedNum;
-
/**
* 鍩烘湰宸ヨ祫
@@ -81,61 +77,25 @@
private BigDecimal basicSalary;
/**
- * 宀椾綅宸ヨ祫
+ * 璁′欢宸ヨ祫
*/
- @ApiModelProperty("宀椾綅宸ヨ祫")
- @Excel(name = "宀椾綅宸ヨ祫")
- private BigDecimal postSalary;
+ @ApiModelProperty("璁′欢宸ヨ祫")
+ @Excel(name = "璁′欢宸ヨ祫")
+ private BigDecimal pieceworkSalary;
/**
- * 鍏ョ鑱岀己鍕ゆ墸娆�
+ * 璁℃椂宸ヨ祫
*/
- @ApiModelProperty("鍏ョ鑱岀己鍕ゆ墸娆�")
- @Excel(name = "鍏ョ鑱岀己鍕ゆ墸娆�")
- private BigDecimal deductionAbsenteeism;
-
+ @ApiModelProperty("璁℃椂宸ヨ祫")
+ @Excel(name = "璁℃椂宸ヨ祫")
+ private BigDecimal hourlySalary;
/**
- * 鐥呭亣鎵ｆ
+ * 鍏朵粬鏀跺叆
*/
- @ApiModelProperty("鐥呭亣鎵ｆ")
- @Excel(name = "鐥呭亣鎵ｆ")
- private BigDecimal sickLeaveDeductions;
-
- /**
- * 浜嬪亣鎵ｆ
- */
- @ApiModelProperty("浜嬪亣鎵ｆ")
- @Excel(name = "浜嬪亣鎵ｆ")
- private BigDecimal deductionPersonalLeave;
- /**
- * 蹇樿鎵撳崱鎵ｆ
- */
- @ApiModelProperty("蹇樿鎵撳崱鎵ｆ")
- @Excel(name = "蹇樿鎵撳崱鎵ｆ")
- private BigDecimal forgetClockDeduct;
-
- /**
- * 缁╂晥寰楀垎
- */
- @ApiModelProperty("缁╂晥寰楀垎")
- @Excel(name = "缁╂晥寰楀垎")
- private BigDecimal performanceScore;
-
- /**
- * 缁╂晥宸ヨ祫
- */
- @ApiModelProperty("缁╂晥宸ヨ祫")
- @Excel(name = "缁╂晥宸ヨ祫")
- private BigDecimal performancePay;
-
-
- /**
- * 搴斿彂鍚堣
- */
- @ApiModelProperty("搴斿彂鍚堣")
- @Excel(name = "搴斿彂鍚堣")
- private BigDecimal payableWages;
+ @ApiModelProperty("鍏朵粬鏀跺叆")
+ @Excel(name = "鍏朵粬鏀跺叆")
+ private BigDecimal otherIncome;
/**
* 绀句繚涓汉
@@ -143,32 +103,6 @@
@ApiModelProperty("绀句繚涓汉")
@Excel(name = "绀句繚涓汉")
private BigDecimal socialSecurityIndividuals;
- /**
- * 绀句繚鍏徃
- */
- @ApiModelProperty("绀句繚鍏徃")
- @Excel(name = "绀句繚鍏徃")
- private BigDecimal socialSecurityCompanies;
-
- /**
- * 绀句繚鍚堣
- */
- @ApiModelProperty("绀句繚鍚堣")
- @Excel(name = "绀句繚鍚堣")
- private BigDecimal socialSecurityTotal;
-
- /**
- * 鍏Н閲戝悎璁�
- */
- @ApiModelProperty("鍏Н閲戝悎璁�")
- @Excel(name = "鍏Н閲戝悎璁�")
- private BigDecimal providentFundTotal;
- /**
- * 鍏Н閲戝叕鍙�
- */
- @ApiModelProperty("鍏Н閲戝叕鍙�")
- @Excel(name = "鍏Н閲戝叕鍙�")
- private BigDecimal providentFundCompany;
/**
* 鍏Н閲戜釜浜�
@@ -178,17 +112,32 @@
private BigDecimal providentFundIndividuals;
/**
- * 搴旂◣宸ヨ祫
+ * 宸ヨ祫涓◣
*/
- @ApiModelProperty("搴旂◣宸ヨ祫")
- @Excel(name = "搴旂◣宸ヨ祫")
- private BigDecimal taxableWaget;
- /**
- * 涓汉鎵�寰楃◣
- */
- @ApiModelProperty("涓汉鎵�寰楃◣")
- @Excel(name = "涓汉鎵�寰楃◣")
+ @ApiModelProperty("宸ヨ祫涓◣")
+ @Excel(name = "宸ヨ祫涓◣")
private BigDecimal personalIncomeTax;
+
+ /**
+ * 鍏朵粬鏀嚭
+ */
+ @ApiModelProperty("鍏朵粬鏀嚭")
+ @Excel(name = "鍏朵粬鏀嚭")
+ private BigDecimal otherDeductions;
+
+ /**
+ * 搴斿彂宸ヨ祫
+ */
+ @ApiModelProperty("搴斿彂宸ヨ祫")
+ @Excel(name = "搴斿彂宸ヨ祫")
+ private BigDecimal payableWages;
+
+ /**
+ * 搴旀墸宸ヨ祫
+ */
+ @ApiModelProperty("搴旀墸宸ヨ祫")
+ @Excel(name = "搴旀墸宸ヨ祫")
+ private BigDecimal deductibleWages;
/**
* 瀹炲彂宸ヨ祫
@@ -196,6 +145,19 @@
@ApiModelProperty("瀹炲彂宸ヨ祫")
@Excel(name = "瀹炲彂宸ヨ祫")
private BigDecimal actualWages;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty("澶囨敞")
+ @Excel(name = "澶囨敞")
+ private String remark;
+
+ /**
+ * 绉熸埛ID
+ */
+ @TableField(fill = FieldFill.INSERT)
+ private Long tenantId;
/**
* 鍒涘缓鑰�
@@ -207,6 +169,7 @@
* 鍒涘缓鏃堕棿
*/
@TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime;
/**
@@ -219,12 +182,7 @@
* 淇敼鏃堕棿
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime updateTime;
- /**
- * 绉熸埛ID
- */
- @TableField(fill = FieldFill.INSERT)
- private Long tenantId;
-
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3