From d8f0522b3db685ac69b9f74d452e659aad3e3f82 Mon Sep 17 00:00:00 2001 From: linfso Date: Sun, 5 Jan 2025 15:50:12 +0800 Subject: [PATCH] md --- .../web/emis/EmisCommissionProfitController.java | 16 +++++++++++++--- .../erp/web/emis/EmisCommonToolsController.java | 6 +++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionProfitController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionProfitController.java index 74edee75d..42bf5c374 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionProfitController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionProfitController.java @@ -120,11 +120,21 @@ public class EmisCommissionProfitController extends BaseController jObjData.put("money","0.00"); jObjData.put("payedMoney","0.00"); + // 计提预估 + BigDecimal estMoney = BigDecimal.ZERO; + BigDecimal payedMoney = BigDecimal.ZERO; + if(!CollectionUtils.isEmpty(listProfit)){ - EmisCommissionProfit item0=listProfit.get(0); - jObjData.put("money",item0.getMoney().stripTrailingZeros().toPlainString()); - jObjData.put("payedMoney",item0.getPayedMoney().stripTrailingZeros().toPlainString()); + for (EmisCommissionProfit item:listProfit) { + estMoney=estMoney.add(item.getMoney()); + payedMoney=payedMoney.add(item.getPayedMoney()); + } } + + jObjData.put("money",estMoney.stripTrailingZeros().toPlainString()); + jObjData.put("payedMoney",payedMoney.stripTrailingZeros().toPlainString()); + + // 获取提成明细 return AjaxResult.success("查询成功",jObjData); } diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonToolsController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonToolsController.java index ea97347d7..a4bedaab8 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonToolsController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonToolsController.java @@ -112,14 +112,14 @@ public class EmisCommonToolsController extends EmisBaseController emisCommissionProfit.setEmpName(empName); // emisCommissionProfit.setBillMonth(billMonth); List listProfit= emisCommissionProfitService.selectEmisCommissionProfitList(emisCommissionProfit); - BigDecimal estMoneyMoney = BigDecimal.ZERO; + BigDecimal estMoney = BigDecimal.ZERO; if(!CollectionUtils.isEmpty(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()); // 待回款