hbyt/evo-Financial-pc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

销售提成清零

Browse Source
This commit is contained in:
tzy 2025-06-09 09:56:29 +08:00
parent e3cf13dffb
commit c5ea125790
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
evo-admin/src/main/java/com/evo/finance/service/impl/RzSalaryDetailServiceImpl.java
View File

@ -637,6 +637,17 @@ public class RzSalaryDetailServiceImpl extends ServiceImpl<RzSalaryDetailMapper,
SysDept sysDept = deptMapper.selectOne(wa);
if (!attendanceList.isEmpty()) {
Date month = attendanceList.get(0).getDate();
List<RzSalaryDetail> existingDetails = rzSalaryDetailMapper.selectSalaryDetailByDeptId(sysDept.getDeptId(), month);
for (RzSalaryDetail detail : existingDetails) {
detail.setSalesCommission(new BigDecimal("0"));
detail.setUpdateTime(DateUtils.getNowDate());
detail.setUpdateBy(SecurityUtils.getUsername());
rzSalaryDetailMapper.updateById(detail);
}
}
//更新工资单详情,写入销售提成
for (RzSalaryVo rzSalaryVo : attendanceList) {
if (rzSalaryVo.getSale() != null ){
@ -676,11 +687,14 @@ public class RzSalaryDetailServiceImpl extends ServiceImpl<RzSalaryDetailMapper,
private List<SalaryVo> buildExportData(RzSalaryDetail rzSalaryDetail) {
// 获取所有部门列表
List<SysDept> deptList = deptMapper.selectList(new LambdaQueryWrapper<SysDept>());
//部门列表转换为部门ID到部门名称的映射
Map<Long, String> deptNameMap = deptList.stream().collect(Collectors.toMap(SysDept::getDeptId, SysDept::getDeptName));
//键为部门ID，值为部门名称，用于快速查找父部门为根部门（ID为0）的部门名称
Map<String, String> nameAndDeptIdMap = deptList.stream().filter(d -> d.getParentId().equals(0l)).collect(Collectors.toMap(d->String.valueOf(d.getDeptId()), SysDept::getDeptName));
Map<Long, String> companyNameMap = Collections.emptyMap();
// 过滤出所有非根部门（即parentId不等于0的部门），并为每个部门执行以下操作
deptList.stream().filter(d -> !d.getParentId().equals(0l)).forEach(d ->{
// 将当前部门的祖ID字符串拆分成List以便后续处理
List<String> parentIdList = Collections.asList(d.getAncestors().split(","));
Iterator<String> it = nameAndDeptIdMap.keySet().iterator();
while (it.hasNext()){