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

资金日表取数逻辑更新

This commit is contained in:
zengweihai 2024-08-15 16:37:25 +08:00
parent 88b872bac3
commit 4f17a17f37
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -292,7 +292,7 @@ public class CapitalDayListDataPlugin extends AbstractReportListDataPlugin imple
} }
per_recQF.and("payeedate",QCP.large_equals,startDate);//收款日期payeedate 业务日期bizdate per_recQF.and("payeedate",QCP.large_equals,startDate);//收款日期payeedate 业务日期bizdate
per_recQF.and("payeedate",QCP.less_equals,overDate); per_recQF.and("payeedate",QCP.less_equals,overDate);
DynamicObject[] per_cas_recbills = BusinessDataServiceHelper.load("cas_recbill", "id,org,org.id,org.number,actrecamt,currency,payertype,customerf7,customerf7,payer,receivingtype", per_recQF.toArray()); DynamicObject[] per_cas_recbills = BusinessDataServiceHelper.load("cas_recbill", "id,billno,org,org.id,org.number,actrecamt,currency,payertype,customerf7,customerf7,payer,receivingtype", per_recQF.toArray());
BigDecimal transactions = this.getTransactions(per_cas_recbills); BigDecimal transactions = this.getTransactions(per_cas_recbills);
recLB =recLB.add(transactions); //内部往来收入合计 recLB =recLB.add(transactions); //内部往来收入合计
@ -313,7 +313,7 @@ public class CapitalDayListDataPlugin extends AbstractReportListDataPlugin imple
per_payQF.and("org.id",QCP.equals,orgPkValue); per_payQF.and("org.id",QCP.equals,orgPkValue);
per_payQF.and("paydate",QCP.large_equals,startDate);//付款日期paydate 业务日期bizdate per_payQF.and("paydate",QCP.large_equals,startDate);//付款日期paydate 业务日期bizdate
per_payQF.and("paydate",QCP.less_equals,overDate); per_payQF.and("paydate",QCP.less_equals,overDate);
DynamicObject[] per_cas_paybills = BusinessDataServiceHelper.load("cas_paybill", "id,org,org.id,org.number,payeenumber,actpayamt,currency,payeetype,payee,paymenttype", per_payQF.toArray()); DynamicObject[] per_cas_paybills = BusinessDataServiceHelper.load("cas_paybill", "id,billno,org,payeenumber,actpayamt,currency,paymenttype", per_payQF.toArray());
HashMap<String, BigDecimal> stringBigDecimalHashMap = this.getTransactionsByfk(per_cas_paybills); HashMap<String, BigDecimal> stringBigDecimalHashMap = this.getTransactionsByfk(per_cas_paybills);
payLB =payLB.add(stringBigDecimalHashMap.get("pay")); //内部往来支出合计 payLB =payLB.add(stringBigDecimalHashMap.get("pay")); //内部往来支出合计
recLB = recLB.add(stringBigDecimalHashMap.get("rec"));//内部往来收入合计（同公司收入补充） recLB = recLB.add(stringBigDecimalHashMap.get("rec"));//内部往来收入合计（同公司收入补充）