From 3f3a1ed182e96214e66f6456ee692427bf04d454 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 28 十一月 2025 11:10:23 +0800
Subject: [PATCH] yys 1.库存管理导出修改 2.来票登记分页查询修改
---
src/main/java/com/ruoyi/compensationperformance/pojo/CompensationPerformance.java | 45 ++++++++++++++++++++++-----------------------
1 files changed, 22 insertions(+), 23 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..84d6138 100644
--- a/src/main/java/com/ruoyi/compensationperformance/pojo/CompensationPerformance.java
+++ b/src/main/java/com/ruoyi/compensationperformance/pojo/CompensationPerformance.java
@@ -28,10 +28,9 @@
private Long id;
/**
- * 鍛樺伐id
+ * 鐢ㄦ埛id
*/
- @ApiModelProperty("鍛樺伐id")
- @Excel(name = "鍛樺伐id")
+ @ApiModelProperty("鐢ㄦ埛id")
private Long staffId;
/**
@@ -62,14 +61,14 @@
* 搴斿嚭鍕ゅぉ鏁�
*/
@ApiModelProperty("搴斿嚭鍕ゅぉ鏁�")
- @Excel(name = "搴斿嚭鍕ゅぉ鏁�")
+// @Excel(name = "搴斿嚭鍕ゅぉ鏁�")
private BigDecimal shouldAttendedNum;
/**
* 瀹為檯鍑哄嫟澶╂暟
*/
@ApiModelProperty("瀹為檯鍑哄嫟澶╂暟")
- @Excel(name = "瀹為檯鍑哄嫟澶╂暟")
+// @Excel(name = "瀹為檯鍑哄嫟澶╂暟")
private BigDecimal actualAttendedNum;
@@ -77,21 +76,21 @@
* 鍩烘湰宸ヨ祫
*/
@ApiModelProperty("鍩烘湰宸ヨ祫")
- @Excel(name = "鍩烘湰宸ヨ祫")
+// @Excel(name = "鍩烘湰宸ヨ祫")
private BigDecimal basicSalary;
/**
* 宀椾綅宸ヨ祫
*/
@ApiModelProperty("宀椾綅宸ヨ祫")
- @Excel(name = "宀椾綅宸ヨ祫")
+// @Excel(name = "宀椾綅宸ヨ祫")
private BigDecimal postSalary;
/**
* 鍏ョ鑱岀己鍕ゆ墸娆�
*/
@ApiModelProperty("鍏ョ鑱岀己鍕ゆ墸娆�")
- @Excel(name = "鍏ョ鑱岀己鍕ゆ墸娆�")
+// @Excel(name = "鍏ョ鑱岀己鍕ゆ墸娆�")
private BigDecimal deductionAbsenteeism;
@@ -99,34 +98,34 @@
* 鐥呭亣鎵ｆ
*/
@ApiModelProperty("鐥呭亣鎵ｆ")
- @Excel(name = "鐥呭亣鎵ｆ")
+// @Excel(name = "鐥呭亣鎵ｆ")
private BigDecimal sickLeaveDeductions;
/**
* 浜嬪亣鎵ｆ
*/
@ApiModelProperty("浜嬪亣鎵ｆ")
- @Excel(name = "浜嬪亣鎵ｆ")
+// @Excel(name = "浜嬪亣鎵ｆ")
private BigDecimal deductionPersonalLeave;
/**
* 蹇樿鎵撳崱鎵ｆ
*/
@ApiModelProperty("蹇樿鎵撳崱鎵ｆ")
- @Excel(name = "蹇樿鎵撳崱鎵ｆ")
+// @Excel(name = "蹇樿鎵撳崱鎵ｆ")
private BigDecimal forgetClockDeduct;
/**
* 缁╂晥寰楀垎
*/
@ApiModelProperty("缁╂晥寰楀垎")
- @Excel(name = "缁╂晥寰楀垎")
+// @Excel(name = "缁╂晥寰楀垎")
private BigDecimal performanceScore;
/**
* 缁╂晥宸ヨ祫
*/
@ApiModelProperty("缁╂晥宸ヨ祫")
- @Excel(name = "缁╂晥宸ヨ祫")
+// @Excel(name = "缁╂晥宸ヨ祫")
private BigDecimal performancePay;
@@ -134,67 +133,67 @@
* 搴斿彂鍚堣
*/
@ApiModelProperty("搴斿彂鍚堣")
- @Excel(name = "搴斿彂鍚堣")
+// @Excel(name = "搴斿彂鍚堣")
private BigDecimal payableWages;
/**
* 绀句繚涓汉
*/
@ApiModelProperty("绀句繚涓汉")
- @Excel(name = "绀句繚涓汉")
+// @Excel(name = "绀句繚涓汉")
private BigDecimal socialSecurityIndividuals;
/**
* 绀句繚鍏徃
*/
@ApiModelProperty("绀句繚鍏徃")
- @Excel(name = "绀句繚鍏徃")
+// @Excel(name = "绀句繚鍏徃")
private BigDecimal socialSecurityCompanies;
/**
* 绀句繚鍚堣
*/
@ApiModelProperty("绀句繚鍚堣")
- @Excel(name = "绀句繚鍚堣")
+// @Excel(name = "绀句繚鍚堣")
private BigDecimal socialSecurityTotal;
/**
* 鍏Н閲戝悎璁�
*/
@ApiModelProperty("鍏Н閲戝悎璁�")
- @Excel(name = "鍏Н閲戝悎璁�")
+// @Excel(name = "鍏Н閲戝悎璁�")
private BigDecimal providentFundTotal;
/**
* 鍏Н閲戝叕鍙�
*/
@ApiModelProperty("鍏Н閲戝叕鍙�")
- @Excel(name = "鍏Н閲戝叕鍙�")
+// @Excel(name = "鍏Н閲戝叕鍙�")
private BigDecimal providentFundCompany;
/**
* 鍏Н閲戜釜浜�
*/
@ApiModelProperty("鍏Н閲戜釜浜�")
- @Excel(name = "鍏Н閲戜釜浜�")
+// @Excel(name = "鍏Н閲戜釜浜�")
private BigDecimal providentFundIndividuals;
/**
* 搴旂◣宸ヨ祫
*/
@ApiModelProperty("搴旂◣宸ヨ祫")
- @Excel(name = "搴旂◣宸ヨ祫")
+// @Excel(name = "搴旂◣宸ヨ祫")
private BigDecimal taxableWaget;
/**
* 涓汉鎵�寰楃◣
*/
@ApiModelProperty("涓汉鎵�寰楃◣")
- @Excel(name = "涓汉鎵�寰楃◣")
+// @Excel(name = "涓汉鎵�寰楃◣")
private BigDecimal personalIncomeTax;
/**
* 瀹炲彂宸ヨ祫
*/
@ApiModelProperty("瀹炲彂宸ヨ祫")
- @Excel(name = "瀹炲彂宸ヨ祫")
+ @Excel(name = "瀹炲彂宸ヨ祫", width = 30)
private BigDecimal actualWages;
/**
--
Gitblit v1.9.3