From 381ea6197112069b7437b849059004dc14a9ca5e Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Thu, 8 May 2025 13:21:53 +0800 Subject: [PATCH] =?UTF-8?q?demand:=20=E8=AE=A1=E7=AE=97=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E8=8C=83=E5=9B=B4=E5=86=85=E6=AF=8F=E4=B8=80=E5=A4=A9=E8=B4=A6?= =?UTF-8?q?=E5=8D=95=E6=80=BB=E9=87=91=E9=A2=9D=E4=BF=AE=E6=94=B9=20commit?= =?UTF-8?q?ter:=20heyu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/web/emis/EmisSettleBillController.java | 2 +- .../erp/emis/service/IEmisSettleBillService.java | 2 +- .../service/impl/EmisSettleBillServiceImpl.java | 13 ++----------- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java index 39e6de106..29c1eefd2 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java @@ -296,7 +296,7 @@ public class EmisSettleBillController extends BaseController */ @GetMapping("/calculateRecedMoney") public AjaxResult calculateRecedMoney(String beginTime, String endTime) { - List> result = emisSettleBillService.calculateRecedMoney(beginTime, endTime); + List> result = emisSettleBillService.calculateRecedMoney(beginTime, endTime); return AjaxResult.success(result); } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleBillService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleBillService.java index cd465c3f0..a9def5c71 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleBillService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleBillService.java @@ -151,5 +151,5 @@ public interface IEmisSettleBillService extends IDataAuditService * @param endTime 结束时间 * @return 每一天的收款总金额 */ - List> calculateRecedMoney(String beginTime, String endTime); + List> calculateRecedMoney(String beginTime, String endTime); } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java index bbf7a644c..92e4fff77 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java @@ -1215,18 +1215,9 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS } @Override - public List> calculateRecedMoney(String beginTime, String endTime) { + public List> calculateRecedMoney(String beginTime, String endTime) { // 查询获取按天统计的已收款金额 - List> resultList = emisSettlePayRecordMapper.calculateRecedMoney(beginTime, endTime); - - List> dailyAmounts = new ArrayList<>(); - for (Map result : resultList) { - Map item = new HashMap<>(); - item.put("tradeDay", (String) result.get("tradeDay")); - item.put("payMoney", result.get("payMoney").toString()); - dailyAmounts.add(item); - } - return dailyAmounts; + return emisSettlePayRecordMapper.calculateRecedMoney(beginTime, endTime); } /**