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 | 14 ++++++++++++++
1 files changed, 14 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 41f8af3..f3974d6 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
@@ -25,6 +25,7 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -209,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());
@@ -217,6 +219,11 @@
map.put("salaryTax", staffSalaryCalculateDto.getSalaryTax());
map.put("grossSalary", staffSalaryCalculateDto.getGrossSalary());
map.put("deductSalary", staffSalaryCalculateDto.getDeductSalary());
+ map.put("leaveCount", staffSalaryCalculateDto.getLeaveCount());
+ map.put("absenceCount", staffSalaryCalculateDto.getAbsenceCount());
+ map.put("lateCount", staffSalaryCalculateDto.getLateCount());
+ map.put("earlyCount", staffSalaryCalculateDto.getEarlyCount());
+ map.put("manualDeduct", staffSalaryCalculateDto.getManualDeduct());
map.put("netSalary", staffSalaryCalculateDto.getNetSalary());
map.put("remark", staffSalaryCalculateDto.getRemark());
schemeApplicableStaffService.calculateByEmployeeId(
@@ -250,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());
@@ -258,6 +267,11 @@
exportData.setSalaryTax(detail.getSalaryTax());
exportData.setGrossSalary(detail.getGrossSalary());
exportData.setDeductSalary(detail.getDeductSalary());
+ exportData.setLeaveCount(detail.getLeaveCount() == null ? 0 : detail.getLeaveCount());
+ exportData.setAbsenceCount(detail.getAbsenceCount() == null ? 0 : detail.getAbsenceCount());
+ exportData.setLateCount(detail.getLateCount() == null ? 0 : detail.getLateCount());
+ exportData.setEarlyCount(detail.getEarlyCount() == null ? 0 : detail.getEarlyCount());
+ exportData.setManualDeduct(detail.getManualDeduct() == null ? BigDecimal.ZERO : detail.getManualDeduct());
exportData.setNetSalary(detail.getNetSalary());
exportData.setRemark(detail.getRemark());
exportDataList.add(exportData);
--
Gitblit v1.9.3