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 | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 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 dcbd9c7..00f821c 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
@@ -7,6 +7,7 @@
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;
@@ -20,6 +21,7 @@
import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -135,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