From d476e7d1595e131f2bb7bb1a62c00fa3e82fb0a7 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期一, 19 十月 2026 17:23:30 +0800
Subject: [PATCH] feat: 添加员工工资明细中的请假、缺勤、迟到、早退次数及手动扣工资字段
---
sql/20261019_staff_salary_detail_add_leave_attendance_deduct.sql | 6 +++---
src/main/java/com/ruoyi/staff/pojo/StaffSalaryDetail.java | 4 ++--
src/main/java/com/ruoyi/staff/service/impl/SchemeApplicableStaffServiceImpl.java | 2 +-
sql/product-inventory-management-new-pro.sql | 6 +++---
src/main/java/com/ruoyi/staff/excel/StaffSalaryExportData.java | 4 ++--
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/sql/20261019_staff_salary_detail_add_leave_attendance_deduct.sql b/sql/20261019_staff_salary_detail_add_leave_attendance_deduct.sql
index f9a8b06..34bd4d8 100644
--- a/sql/20261019_staff_salary_detail_add_leave_attendance_deduct.sql
+++ b/sql/20261019_staff_salary_detail_add_leave_attendance_deduct.sql
@@ -1,6 +1,6 @@
-- ----------------------------
--- 鍛樺伐宸ヨ祫鏄庣粏鏂板锛氳鍋囨鏁般�佺己鍕ゆ鏁般�佽繜鍒版鏁般�佹棭閫�娆℃暟銆佹墸宸ヨ祫锛堟墜濉級
--- 鍒椾綅缃細搴旀墸宸ヨ祫(deduct_salary) 涔嬪悗銆佸疄鍙戝伐璧�(net_salary) 涔嬪墠
+-- 鍛樺伐宸ヨ祫鏄庣粏鏂板锛氳鍋囨鏁般�佺己鍕ゆ鏁般�佽繜鍒版鏁般�佹棭閫�娆℃暟銆佸簲鎵ｅ伐璧勶紙鎵嬪～锛�
+-- 鍒椾綅缃細搴旀墸绀句繚(deduct_salary) 涔嬪悗銆佸疄鍙戝伐璧�(net_salary) 涔嬪墠
-- 鎵ц鐜锛氬凡鏈夊簱鍗囩骇锛堝叏閲忚剼鏈� product-inventory-management-new-pro.sql 宸插悓姝ワ級
-- ----------------------------
ALTER TABLE `staff_salary_detail`
@@ -8,7 +8,7 @@
ADD COLUMN `absence_count` int NULL DEFAULT 0 COMMENT '缂哄嫟娆℃暟' AFTER `leave_count`,
ADD COLUMN `late_count` int NULL DEFAULT 0 COMMENT '杩熷埌娆℃暟' AFTER `absence_count`,
ADD COLUMN `early_count` int NULL DEFAULT 0 COMMENT '鏃╅��娆℃暟' AFTER `late_count`,
- ADD COLUMN `manual_deduct` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '鎵ｅ伐璧勶紙鎵嬪姩濉啓锛�' AFTER `early_count`;
+ ADD COLUMN `manual_deduct` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '搴旀墸宸ヨ祫锛堟墜鍔ㄥ～鍐欙級' AFTER `early_count`;
ALTER TABLE staff_salary_detail
MODIFY COLUMN remark text NULL COMMENT '澶囨敞';
diff --git a/sql/product-inventory-management-new-pro.sql b/sql/product-inventory-management-new-pro.sql
index 20746ca..5e24716 100644
--- a/sql/product-inventory-management-new-pro.sql
+++ b/sql/product-inventory-management-new-pro.sql
@@ -4672,14 +4672,14 @@
`other_deduct` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '鍏朵粬鏀嚭',
`salary_tax` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '宸ヨ祫涓◣',
`gross_salary` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '搴斿彂宸ヨ祫',
- `deduct_salary` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '搴旀墸宸ヨ祫',
+ `deduct_salary` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '搴旀墸绀句繚',
`leave_count` int NULL DEFAULT 0 COMMENT '璇峰亣娆℃暟',
`absence_count` int NULL DEFAULT 0 COMMENT '缂哄嫟娆℃暟',
`late_count` int NULL DEFAULT 0 COMMENT '杩熷埌娆℃暟',
`early_count` int NULL DEFAULT 0 COMMENT '鏃╅��娆℃暟',
- `manual_deduct` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '鎵ｅ伐璧勶紙鎵嬪姩濉啓锛�',
+ `manual_deduct` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '搴旀墸宸ヨ祫锛堟墜鍔ㄥ～鍐欙級',
`net_salary` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '瀹炲彂宸ヨ祫',
- `remark` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '澶囨敞',
+ `remark` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '澶囨敞',
`create_time` datetime NULL DEFAULT NULL COMMENT '鍒涘缓鏃堕棿',
`create_user` bigint NULL DEFAULT NULL COMMENT '鍒涘缓鐢ㄦ埛',
`update_time` datetime NULL DEFAULT NULL COMMENT '淇敼鏃堕棿',
diff --git a/src/main/java/com/ruoyi/staff/excel/StaffSalaryExportData.java b/src/main/java/com/ruoyi/staff/excel/StaffSalaryExportData.java
index e466241..67a1d1b 100644
--- a/src/main/java/com/ruoyi/staff/excel/StaffSalaryExportData.java
+++ b/src/main/java/com/ruoyi/staff/excel/StaffSalaryExportData.java
@@ -53,7 +53,7 @@
@Excel(name = "搴斿彂宸ヨ祫")
private BigDecimal grossSalary;
- @Excel(name = "搴旀墸宸ヨ祫")
+ @Excel(name = "搴旀墸绀句繚")
private BigDecimal deductSalary;
@Excel(name = "璇峰亣娆℃暟")
@@ -68,7 +68,7 @@
@Excel(name = "鏃╅��娆℃暟")
private Integer earlyCount;
- @Excel(name = "鎵ｅ伐璧�")
+ @Excel(name = "搴旀墸宸ヨ祫")
private BigDecimal manualDeduct;
@Excel(name = "瀹炲彂宸ヨ祫")
diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffSalaryDetail.java b/src/main/java/com/ruoyi/staff/pojo/StaffSalaryDetail.java
index a5841c1..b9cd992 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffSalaryDetail.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffSalaryDetail.java
@@ -77,7 +77,7 @@
@Schema(description = "搴斿彂宸ヨ祫")
private BigDecimal grossSalary;
- @Schema(description = "搴旀墸宸ヨ祫")
+ @Schema(description = "搴旀墸绀句繚")
private BigDecimal deductSalary;
@Schema(description = "璇峰亣娆℃暟")
@@ -92,7 +92,7 @@
@Schema(description = "鏃╅��娆℃暟")
private Integer earlyCount;
- @Schema(description = "鎵ｅ伐璧勶紙鎵嬪姩濉啓锛�")
+ @Schema(description = "搴旀墸宸ヨ祫锛堟墜鍔ㄥ～鍐欙級")
private BigDecimal manualDeduct;
@Schema(description = "瀹炲彂宸ヨ祫")
diff --git a/src/main/java/com/ruoyi/staff/service/impl/SchemeApplicableStaffServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/SchemeApplicableStaffServiceImpl.java
index 989af81..fe84134 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/SchemeApplicableStaffServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/SchemeApplicableStaffServiceImpl.java
@@ -215,7 +215,7 @@
.add(socialPersonal)
.add(socialSupplementAmount)
.add(otherDeduct);
- // 鎵ｅ伐璧勶紙鎵嬪姩濉啓锛夛紝浠庡疄鍙戝伐璧勪腑鎵ｉ櫎
+ // 搴旀墸宸ヨ祫锛堟墜鍔ㄥ～鍐欙級锛屼粠瀹炲彂宸ヨ祫涓墸闄�
BigDecimal manualDeduct = normalizeMoney(getBigDecimal(map, "manualDeduct"));
BigDecimal netSalary = grossSalary.subtract(deductSalary).subtract(manualDeduct);
--
Gitblit v1.9.3