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 | 88 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 82 insertions(+), 6 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 2cf0996..f15b9b9 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
@@ -6,6 +6,8 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.project.system.domain.SysDept;
+import com.ruoyi.project.system.mapper.SysDeptMapper;
import com.ruoyi.project.system.mapper.SysUserDeptMapper;
import com.ruoyi.staff.excel.StaffSalaryExportData;
import jakarta.servlet.http.HttpServletResponse;
@@ -23,10 +25,14 @@
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;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Set;
/**
* <p>
@@ -46,6 +52,7 @@
private final SchemeApplicableStaffServiceImpl schemeApplicableStaffService;
private final SysUserDeptMapper sysUserDeptMapper;
private final StaffLeaveMapper staffLeaveMapper;
+ private final SysDeptMapper sysDeptMapper;
@Override
public AjaxResult listPage(Page page, StaffSalaryMain staffSalaryMain) {
@@ -79,12 +86,16 @@
Integer status = staffSalaryMain.getStatus();
if (status != null && status == 5) {
String salaryMonth = staffSalaryMain.getSalaryMonth();
- long count = staffSalaryMainMapper.selectCount(new LambdaQueryWrapper<StaffSalaryMain>()
+ String deptIds = staffSalaryMain.getDeptIds();
+
+ List<StaffSalaryMain> issuedList = staffSalaryMainMapper.selectList(new LambdaQueryWrapper<StaffSalaryMain>()
.eq(StaffSalaryMain::getSalaryMonth, salaryMonth)
.eq(StaffSalaryMain::getStatus, 5));
- if (count > 0) {
- return AjaxResult.error("鍚屼竴鏈堜唤宸ヨ祫涓嶅彲浠ュ彂鏀惧娆�");
+ for (StaffSalaryMain issued : issuedList) {
+ if (hasOverlappingDept(deptIds, issued.getDeptIds())) {
+ return AjaxResult.error("鍚屼竴鏈堜唤鍚屼竴閮ㄩ棬宸ヨ祫涓嶅彲浠ュ彂鏀惧娆�");
+ }
}
}
@@ -112,13 +123,20 @@
if (StringUtils.isEmpty(salaryMonth)) {
salaryMonth = staffSalaryMain1.getSalaryMonth();
}
- long count = staffSalaryMainMapper.selectCount(new LambdaQueryWrapper<StaffSalaryMain>()
+ String deptIds = staffSalaryMain.getDeptIds();
+ if (StringUtils.isEmpty(deptIds)) {
+ deptIds = staffSalaryMain1.getDeptIds();
+ }
+
+ List<StaffSalaryMain> issuedList = staffSalaryMainMapper.selectList(new LambdaQueryWrapper<StaffSalaryMain>()
.eq(StaffSalaryMain::getSalaryMonth, salaryMonth)
.eq(StaffSalaryMain::getStatus, 5)
.ne(StaffSalaryMain::getId, staffSalaryMain.getId()));
- if (count > 0) {
- return AjaxResult.error("鍚屼竴鏈堜唤宸ヨ祫涓嶅彲浠ュ彂鏀惧娆�");
+ for (StaffSalaryMain issued : issuedList) {
+ if (hasOverlappingDept(deptIds, issued.getDeptIds())) {
+ return AjaxResult.error("鍚屼竴鏈堜唤鍚屼竴閮ㄩ棬宸ヨ祫涓嶅彲浠ュ彂鏀惧娆�");
+ }
}
}
@@ -200,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(
@@ -241,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);
@@ -259,4 +287,52 @@
return sysUserDeptMapper.setSchemeApplicableStaffUserInfo(ids);
}
+ @Override
+ public AjaxResult getAvailableDepts(String salaryMonth) {
+ if (StringUtils.isEmpty(salaryMonth)) {
+ return AjaxResult.error("宸ヨ祫鏈堜唤涓嶈兘涓虹┖");
+ }
+
+ List<String> issuedDeptIdStrings = staffSalaryMainMapper.selectIssuedDeptIds(salaryMonth);
+
+ Set<Long> issuedDeptIds = new HashSet<>();
+ for (String deptIds : issuedDeptIdStrings) {
+ if (StringUtils.isNotEmpty(deptIds)) {
+ String[] ids = deptIds.split(",");
+ for (String id : ids) {
+ issuedDeptIds.add(Long.parseLong(id.trim()));
+ }
+ }
+ }
+
+ List<SysDept> allDepts = sysDeptMapper.selectList(new LambdaQueryWrapper<SysDept>()
+ .eq(SysDept::getStatus, "0")
+ .eq(SysDept::getDelFlag, "0"));
+
+ List<SysDept> availableDepts = new ArrayList<>();
+ for (SysDept dept : allDepts) {
+ if (!issuedDeptIds.contains(dept.getDeptId())) {
+ availableDepts.add(dept);
+ }
+ }
+
+ return AjaxResult.success(availableDepts);
+ }
+
+ private boolean hasOverlappingDept(String deptIds1, String deptIds2) {
+ if (StringUtils.isEmpty(deptIds1) || StringUtils.isEmpty(deptIds2)) {
+ return false;
+ }
+
+ Set<String> deptSet1 = new HashSet<>(Arrays.asList(deptIds1.split(",")));
+ String[] deptArray2 = deptIds2.split(",");
+
+ for (String deptId : deptArray2) {
+ if (deptSet1.contains(deptId.trim())) {
+ return true;
+ }
+ }
+ return false;
+ }
+
}
--
Gitblit v1.9.3