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/StaffSalaryMainServiceImpl.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
index f15b9b9..f3974d6 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
@@ -210,6 +210,7 @@
}
map.put("pieceSalary", staffSalaryCalculateDto.getPieceSalary());
map.put("hourlySalary", staffSalaryCalculateDto.getHourlySalary());
+ map.put("overtimePay", staffSalaryCalculateDto.getOvertimePay());
map.put("otherIncome", staffSalaryCalculateDto.getOtherIncome());
map.put("socialPersonal", staffSalaryCalculateDto.getSocialPersonal());
map.put("fundPersonal", staffSalaryCalculateDto.getFundPersonal());
@@ -256,6 +257,8 @@
exportData.setBasicSalary(detail.getBasicSalary());
exportData.setPieceSalary(detail.getPieceSalary());
exportData.setHourlySalary(detail.getHourlySalary());
+ exportData.setOvertimeHours(detail.getOvertimeHours() == null ? BigDecimal.ZERO : detail.getOvertimeHours());
+ exportData.setOvertimePay(detail.getOvertimePay() == null ? BigDecimal.ZERO : detail.getOvertimePay());
exportData.setOtherIncome(detail.getOtherIncome());
exportData.setSocialPersonal(detail.getSocialPersonal());
exportData.setFundPersonal(detail.getFundPersonal());
--
Gitblit v1.9.3