From f9747b0d90a0b75afc13c5bb2ebd7a2cf11dc509 Mon Sep 17 00:00:00 2001 From: zengweihai Date: Mon, 9 Dec 2024 10:01:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=9F=E5=88=9D=E6=94=AF=E5=87=BA=E8=8C=83?= =?UTF-8?q?=E5=9B=B4=E5=A2=9E=E5=8A=A0=E9=80=80=E6=AC=BE=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fi/cas/report/data/CapitalDayListDataPlugin.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/shkd-cosmic-debug/src/main/java/shkd/fi/cas/report/data/CapitalDayListDataPlugin.java b/shkd-cosmic-debug/src/main/java/shkd/fi/cas/report/data/CapitalDayListDataPlugin.java index 4a11f94..b8d5967 100644 --- a/shkd-cosmic-debug/src/main/java/shkd/fi/cas/report/data/CapitalDayListDataPlugin.java +++ b/shkd-cosmic-debug/src/main/java/shkd/fi/cas/report/data/CapitalDayListDataPlugin.java @@ -260,8 +260,9 @@ public class CapitalDayListDataPlugin extends AbstractReportListDataPlugin imple } BigDecimal payAmountTotal = BigDecimal.ZERO; BigDecimal recAmountTotal = BigDecimal.ZERO; - //逻辑1：查询该公司到查询时间的所有付款单 - QFilter bef_payQF = new QFilter("billstatus", QCP.equals, "D"); + //逻辑1：查询该公司到查询时间的所有付款单(已付款、退款) + List statuses = Arrays.asList("D", "I"); + QFilter bef_payQF = new QFilter("billstatus", QCP.in, statuses); bef_payQF.and("org.id",QCP.equals,orgPkValue); bef_payQF.and("paydate",QCP.large_equals,begindate);//付款日期paydate 业务日期bizdate if (firstDate == null){//没有设置时间，则查询今日记账,即查询期间开始到今日之前的所有付款单据 @@ -335,8 +336,8 @@ public class CapitalDayListDataPlugin extends AbstractReportListDataPlugin imple perRecAmountTotal = perRecAmountTotal.add(actrecamt);//添加收入金额 } firmParam[3] = perRecAmountTotal; - //逻辑4：查询该公司期间总支出 - List statuses = Arrays.asList("D", "I"); + //逻辑4：查询该公司期间总支出(已付款、退款) + QFilter per_payQF = new QFilter("billstatus", QCP.in, statuses); if (exratetable != null){ per_payQF.and("exratetable.id",QCP.equals,exratetableId);