wenyx
/
CXKG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

期初支出范围增加退款状态

This commit is contained in:
zengweihai 2024-12-09 10:01:00 +08:00
parent 3a4cfeb7d2
commit f9747b0d90
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
shkd-cosmic-debug/src/main/java/shkd/fi/cas/report/data/CapitalDayListDataPlugin.java
View File

@ -260,8 +260,9 @@ public class CapitalDayListDataPlugin extends AbstractReportListDataPlugin imple
} }
BigDecimal payAmountTotal = BigDecimal.ZERO; BigDecimal payAmountTotal = BigDecimal.ZERO;
BigDecimal recAmountTotal = BigDecimal.ZERO; BigDecimal recAmountTotal = BigDecimal.ZERO;
//逻辑1：查询该公司到查询时间的所有付款单 //逻辑1：查询该公司到查询时间的所有付款单(已付款、退款)
QFilter bef_payQF = new QFilter("billstatus", QCP.equals, "D"); List<String> 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("org.id",QCP.equals,orgPkValue);
bef_payQF.and("paydate",QCP.large_equals,begindate);//付款日期paydate 业务日期bizdate bef_payQF.and("paydate",QCP.large_equals,begindate);//付款日期paydate 业务日期bizdate
if (firstDate == null){//没有设置时间，则查询今日记账,即查询期间开始到今日之前的所有付款单据 if (firstDate == null){//没有设置时间，则查询今日记账,即查询期间开始到今日之前的所有付款单据
@ -335,8 +336,8 @@ public class CapitalDayListDataPlugin extends AbstractReportListDataPlugin imple
perRecAmountTotal = perRecAmountTotal.add(actrecamt);//添加收入金额 perRecAmountTotal = perRecAmountTotal.add(actrecamt);//添加收入金额
} }
firmParam[3] = perRecAmountTotal; firmParam[3] = perRecAmountTotal;
//逻辑4：查询该公司期间总支出 //逻辑4：查询该公司期间总支出(已付款、退款)
List<String> statuses = Arrays.asList("D", "I");
QFilter per_payQF = new QFilter("billstatus", QCP.in, statuses); QFilter per_payQF = new QFilter("billstatus", QCP.in, statuses);
if (exratetable != null){ if (exratetable != null){
per_payQF.and("exratetable.id",QCP.equals,exratetableId); per_payQF.and("exratetable.id",QCP.equals,exratetableId);