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 | 40 ----------------------------------------
1 files changed, 0 insertions(+), 40 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 cc9f431..aad785a 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
@@ -7,7 +7,6 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.system.mapper.SysUserDeptMapper;
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;
@@ -21,7 +20,6 @@
import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -58,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()));
@@ -135,43 +132,6 @@
mapList.add(id);
}
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);
}
public List<Map<String, Object>> setSchemeApplicableStaffUserInfo(List<Long> ids) {
--
Gitblit v1.9.3