From 47806d9e390ee00e1d29ad1da8c1aa908882a758 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 11 八月 2026 14:43:59 +0800
Subject: [PATCH] 用河南鹤壁代码覆盖山西长治
---
src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java | 182 ---------------------------------------------
1 files changed, 0 insertions(+), 182 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..aad785a 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
@@ -4,15 +4,9 @@
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.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;
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;
@@ -26,12 +20,8 @@
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>
@@ -51,7 +41,6 @@
private final SchemeApplicableStaffServiceImpl schemeApplicableStaffService;
private final SysUserDeptMapper sysUserDeptMapper;
private final StaffLeaveMapper staffLeaveMapper;
- private final SysDeptMapper sysDeptMapper;
@Override
public AjaxResult listPage(Page page, StaffSalaryMain staffSalaryMain) {
@@ -67,7 +56,6 @@
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()));
@@ -78,26 +66,6 @@
@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();
- String deptIds = staffSalaryMain.getDeptIds();
-
- List<StaffSalaryMain> issuedList = staffSalaryMainMapper.selectList(new LambdaQueryWrapper<StaffSalaryMain>()
- .eq(StaffSalaryMain::getSalaryMonth, salaryMonth)
- .eq(StaffSalaryMain::getStatus, 5));
-
- for (StaffSalaryMain issued : issuedList) {
- if (hasOverlappingDept(deptIds, issued.getDeptIds())) {
- return AjaxResult.error("鍚屼竴鏈堜唤鍚屼竴閮ㄩ棬宸ヨ祫涓嶅彲浠ュ彂鏀惧娆�");
- }
- }
- }
-
staffSalaryMainMapper.insert(staffSalaryMain);
staffSalaryMain.getStaffSalaryDetailList().forEach(detail -> {
detail.setMainId(staffSalaryMain.getId());
@@ -115,30 +83,6 @@
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();
- }
- 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()));
-
- for (StaffSalaryMain issued : issuedList) {
- if (hasOverlappingDept(deptIds, issued.getDeptIds())) {
- return AjaxResult.error("鍚屼竴鏈堜唤鍚屼竴閮ㄩ棬宸ヨ祫涓嶅彲浠ュ彂鏀惧娆�");
- }
- }
- }
-
// 寰呭鏍镐笉鍙紪杈�
// if(staffSalaryMain1.getStatus() > 3){
// return AjaxResult.error("寰呭鏍镐笉鍙紪杈�");
@@ -190,138 +134,12 @@
return AjaxResult.success(mapList);
}
- @Override
- public AjaxResult calculateSalaryByEmployee(StaffSalaryCalculateDto staffSalaryCalculateDto) {
- if (staffSalaryCalculateDto == null
- || staffSalaryCalculateDto.getStaffOnJobId() == null
- || StringUtils.isEmpty(staffSalaryCalculateDto.getSalaryMonth())) {
- return AjaxResult.error("鍙傛暟閿欒");
- }
- Map<String, Object> map = new HashMap<>();
- map.put("id", staffSalaryCalculateDto.getStaffOnJobId());
- map.put("staffOnJobId", staffSalaryCalculateDto.getStaffOnJobId());
- map.put("salaryMonth", staffSalaryCalculateDto.getSalaryMonth());
- map.put("staffName", staffSalaryCalculateDto.getStaffName());
- map.put("postName", staffSalaryCalculateDto.getPostName());
- map.put("deptName", staffSalaryCalculateDto.getDeptName());
- if (staffSalaryCalculateDto.getBasicSalary() != null) {
- map.put("basicSalary", staffSalaryCalculateDto.getBasicSalary());
- }
- map.put("pieceSalary", staffSalaryCalculateDto.getPieceSalary());
- map.put("hourlySalary", staffSalaryCalculateDto.getHourlySalary());
- map.put("otherIncome", staffSalaryCalculateDto.getOtherIncome());
- map.put("socialPersonal", staffSalaryCalculateDto.getSocialPersonal());
- map.put("fundPersonal", staffSalaryCalculateDto.getFundPersonal());
- map.put("otherDeduct", staffSalaryCalculateDto.getOtherDeduct());
- map.put("socialSupplementAmount", staffSalaryCalculateDto.getSocialSupplementAmount());
- map.put("salaryTax", staffSalaryCalculateDto.getSalaryTax());
- map.put("grossSalary", staffSalaryCalculateDto.getGrossSalary());
- map.put("deductSalary", staffSalaryCalculateDto.getDeductSalary());
- map.put("netSalary", staffSalaryCalculateDto.getNetSalary());
- map.put("remark", staffSalaryCalculateDto.getRemark());
- schemeApplicableStaffService.calculateByEmployeeId(
- staffSalaryCalculateDto.getStaffOnJobId().intValue(),
- map,
- staffSalaryCalculateDto.getSalaryMonth()
- );
- return AjaxResult.success(map);
- }
-
- @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<>();
}
// 閫氳繃閮ㄩ棬鑾峰彇浜哄憳id
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