From a7715b9fec2718628dd28a8c6f2d0d86638a94ae Mon Sep 17 00:00:00 2001 From: zhangqinlin <1500920753@qq.com> Date: Wed, 15 Sep 2021 09:59:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayWorkingGroupStatisticsController.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupStatisticsController.java index ee9973e3..89f48c25 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupStatisticsController.java @@ -60,9 +60,9 @@ public class PayWorkingGroupStatisticsController { double sum = pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getAllMoney()==null ? "0" : t.getAllMoney())).sum(); double sum2 = pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney()==null ? "0" : t.getComeAllMoney())).sum(); HashMap objectObjectHashMap = new HashMap<>(); - objectObjectHashMap.put("分页集合",pageList); - objectObjectHashMap.put("总计应收总金额",sum); - objectObjectHashMap.put("总计实收总金额",sum2); + objectObjectHashMap.put("pageList",pageList); + objectObjectHashMap.put("sumOfMoney",sum); + objectObjectHashMap.put("sumOfReallyMoney",sum2); return Result.OK(objectObjectHashMap); } @@ -107,9 +107,9 @@ public class PayWorkingGroupStatisticsController { double sum = pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getAllMoney() == null ? "0" : t.getAllMoney())).sum(); double sum2 = pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null ? "0" : t.getComeAllMoney())).sum(); HashMap objectObjectHashMap = new HashMap<>(); - objectObjectHashMap.put("分页集合", pageList); - objectObjectHashMap.put("总计应收总金额", sum); - objectObjectHashMap.put("总计实收总金额", sum2); + objectObjectHashMap.put("pageList", pageList); + objectObjectHashMap.put("sumOfMoney", sum); + objectObjectHashMap.put("sumOfReallyMoney", sum2); return Result.OK(objectObjectHashMap); } /** @@ -130,8 +130,8 @@ public class PayWorkingGroupStatisticsController { List payment_charge_use = sysBaseAPI.queryDictItemsByCode("payment_charge_use"); List account_type = sysBaseAPI.queryDictItemsByCode("account_type"); HashMap> hashMap = new HashMap<>(); - hashMap.put("来款用途", payment_charge_use); - hashMap.put("到账状态", account_type); + hashMap.put("payment_charge_use", payment_charge_use); + hashMap.put("account_type", account_type); return hashMap; }