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

md

Browse Source
This commit is contained in:
linfso 2025-01-05 15:50:12 +08:00
parent c0780a1ae0
commit d8f0522b3d
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionProfitController.java
View File

@ -120,11 +120,21 @@ public class EmisCommissionProfitController extends BaseController
jObjData.put("money","0.00"); jObjData.put("money","0.00");
jObjData.put("payedMoney","0.00"); jObjData.put("payedMoney","0.00");
// 计提预估
BigDecimal estMoney = BigDecimal.ZERO;
BigDecimal payedMoney = BigDecimal.ZERO;
if(!CollectionUtils.isEmpty(listProfit)){ if(!CollectionUtils.isEmpty(listProfit)){
EmisCommissionProfit item0=listProfit.get(0); for (EmisCommissionProfit item:listProfit) {
jObjData.put("money",item0.getMoney().stripTrailingZeros().toPlainString()); estMoney=estMoney.add(item.getMoney());
jObjData.put("payedMoney",item0.getPayedMoney().stripTrailingZeros().toPlainString()); payedMoney=payedMoney.add(item.getPayedMoney());
}
} }
jObjData.put("money",estMoney.stripTrailingZeros().toPlainString());
jObjData.put("payedMoney",payedMoney.stripTrailingZeros().toPlainString());
// 获取提成明细 // 获取提成明细
return AjaxResult.success("查询成功",jObjData); return AjaxResult.success("查询成功",jObjData);
} }

6
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonToolsController.java
View File

@ -112,14 +112,14 @@ public class EmisCommonToolsController extends EmisBaseController
emisCommissionProfit.setEmpName(empName); emisCommissionProfit.setEmpName(empName);
// emisCommissionProfit.setBillMonth(billMonth); // emisCommissionProfit.setBillMonth(billMonth);
List<EmisCommissionProfit> listProfit= emisCommissionProfitService.selectEmisCommissionProfitList(emisCommissionProfit); List<EmisCommissionProfit> listProfit= emisCommissionProfitService.selectEmisCommissionProfitList(emisCommissionProfit);
BigDecimal estMoneyMoney = BigDecimal.ZERO; BigDecimal estMoney = BigDecimal.ZERO;
if(!CollectionUtils.isEmpty(listProfit)){ if(!CollectionUtils.isEmpty(listProfit)){
for (EmisCommissionProfit item:listProfit) { for (EmisCommissionProfit item:listProfit) {
estMoneyMoney=estMoneyMoney.add(item.getMoney()); estMoney=estMoney.add(item.getMoney());
} }
} }
commissionStatMap.put("estMoney",estMoneyMoney.stripTrailingZeros().toPlainString()); commissionStatMap.put("estMoney",estMoney.stripTrailingZeros().toPlainString());
// 待回款 // 待回款