From ef1052e7bf9bf1765d61776bc49ce69a23c6cdee Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 20 十月 2026 00:25:29 +0800
Subject: [PATCH] feat: 添加加班时长和加班工资字段到员工工资明细
---
src/main/java/com/ruoyi/staff/service/impl/SchemeApplicableStaffServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
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..c7ad83a 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/SchemeApplicableStaffServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/SchemeApplicableStaffServiceImpl.java
@@ -174,6 +174,8 @@
: calculateLatestDeptSocialSupplementAmount(staffOnJobDto);
BigDecimal pieceSalary = normalizeMoney(getBigDecimal(map, "pieceSalary"));
BigDecimal hourlySalary = normalizeMoney(getBigDecimal(map, "hourlySalary"));
+ // 鍔犵彮宸ヨ祫锛氭墜宸ュ～鍐欙紝涓嶆寜鍊嶇巼鑷姩璁＄畻
+ BigDecimal overtimePay = normalizeMoney(getBigDecimal(map, "overtimePay"));
BigDecimal socialPersonal = BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP);
BigDecimal fundPersonal = BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP);
@@ -204,7 +206,7 @@
}
}
- BigDecimal grossSalary = basicSalary.add(pieceSalary).add(hourlySalary).add(otherIncome);
+ BigDecimal grossSalary = basicSalary.add(pieceSalary).add(hourlySalary).add(overtimePay).add(otherIncome);
BigDecimal salaryTax = TaxCalculator.calculateMonthlyTax(
grossSalary,
socialPersonal.add(socialSupplementAmount),
@@ -215,7 +217,7 @@
.add(socialPersonal)
.add(socialSupplementAmount)
.add(otherDeduct);
- // 鎵ｅ伐璧勶紙鎵嬪姩濉啓锛夛紝浠庡疄鍙戝伐璧勪腑鎵ｉ櫎
+ // 搴旀墸宸ヨ祫锛堟墜鍔ㄥ～鍐欙級锛屼粠瀹炲彂宸ヨ祫涓墸闄�
BigDecimal manualDeduct = normalizeMoney(getBigDecimal(map, "manualDeduct"));
BigDecimal netSalary = grossSalary.subtract(deductSalary).subtract(manualDeduct);
@@ -231,6 +233,8 @@
map.put("basicSalary", basicSalary);
map.put("pieceSalary", pieceSalary);
map.put("hourlySalary", hourlySalary);
+ map.put("overtimeHours", salaryStat.getOvertimeHours());
+ map.put("overtimePay", overtimePay);
map.put("otherIncome", otherIncome);
map.put("socialPersonal", socialPersonal);
map.put("fundPersonal", fundPersonal);
--
Gitblit v1.9.3