aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'demand: tms-提成管理-提成统计-运单提成明细数据与提成统计不匹配问题解决' (#260) from develop into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/260
This commit is contained in:
heyu 2025-12-10 10:45:07 +08:00
commit bd4a617bca
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java
View File

@ -443,11 +443,12 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
// 获取统计数据 // 获取统计数据
List<EmisCommissionProfit> listProfit=emisCommissionProfitMapper.selectProfitStatList(empName,billMonth); List<EmisCommissionProfit> listProfit=emisCommissionProfitMapper.selectProfitStatList(empName,billMonth);
// 如果指定了empName，需要处理该员工在数据库中存在但listProfit中不存在的月份记录 // 需要处理数据库中存在但listProfit中不存在的月份记录（无论是否指定empName）
if(StringUtils.isNotEmpty(empName)) { // 查询数据库中符合条件的记录
// 查询数据库中该员工的所有月份记录
EmisCommissionProfit queryParam = new EmisCommissionProfit(); EmisCommissionProfit queryParam = new EmisCommissionProfit();
if(StringUtils.isNotEmpty(empName)) {
queryParam.setEmpName(empName); queryParam.setEmpName(empName);
}
if(StringUtils.isNotEmpty(billMonth)) { if(StringUtils.isNotEmpty(billMonth)) {
queryParam.setBillMonth(billMonth); queryParam.setBillMonth(billMonth);
} }
@ -473,7 +474,6 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
listProfit.add(zeroProfit); listProfit.add(zeroProfit);
} }
} }
}
// 更新或插入提成记录 // 更新或插入提成记录
for (EmisCommissionProfit profitItem:listProfit) { for (EmisCommissionProfit profitItem:listProfit) {