From 9010b5b3d735abc84c61a88eb2f1483c3acf440f Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期一, 19 十月 2026 17:12:16 +0800
Subject: [PATCH] feat: 添加员工工资明细中的请假、缺勤、迟到、早退次数及手动扣工资字段
---
src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java | 11 +++++++++++
1 files changed, 11 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..f15b9b9 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;
@@ -217,6 +218,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(
@@ -258,6 +264,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