From d8e10fd010b73a2828af9de2a8fba9222a49ded9 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 15 六月 2026 17:41:39 +0800
Subject: [PATCH] 同一月份同一部门工资不可以发放多次
---
src/main/resources/mapper/staff/StaffSalaryMainMapper.xml | 7 +++
src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java | 6 +++
src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java | 77 +++++++++++++++++++++++++++++++++++---
src/main/java/com/ruoyi/staff/mapper/StaffSalaryMainMapper.java | 4 ++
src/main/java/com/ruoyi/staff/service/StaffSalaryMainService.java | 2 +
5 files changed, 90 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java b/src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java
index d5692e6..d30bf3a 100644
--- a/src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java
+++ b/src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java
@@ -81,4 +81,10 @@
staffSalaryMainService.exportSalaryDetail(response, salaryMonth);
}
+ @GetMapping("/availableDepts")
+ @Operation(summary = "鑾峰彇鍙�夐儴闂紙鎺掗櫎宸插彂鏀惧伐璧勮〃鐨勯儴闂級")
+ public AjaxResult getAvailableDepts(String salaryMonth) {
+ return staffSalaryMainService.getAvailableDepts(salaryMonth);
+ }
+
}
diff --git a/src/main/java/com/ruoyi/staff/mapper/StaffSalaryMainMapper.java b/src/main/java/com/ruoyi/staff/mapper/StaffSalaryMainMapper.java
index eca5dbe..7e29494 100644
--- a/src/main/java/com/ruoyi/staff/mapper/StaffSalaryMainMapper.java
+++ b/src/main/java/com/ruoyi/staff/mapper/StaffSalaryMainMapper.java
@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
+import java.util.List;
+
/**
* <p>
* 鍛樺伐宸ヨ祫涓昏〃 Mapper 鎺ュ彛
@@ -15,4 +17,6 @@
@Mapper
public interface StaffSalaryMainMapper extends BaseMapper<StaffSalaryMain> {
+ List<String> selectIssuedDeptIds(String salaryMonth);
+
}
diff --git a/src/main/java/com/ruoyi/staff/service/StaffSalaryMainService.java b/src/main/java/com/ruoyi/staff/service/StaffSalaryMainService.java
index f53d103..0317a3b 100644
--- a/src/main/java/com/ruoyi/staff/service/StaffSalaryMainService.java
+++ b/src/main/java/com/ruoyi/staff/service/StaffSalaryMainService.java
@@ -33,4 +33,6 @@
AjaxResult calculateSalaryByEmployee(StaffSalaryCalculateDto staffSalaryCalculateDto);
void exportSalaryDetail(HttpServletResponse response, String salaryMonth);
+
+ AjaxResult getAvailableDepts(String salaryMonth);
}
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..41f8af3 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;
@@ -24,9 +26,12 @@
import org.springframework.util.CollectionUtils;
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 +51,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 +85,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 +122,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("鍚屼竴鏈堜唤鍚屼竴閮ㄩ棬宸ヨ祫涓嶅彲浠ュ彂鏀惧娆�");
+ }
}
}
@@ -259,4 +276,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;
+ }
+
}
diff --git a/src/main/resources/mapper/staff/StaffSalaryMainMapper.xml b/src/main/resources/mapper/staff/StaffSalaryMainMapper.xml
index c3f0c62..bec4e6d 100644
--- a/src/main/resources/mapper/staff/StaffSalaryMainMapper.xml
+++ b/src/main/resources/mapper/staff/StaffSalaryMainMapper.xml
@@ -16,4 +16,11 @@
<result column="update_user" property="updateUser" />
</resultMap>
+ <select id="selectIssuedDeptIds" resultType="java.lang.String">
+ SELECT DISTINCT dept_ids
+ FROM staff_salary_main
+ WHERE salary_month = #{salaryMonth}
+ AND status = 5
+ </select>
+
</mapper>
--
Gitblit v1.9.3