From 0bd6994efea85e468c06b58cd0395cd4066d31cd Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 12 六月 2026 14:39:07 +0800
Subject: [PATCH] 根据单个员工计算工资
---
src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java | 107 ++++++++++++++++++++++++++---------------------------
1 files changed, 52 insertions(+), 55 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 3093c63..00f821c 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
@@ -2,31 +2,28 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.account.mapper.AccountExpenseMapper;
-import com.ruoyi.account.pojo.AccountExpense;
-import com.ruoyi.common.utils.SecurityUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.project.system.domain.SysUser;
-import com.ruoyi.project.system.domain.SysUserDept;
import com.ruoyi.project.system.mapper.SysUserDeptMapper;
-import com.ruoyi.project.system.mapper.SysUserMapper;
import com.ruoyi.staff.dto.CalculateSalaryDto;
+import com.ruoyi.staff.dto.StaffSalaryCalculateDto;
import com.ruoyi.staff.mapper.StaffLeaveMapper;
-import com.ruoyi.staff.mapper.StaffOnJobMapper;
import com.ruoyi.staff.mapper.StaffSalaryDetailMapper;
-import com.ruoyi.staff.pojo.*;
import com.ruoyi.staff.mapper.StaffSalaryMainMapper;
+import com.ruoyi.staff.pojo.StaffLeave;
+import com.ruoyi.staff.pojo.StaffSalaryDetail;
+import com.ruoyi.staff.pojo.StaffSalaryMain;
import com.ruoyi.staff.service.StaffSalaryDetailService;
import com.ruoyi.staff.service.StaffSalaryMainService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import java.math.BigDecimal;
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -37,34 +34,15 @@
* @since 2026-03-06 01:22:05
*/
@Service
+@RequiredArgsConstructor
public class StaffSalaryMainServiceImpl extends ServiceImpl<StaffSalaryMainMapper, StaffSalaryMain> implements StaffSalaryMainService {
- @Autowired
- private StaffSalaryMainMapper staffSalaryMainMapper;
-
- @Autowired
- private StaffSalaryDetailService staffSalaryDetailService;
-
- @Autowired
- private StaffSalaryDetailMapper staffSalaryDetailMapper;
-
- @Autowired
- private SchemeApplicableStaffServiceImpl schemeApplicableStaffService;
-
- @Autowired
- private SysUserDeptMapper sysUserDeptMapper;
-
- @Autowired
- private SysUserMapper sysUserMapper;
-
- @Autowired
- private StaffOnJobMapper staffOnJobMapper;
-
- @Autowired
- private StaffLeaveMapper staffLeaveMapper;
-
- @Autowired
- private AccountExpenseMapper accountExpenseMapper;
+ private final StaffSalaryMainMapper staffSalaryMainMapper;
+ private final StaffSalaryDetailService staffSalaryDetailService;
+ private final StaffSalaryDetailMapper staffSalaryDetailMapper;
+ private final SchemeApplicableStaffServiceImpl schemeApplicableStaffService;
+ private final SysUserDeptMapper sysUserDeptMapper;
+ private final StaffLeaveMapper staffLeaveMapper;
@Override
public AjaxResult listPage(Page page, StaffSalaryMain staffSalaryMain) {
@@ -80,6 +58,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()));
@@ -119,21 +98,6 @@
});
staffSalaryDetailService.saveBatch(staffSalaryMain.getStaffSalaryDetailList());
}
- // 鍜岃储鍔¤仈鍔紝鏂板鏀嚭
- if(staffSalaryMain.getStatus().equals(5)){
- AccountExpense accountExpense = new AccountExpense();
- accountExpense.setBusinessType(3);
- accountExpense.setExpenseMoney(staffSalaryMain.getTotalSalary());
- accountExpense.setBusinessId(staffSalaryMain.getId());
- accountExpense.setExpenseDate(new Date());
- accountExpense.setExpenseMethod("2");
- accountExpense.setExpenseType("1");
- accountExpense.setExpenseDescribed(staffSalaryMain.getSalaryTitle());
- accountExpense.setNote(staffSalaryMain.getRemark());
- accountExpense.setInputUser(SecurityUtils.getLoginUser().getNickName());
- accountExpense.setInputTime(new Date());
- accountExpenseMapper.insert(accountExpense);
- }
return AjaxResult.success("淇敼鎴愬姛");
}
@@ -162,7 +126,7 @@
if((Integer) id.get("staffState") == 0){
StaffLeave id1 = staffLeaveMapper.selectOne(new LambdaQueryWrapper<StaffLeave>()
.eq(StaffLeave::getStaffOnJobId, id.get("id"))
- .like(StaffLeave::getCreateTime, calculateSalaryDto.getDate()));
+ .like(StaffLeave::getLeaveDate, calculateSalaryDto.getDate()));
if(id1 == null){
continue;
}
@@ -173,6 +137,39 @@
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);
+ }
+
public List<Map<String, Object>> setSchemeApplicableStaffUserInfo(List<Long> ids) {
if(CollectionUtils.isEmpty(ids)){
return new ArrayList<>();
--
Gitblit v1.9.3