期初支出范围增加退款状态
This commit is contained in:
parent
3a4cfeb7d2
commit
f9747b0d90
|
@ -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<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("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<String> 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);
|
||||
|
|
Loading…
Reference in New Issue