DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

薪资接口的新要求

Browse Source
This commit is contained in:
Joshi
2025-06-26 13:56:07 +08:00
parent 5dda61bda6
commit c9f7131f04
13 changed files with 272 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-oa/src/main/java/com/ruoyi/oa/service/IOaEmployeeTemplateBindingService.java
View File

@@ -48,7 +48,7 @@ public interface IOaEmployeeTemplateBindingService {
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
Boolean calculateSalary(List<Long> employeeIds, Long payYear, Long payMonth,Long defaultInsuranceTemplateId, Long defaultSalaryTemplateId);
Boolean calculateSalary(List<Long> employeeIds, Long payYear, Long payMonth, Long defaultPersonalInsuranceTemplateId, Long defaultCompanyInsuranceTemplateId, Long defaultSalaryTemplateId);
Boolean finalizeSalary(List<String> bindingIds);
List<EmployeeSalaryRecordVo> querySalaryHistory(Long employeeId);
}

232
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaEmployeeTemplateBindingServiceImpl.java
View File

@@ -2,6 +2,7 @@ package com.ruoyi.oa.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.PageQuery;
@@ -12,6 +13,7 @@ import com.ruoyi.oa.domain.*;
import com.ruoyi.oa.domain.vo.EmployeeSalaryRecordVo;
import com.ruoyi.oa.domain.vo.OaBindingItemDetailVo;
import com.ruoyi.oa.mapper.*;
import com.ruoyi.system.mapper.SysDeptMapper;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -21,10 +23,7 @@ import com.ruoyi.oa.domain.vo.OaEmployeeTemplateBindingVo;
import com.ruoyi.oa.service.IOaEmployeeTemplateBindingService;
import java.math.BigDecimal;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Collection;
import java.util.*;
import java.util.stream.Collectors;
/**
@@ -45,7 +44,11 @@ public class OaEmployeeTemplateBindingServiceImpl implements IOaEmployeeTemplate
@Autowired
private final OaSalaryTemplateDetailMapper salaryDetailMapper;
@Autowired
private final OaInsuranceTemplateMapper insuranceTemplateMapper;
@Autowired
private final OaInsuranceTemplateDetailMapper insuranceDetailMapper;
@Autowired
private final SysDeptMapper deptMapper;
/**
@@ -63,24 +66,150 @@ public class OaEmployeeTemplateBindingServiceImpl implements IOaEmployeeTemplate
public TableDataInfo<OaEmployeeTemplateBindingVo> queryPageList(OaEmployeeTemplateBindingBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<OaEmployeeTemplateBinding> lqw = buildQueryWrapper(bo);
Page<OaEmployeeTemplateBindingVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
// 根据bindingid和template_type(salary)去求和paid_amount字段
if (CollectionUtils.isNotEmpty(result.getRecords())) {
// 1. 批量查员工
List<Long> employeeIds = result.getRecords().stream()
.map(OaEmployeeTemplateBindingVo::getEmployeeId)
.filter(Objects::nonNull)
.distinct()
.collect(Collectors.toList());
Map<Long, OaEmployee> employeeMap = new HashMap<>();
if (!employeeIds.isEmpty()) {
List<OaEmployee> employees = employeeMapper.selectBatchIds(employeeIds);
employeeMap = employees.stream().collect(Collectors.toMap(OaEmployee::getEmployeeId, e -> e));
}
// 2. 批量查部门
Set<Long> deptIds = employeeMap.values().stream()
.map(OaEmployee::getDeptId)
.filter(Objects::nonNull)
.collect(Collectors.toSet());
Map<Long, SysDept> deptMap = new HashMap<>();
if (!deptIds.isEmpty()) {
List<SysDept> depts = deptMapper.selectBatchIds(deptIds);
deptMap = depts.stream().collect(Collectors.toMap(SysDept::getDeptId, d -> d));
}
// 3. 封装到VO
for (OaEmployeeTemplateBindingVo vo : result.getRecords()) {
OaEmployee emp = employeeMap.get(vo.getEmployeeId());
if (emp != null) {
vo.setCompany(emp.getCompany());
SysDept dept = deptMap.get(emp.getDeptId());
vo.setDeptName(dept != null ? dept.getDeptName() : null);
}
}
// 提取所有bindingId
List<Long> bindingIds = result.getRecords().stream()
.map(OaEmployeeTemplateBindingVo::getBindingId)
.collect(Collectors.toList());
// 批量查询每个bindingId对应的薪资总额
Map<Long, BigDecimal> salaryTotalMap = calculateSalaryTotalByBindingIds(bindingIds);
// 批量查询每个bindingId对应的各项金额
Map<Long, SalaryCalculationResult> calculationMap = calculateSalaryDetailsByBindingIds(bindingIds);
// 将计算结果设置到对应的VO对象中
for (OaEmployeeTemplateBindingVo vo : result.getRecords()) {
vo.setTotalSalary(salaryTotalMap.getOrDefault(vo.getBindingId(), BigDecimal.ZERO));
SalaryCalculationResult calc = calculationMap.getOrDefault(vo.getBindingId(), new SalaryCalculationResult());
vo.setNetSalary(calc.getTotalSalary()); // 薪资总额
vo.setTotalPersonalInsurance(calc.getTotalPersonalInsurance()); // 个人社保总额
vo.setTotalCompanyInsurance(calc.getTotalCompanyInsurance()); // 企业社保总额
vo.setTotalSalary(calc.getNetSalary()); // 实发工资
vo.setTotalCompanyCost(calc.getTotalCompanyCost()); // 公司总成本
}
}
return TableDataInfo.build(result);
}
/**
* 薪资计算结果内部类
*/
private static class SalaryCalculationResult {
private BigDecimal totalSalary = BigDecimal.ZERO; // 薪资总额
private BigDecimal totalPersonalInsurance = BigDecimal.ZERO; // 个人社保总额
private BigDecimal totalCompanyInsurance = BigDecimal.ZERO; // 企业社保总额
private BigDecimal netSalary = BigDecimal.ZERO; // 实发工资
private BigDecimal totalCompanyCost = BigDecimal.ZERO; // 公司总成本
// getters and setters
public BigDecimal getTotalSalary() { return totalSalary; }
public void setTotalSalary(BigDecimal totalSalary) { this.totalSalary = totalSalary; }
public BigDecimal getTotalPersonalInsurance() { return totalPersonalInsurance; }
public void setTotalPersonalInsurance(BigDecimal totalPersonalInsurance) { this.totalPersonalInsurance = totalPersonalInsurance; }
public BigDecimal getTotalCompanyInsurance() { return totalCompanyInsurance; }
public void setTotalCompanyInsurance(BigDecimal totalCompanyInsurance) { this.totalCompanyInsurance = totalCompanyInsurance; }
public BigDecimal getNetSalary() { return netSalary; }
public void setNetSalary(BigDecimal netSalary) { this.netSalary = netSalary; }
public BigDecimal getTotalCompanyCost() { return totalCompanyCost; }
public void setTotalCompanyCost(BigDecimal totalCompanyCost) { this.totalCompanyCost = totalCompanyCost; }
}
/**
* 根据绑定记录ID集合批量计算薪资明细
*/
private Map<Long, SalaryCalculationResult> calculateSalaryDetailsByBindingIds(List<Long> bindingIds) {
if (CollectionUtils.isEmpty(bindingIds)) {
return Collections.emptyMap();
}
Map<Long, SalaryCalculationResult> resultMap = new HashMap<>();
// 查询所有明细记录
LambdaQueryWrapper<OaBindingItemDetail> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(OaBindingItemDetail::getBindingId, bindingIds)
.eq(OaBindingItemDetail::getDelFlag, 0);
List<OaBindingItemDetail> allDetails = bindingItemDetailMapper.selectList(queryWrapper);
// 按bindingId分组处理
Map<Long, List<OaBindingItemDetail>> detailsByBindingId = allDetails.stream()
.collect(Collectors.groupingBy(OaBindingItemDetail::getBindingId));
for (Long bindingId : bindingIds) {
SalaryCalculationResult calc = new SalaryCalculationResult();
List<OaBindingItemDetail> details = detailsByBindingId.getOrDefault(bindingId, Collections.emptyList());
for (OaBindingItemDetail detail : details) {
if (detail.getPaidAmount() != null) {
if ("salary".equals(detail.getTemplateType())) {
// 薪资项目
calc.setTotalSalary(calc.getTotalSalary().add(detail.getPaidAmount()));
} else if ("insurance".equals(detail.getTemplateType())) {
// 社保项目 - 需要区分个人还是企业
OaInsuranceTemplateDetail insuranceDetail = insuranceDetailMapper.selectById(detail.getItemDetailId());
if (insuranceDetail != null) {
OaInsuranceTemplate template = insuranceTemplateMapper.selectById(insuranceDetail.getInsuranceTemplateId());
if (template != null) {
if (template.getType() == 0) {
// 个人社保
calc.setTotalPersonalInsurance(calc.getTotalPersonalInsurance().add(detail.getPaidAmount()));
} else if (template.getType() == 1) {
// 企业社保
calc.setTotalCompanyInsurance(calc.getTotalCompanyInsurance().add(detail.getPaidAmount()));
}
}
}
}
}
}
// 计算实发工资和公司总成本
BigDecimal personalInsurance = calc.getTotalPersonalInsurance();
if (personalInsurance.compareTo(BigDecimal.ZERO) < 0) {
personalInsurance = personalInsurance.abs(); // 或直接设为0
}
calc.setNetSalary(calc.getTotalSalary().subtract(personalInsurance));
calc.setTotalCompanyCost(calc.getTotalSalary().add(calc.getTotalCompanyInsurance()));
resultMap.put(bindingId, calc);
}
return resultMap;
}
/**
* 根据绑定记录ID集合批量计算薪资总额
* @param bindingIds 绑定记录ID集合
@@ -124,7 +253,8 @@ public class OaEmployeeTemplateBindingServiceImpl implements IOaEmployeeTemplate
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<OaEmployeeTemplateBinding> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getEmployeeId() != null, OaEmployeeTemplateBinding::getEmployeeId, bo.getEmployeeId());
lqw.eq(bo.getInsuranceTemplateId() != null, OaEmployeeTemplateBinding::getInsuranceTemplateId, bo.getInsuranceTemplateId());
lqw.eq(bo.getPersonalInsuranceTemplateId() != null, OaEmployeeTemplateBinding::getPersonalInsuranceTemplateId, bo.getPersonalInsuranceTemplateId());
lqw.eq(bo.getCompanyInsuranceTemplateId() != null, OaEmployeeTemplateBinding::getCompanyInsuranceTemplateId, bo.getCompanyInsuranceTemplateId());
lqw.eq(bo.getSalaryTemplateId() != null, OaEmployeeTemplateBinding::getSalaryTemplateId, bo.getSalaryTemplateId());
lqw.eq(bo.getPayYear() != null, OaEmployeeTemplateBinding::getPayYear, bo.getPayYear());
lqw.eq(bo.getPayMonth() != null, OaEmployeeTemplateBinding::getPayMonth, bo.getPayMonth());
@@ -178,9 +308,9 @@ public class OaEmployeeTemplateBindingServiceImpl implements IOaEmployeeTemplate
@Override
public Boolean calculateSalary(List<Long> employeeIds, Long payYear, Long payMonth,
Long defaultInsuranceTemplateId, Long defaultSalaryTemplateId) {
Long defaultPersonalInsuranceTemplateId, Long defaultCompanyInsuranceTemplateId, Long defaultSalaryTemplateId) {
// 参数校验
if (defaultInsuranceTemplateId == null || defaultSalaryTemplateId == null) {
if (defaultPersonalInsuranceTemplateId == null || defaultCompanyInsuranceTemplateId == null || defaultSalaryTemplateId == null) {
throw new RuntimeException("请选择默认的薪资模板和社保模板");
}
@@ -206,11 +336,13 @@ public class OaEmployeeTemplateBindingServiceImpl implements IOaEmployeeTemplate
if (lastBinding != null) {
// 存在上月记录，复制上月的模板ID
binding.setInsuranceTemplateId(lastBinding.getInsuranceTemplateId());
binding.setPersonalInsuranceTemplateId(lastBinding.getPersonalInsuranceTemplateId());
binding.setCompanyInsuranceTemplateId(lastBinding.getCompanyInsuranceTemplateId());
binding.setSalaryTemplateId(lastBinding.getSalaryTemplateId());
} else {
// 首次配置，使用默认模板
binding.setInsuranceTemplateId(defaultInsuranceTemplateId);
binding.setPersonalInsuranceTemplateId(defaultPersonalInsuranceTemplateId);
binding.setCompanyInsuranceTemplateId(defaultCompanyInsuranceTemplateId);
binding.setSalaryTemplateId(defaultSalaryTemplateId);
}
@@ -224,7 +356,7 @@ public class OaEmployeeTemplateBindingServiceImpl implements IOaEmployeeTemplate
} else {
// 首次配置，使用模板默认金额
createNewDetails(binding.getBindingId(), binding.getSalaryTemplateId(),
binding.getInsuranceTemplateId());
binding.getPersonalInsuranceTemplateId(), binding.getCompanyInsuranceTemplateId());
}
// 5. 更新主表的汇总金额
@@ -253,7 +385,7 @@ public class OaEmployeeTemplateBindingServiceImpl implements IOaEmployeeTemplate
/**
* 创建新的明细记录（使用模板默认值）
*/
private void createNewDetails(Long bindingId, Long salaryTemplateId, Long insuranceTemplateId) {
private void createNewDetails(Long bindingId, Long salaryTemplateId, Long personalInsuranceTemplateId, Long companyInsuranceTemplateId) {
// 薪资明细
List<OaSalaryTemplateDetail> salaryDetails = salaryDetailMapper.findByTemplateId(salaryTemplateId);
for (OaSalaryTemplateDetail detail : salaryDetails) {
@@ -265,42 +397,76 @@ public class OaEmployeeTemplateBindingServiceImpl implements IOaEmployeeTemplate
bindingItemDetailMapper.insert(item);
}
// 社保明细
List<OaInsuranceTemplateDetail> insuranceDetails = insuranceDetailMapper.findByTemplateId(insuranceTemplateId);
for (OaInsuranceTemplateDetail detail : insuranceDetails) {
OaBindingItemDetail item = new OaBindingItemDetail();
item.setBindingId(bindingId);
item.setTemplateType("insurance");
item.setItemDetailId(detail.getInsuranceDetailId());
item.setPaidAmount(detail.getAmount() != null ? detail.getAmount() : BigDecimal.ZERO);
bindingItemDetailMapper.insert(item);
// 个人社保明细
List<OaInsuranceTemplateDetail> personalDetails = insuranceDetailMapper.findByTemplateId(personalInsuranceTemplateId);
for (OaInsuranceTemplateDetail detail : personalDetails) {
// 只处理主表type=0的模板
OaInsuranceTemplate template = insuranceTemplateMapper.selectById(detail.getInsuranceTemplateId());
if (template != null && template.getType() == 0) {
OaBindingItemDetail item = new OaBindingItemDetail();
item.setBindingId(bindingId);
item.setTemplateType("insurance");
item.setItemDetailId(detail.getInsuranceDetailId());
item.setPaidAmount(detail.getAmount() != null ? detail.getAmount() : BigDecimal.ZERO);
bindingItemDetailMapper.insert(item);
}
}
// 企业社保明细
List<OaInsuranceTemplateDetail> companyDetails = insuranceDetailMapper.findByTemplateId(companyInsuranceTemplateId);
for (OaInsuranceTemplateDetail detail : companyDetails) {
// 只处理主表type=1的模板
OaInsuranceTemplate template = insuranceTemplateMapper.selectById(detail.getInsuranceTemplateId());
if (template != null && template.getType() == 1) {
OaBindingItemDetail item = new OaBindingItemDetail();
item.setBindingId(bindingId);
item.setTemplateType("insurance");
item.setItemDetailId(detail.getInsuranceDetailId());
item.setPaidAmount(detail.getAmount() != null ? detail.getAmount() : BigDecimal.ZERO);
bindingItemDetailMapper.insert(item);
}
}
}
/**
* 更新主表的汇总金额
*/
private void updateBindingTotals(Long bindingId) {
// 查询该binding下所有明细
List<OaBindingItemDetail> details = bindingItemDetailMapper.findByBindingId(bindingId);
BigDecimal totalSalary = BigDecimal.ZERO;
BigDecimal totalCost = BigDecimal.ZERO;
BigDecimal totalPersonalInsurance = BigDecimal.ZERO;
BigDecimal totalCompanyInsurance = BigDecimal.ZERO;
for (OaBindingItemDetail detail : details) {
if (detail.getPaidAmount() != null) {
if ("salary".equals(detail.getTemplateType())) {
totalSalary = totalSalary.add(detail.getPaidAmount());
} else if ("insurance".equals(detail.getTemplateType())) {
// 通过明细的 insuranceTemplateId 查主表 type
OaInsuranceTemplateDetail insuranceDetail = insuranceDetailMapper.selectById(detail.getItemDetailId());
if (insuranceDetail != null) {
OaInsuranceTemplate template = insuranceTemplateMapper.selectById(insuranceDetail.getInsuranceTemplateId());
if (template != null) {
// 强制社保金额为正数
BigDecimal paid = detail.getPaidAmount().abs();
if (template.getType() == 0) {
totalPersonalInsurance = totalPersonalInsurance.add(paid);
} else if (template.getType() == 1) {
totalCompanyInsurance = totalCompanyInsurance.add(paid);
}
}
}
}
totalCost = totalCost.add(detail.getPaidAmount());
}
}
// 更新主表
// 实发工资 = 薪资合计 - 个人社保
BigDecimal netSalary = totalSalary.subtract(totalPersonalInsurance);
// 单位总支出 = 薪资合计 + 企业社保
BigDecimal totalCompanyCost = totalSalary.add(totalCompanyInsurance);
OaEmployeeTemplateBinding binding = new OaEmployeeTemplateBinding();
binding.setBindingId(bindingId);
binding.setNetSalary(totalSalary);
binding.setTotalCompanyCost(totalCost);
binding.setNetSalary(netSalary);
binding.setTotalCompanyCost(totalCompanyCost);
baseMapper.updateById(binding);
}