From 50921bdc2d06ebf2c0302f2b3f8383bd729edacc Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期一, 14 九月 2026 15:31:41 +0800
Subject: [PATCH] feat: 付款申请创建采购付款分栏与财务审核人、工资表银行账号及校验、库存详情按更新时间降序
---
src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 108 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..540c978 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;
@@ -20,13 +22,17 @@
import com.ruoyi.staff.service.StaffSalaryDetailService;
import com.ruoyi.staff.service.StaffSalaryMainService;
import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
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>
@@ -38,6 +44,7 @@
*/
@Service
@RequiredArgsConstructor
+@Slf4j
public class StaffSalaryMainServiceImpl extends ServiceImpl<StaffSalaryMainMapper, StaffSalaryMain> implements StaffSalaryMainService {
private final StaffSalaryMainMapper staffSalaryMainMapper;
@@ -46,6 +53,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) {
@@ -75,16 +83,21 @@
if (staffSalaryMain == null || StringUtils.isEmpty(staffSalaryMain.getSalaryMonth())) {
return AjaxResult.error("鍙傛暟閿欒");
}
+ validateBankAccount(staffSalaryMain.getBankAccount());
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("鍚屼竴鏈堜唤鍚屼竴閮ㄩ棬宸ヨ祫涓嶅彲浠ュ彂鏀惧娆�");
+ }
}
}
@@ -101,6 +114,7 @@
if(staffSalaryMain == null){
return AjaxResult.error("鍙傛暟閿欒");
}
+ validateBankAccount(staffSalaryMain.getBankAccount());
StaffSalaryMain staffSalaryMain1 = staffSalaryMainMapper.selectById(staffSalaryMain.getId());
if(staffSalaryMain1 == null){
return AjaxResult.error("鍙傛暟閿欒");
@@ -112,13 +126,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("鍚屼竴鏈堜唤鍚屼竴閮ㄩ棬宸ヨ祫涓嶅彲浠ュ彂鏀惧娆�");
+ }
}
}
@@ -135,6 +156,39 @@
staffSalaryDetailService.saveBatch(staffSalaryMain.getStaffSalaryDetailList());
}
return AjaxResult.success("淇敼鎴愬姛");
+ }
+
+ /**
+ * 閾惰璐﹀彿鍏滃簳鏍￠獙锛氫粎绾暟瀛� + 闀垮害16-19浣嶏紙涓嶇鐩存帴鎷︽埅锛夛紱
+ * Luhn 鏍￠獙浠呬綔鍛婅锛屼笉闃绘柇鎻愪氦锛堜釜鍒�佸崱/鐗规畩鍗″彲鑳戒笉閫氳繃锛�
+ */
+ private void validateBankAccount(String account) {
+ if (account == null || account.isBlank()) {
+ return;
+ }
+ if (!account.matches("\\d{16,19}")) {
+ throw new com.ruoyi.common.exception.ServiceException("閾惰璐﹀彿鏍煎紡涓嶆纭細闇�涓�16-19浣嶇函鏁板瓧");
+ }
+ if (!luhnValid(account)) {
+ log.warn("閾惰璐﹀彿 Luhn 鏍￠獙鏈�氳繃锛堜粎鍛婅锛屼笉闃绘柇锛�");
+ }
+ }
+
+ private boolean luhnValid(String account) {
+ int sum = 0;
+ boolean alternate = false;
+ for (int i = account.length() - 1; i >= 0; i--) {
+ int n = account.charAt(i) - '0';
+ if (alternate) {
+ n *= 2;
+ if (n > 9) {
+ n -= 9;
+ }
+ }
+ sum += n;
+ alternate = !alternate;
+ }
+ return sum % 10 == 0;
}
@Override
@@ -259,4 +313,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