From b4fc4408fae3f46edeb6c5421224c484bb149a89 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 15 六月 2026 16:22:40 +0800
Subject: [PATCH] 同一月份工资不可以发放多次
---
src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 113 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 aad785a..af31314 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
@@ -4,9 +4,13 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
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.mapper.SysUserDeptMapper;
+import com.ruoyi.staff.excel.StaffSalaryExportData;
+import jakarta.servlet.http.HttpServletResponse;
import com.ruoyi.staff.dto.CalculateSalaryDto;
+import com.ruoyi.staff.dto.StaffSalaryCalculateDto;
import com.ruoyi.staff.mapper.StaffLeaveMapper;
import com.ruoyi.staff.mapper.StaffSalaryDetailMapper;
import com.ruoyi.staff.mapper.StaffSalaryMainMapper;
@@ -20,6 +24,7 @@
import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -56,6 +61,7 @@
staffSalaryMainLambdaQueryWrapper.eq(StaffSalaryMain::getStatus, staffSalaryMain.getStatus());
}
}
+ staffSalaryMainLambdaQueryWrapper.orderByDesc(StaffSalaryMain::getId);
Page<StaffSalaryMain> page1 = staffSalaryMainMapper.selectPage(page, staffSalaryMainLambdaQueryWrapper);
page1.getRecords().forEach(main -> {
List<StaffSalaryDetail> staffSalaryDetailList = staffSalaryDetailMapper.selectList(new LambdaQueryWrapper<StaffSalaryDetail>().eq(StaffSalaryDetail::getMainId, main.getId()));
@@ -66,6 +72,22 @@
@Override
public AjaxResult add(StaffSalaryMain staffSalaryMain) {
+ if (staffSalaryMain == null || StringUtils.isEmpty(staffSalaryMain.getSalaryMonth())) {
+ return AjaxResult.error("鍙傛暟閿欒");
+ }
+
+ Integer status = staffSalaryMain.getStatus();
+ if (status != null && status == 5) {
+ String salaryMonth = staffSalaryMain.getSalaryMonth();
+ long count = staffSalaryMainMapper.selectCount(new LambdaQueryWrapper<StaffSalaryMain>()
+ .eq(StaffSalaryMain::getSalaryMonth, salaryMonth)
+ .eq(StaffSalaryMain::getStatus, 5));
+
+ if (count > 0) {
+ return AjaxResult.error("鍚屼竴鏈堜唤宸ヨ祫涓嶅彲浠ュ彂鏀惧娆�");
+ }
+ }
+
staffSalaryMainMapper.insert(staffSalaryMain);
staffSalaryMain.getStaffSalaryDetailList().forEach(detail -> {
detail.setMainId(staffSalaryMain.getId());
@@ -83,6 +105,23 @@
if(staffSalaryMain1 == null){
return AjaxResult.error("鍙傛暟閿欒");
}
+
+ Integer newStatus = staffSalaryMain.getStatus();
+ if (newStatus != null && newStatus == 5) {
+ String salaryMonth = staffSalaryMain.getSalaryMonth();
+ if (StringUtils.isEmpty(salaryMonth)) {
+ salaryMonth = staffSalaryMain1.getSalaryMonth();
+ }
+ long count = staffSalaryMainMapper.selectCount(new LambdaQueryWrapper<StaffSalaryMain>()
+ .eq(StaffSalaryMain::getSalaryMonth, salaryMonth)
+ .eq(StaffSalaryMain::getStatus, 5)
+ .ne(StaffSalaryMain::getId, staffSalaryMain.getId()));
+
+ if (count > 0) {
+ return AjaxResult.error("鍚屼竴鏈堜唤宸ヨ祫涓嶅彲浠ュ彂鏀惧娆�");
+ }
+ }
+
// 寰呭鏍镐笉鍙紪杈�
// if(staffSalaryMain1.getStatus() > 3){
// return AjaxResult.error("寰呭鏍镐笉鍙紪杈�");
@@ -134,6 +173,80 @@
return AjaxResult.success(mapList);
}
+ @Override
+ public AjaxResult calculateSalaryByEmployee(StaffSalaryCalculateDto calculateSalaryCalculateDto) {
+ if (calculateSalaryCalculateDto == null || calculateSalaryCalculateDto.getStaffOnJobId() == null
+ || StringUtils.isEmpty(calculateSalaryCalculateDto.getSalaryMonth())) {
+ return AjaxResult.error("鍙傛暟閿欒");
+ }
+ Map<String, Object> result = new HashMap<>();
+ result.put("id", calculateSalaryCalculateDto.getStaffOnJobId().intValue());
+ result.put("staffOnJobId", calculateSalaryCalculateDto.getStaffOnJobId());
+ result.put("basicSalary", calculateSalaryCalculateDto.getBasicSalary());
+ result.put("dayDays", calculateSalaryCalculateDto.getDayDays());
+ result.put("nightDays", calculateSalaryCalculateDto.getNightDays());
+ result.put("pieceSalary", calculateSalaryCalculateDto.getPieceSalary());
+ result.put("hourlySalary", calculateSalaryCalculateDto.getHourlySalary());
+ result.put("otherIncome", calculateSalaryCalculateDto.getOtherIncome());
+ result.put("otherDeduct", calculateSalaryCalculateDto.getOtherDeduct());
+ result.put("socialPersonal", calculateSalaryCalculateDto.getSocialPersonal());
+ result.put("fundPersonal", calculateSalaryCalculateDto.getFundPersonal());
+ result.put("socialSupplementAmount", calculateSalaryCalculateDto.getSocialSupplementAmount());
+ result.put("salaryTax", calculateSalaryCalculateDto.getSalaryTax());
+ result.put("grossSalary", calculateSalaryCalculateDto.getGrossSalary());
+ result.put("deductSalary", calculateSalaryCalculateDto.getDeductSalary());
+ result.put("netSalary", calculateSalaryCalculateDto.getNetSalary());
+ result.put("remark", calculateSalaryCalculateDto.getRemark());
+ result.put("salaryMonth", calculateSalaryCalculateDto.getSalaryMonth());
+ schemeApplicableStaffService.calculateByEmployeeId(
+ calculateSalaryCalculateDto.getStaffOnJobId().intValue(),
+ result,
+ calculateSalaryCalculateDto.getSalaryMonth()
+ );
+ return AjaxResult.success(result);
+ }
+
+ @Override
+ public void exportSalaryDetail(HttpServletResponse response, String salaryMonth) {
+ LambdaQueryWrapper<StaffSalaryMain> mainWrapper = new LambdaQueryWrapper<>();
+ if (StringUtils.isNotEmpty(salaryMonth)) {
+ mainWrapper.eq(StaffSalaryMain::getSalaryMonth, salaryMonth);
+ }
+ List<StaffSalaryMain> mainList = staffSalaryMainMapper.selectList(mainWrapper);
+
+ List<StaffSalaryExportData> exportDataList = new ArrayList<>();
+ for (StaffSalaryMain main : mainList) {
+ List<StaffSalaryDetail> detailList = staffSalaryDetailMapper.selectList(
+ new LambdaQueryWrapper<StaffSalaryDetail>().eq(StaffSalaryDetail::getMainId, main.getId())
+ );
+
+ for (StaffSalaryDetail detail : detailList) {
+ StaffSalaryExportData exportData = new StaffSalaryExportData();
+ exportData.setSalaryMonth(main.getSalaryMonth());
+ exportData.setSalaryTitle(main.getSalaryTitle());
+ exportData.setStaffName(detail.getStaffName());
+ exportData.setDeptName(detail.getDeptName());
+ exportData.setBasicSalary(detail.getBasicSalary());
+ exportData.setPieceSalary(detail.getPieceSalary());
+ exportData.setHourlySalary(detail.getHourlySalary());
+ exportData.setOtherIncome(detail.getOtherIncome());
+ exportData.setSocialPersonal(detail.getSocialPersonal());
+ exportData.setFundPersonal(detail.getFundPersonal());
+ exportData.setOtherDeduct(detail.getOtherDeduct());
+ exportData.setSocialSupplementAmount(detail.getSocialSupplementAmount());
+ exportData.setSalaryTax(detail.getSalaryTax());
+ exportData.setGrossSalary(detail.getGrossSalary());
+ exportData.setDeductSalary(detail.getDeductSalary());
+ exportData.setNetSalary(detail.getNetSalary());
+ exportData.setRemark(detail.getRemark());
+ exportDataList.add(exportData);
+ }
+ }
+
+ ExcelUtil<StaffSalaryExportData> util = new ExcelUtil<>(StaffSalaryExportData.class);
+ util.exportExcel(response, exportDataList, "鍛樺伐钖祫鏄庣粏");
+ }
+
public List<Map<String, Object>> setSchemeApplicableStaffUserInfo(List<Long> ids) {
if(CollectionUtils.isEmpty(ids)){
return new ArrayList<>();
--
Gitblit v1.9.3