zhangzhiguo
/
zhongcaiguoji
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
xuhaihui 2025-10-11 16:51:42 +08:00
parent f6fe9b62e7 b6f019de22
commit 41784dc328
2 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/common/SubjectbalanceAutoData.java
View File

@ -122,6 +122,13 @@ public class SubjectbalanceAutoData {
} }
balanceQueryParamApi.setAccountAssgrp(accountAssgrp); balanceQueryParamApi.setAccountAssgrp(accountAssgrp);
groupBy.add(asseestype); groupBy.add(asseestype);
}else{
Map<String, List<Map<String, String>>> accountAssgrp = new HashMap<>();
List<Map<String, String>> li = new ArrayList<>();
for (String accNum : accountNumber) {
accountAssgrp.put(accNum, li);
}
balanceQueryParamApi.setAccountAssgrp(accountAssgrp);
} }
groupBy.add("account"); groupBy.add("account");
balanceQueryParamApi.setGroupBys(groupBy); balanceQueryParamApi.setGroupBys(groupBy);
@ -155,15 +162,17 @@ public class SubjectbalanceAutoData {
assistbalance.set("zcgj_sourcetype", asseestype); assistbalance.set("zcgj_sourcetype", asseestype);
Map<String, AccountRecord.AssGrpItem> assgrp = record.getAssgrp(); Map<String, AccountRecord.AssGrpItem> assgrp = record.getAssgrp();
if (assgrp.containsKey("0032")) { if(assgrp!=null){
if (assgrp.get("0032") != null) { if (assgrp.containsKey("0032")) {
assistbalance.set("zcgj_processnumber", assgrp.get("0032").getNumber()); if (assgrp.get("0032") != null) {
assistbalance.set("zcgj_processname", assgrp.get("0032").getName()); assistbalance.set("zcgj_processnumber", assgrp.get("0032").getNumber());
} assistbalance.set("zcgj_processname", assgrp.get("0032").getName());
} else if (assgrp.containsKey("0017")) { }
if (assgrp.get("0017") != null) { } else if (assgrp.containsKey("0017")) {
assistbalance.set("zcgj_costcompanynumber", assgrp.get("0017").getNumber()); if (assgrp.get("0017") != null) {
assistbalance.set("zcgj_costcompanyname", assgrp.get("0017").getName()); assistbalance.set("zcgj_costcompanynumber", assgrp.get("0017").getNumber());
assistbalance.set("zcgj_costcompanyname", assgrp.get("0017").getName());
}
} }
} }
addEntities.add(assistbalance); addEntities.add(assistbalance);

20
code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/FundingplanapplyAccountBalancePlugin.java
View File

@ -126,16 +126,21 @@ public class FundingplanapplyAccountBalancePlugin extends AbstractBillPlugIn imp
List<AccountRecord> records = gson.fromJson(data, listType); List<AccountRecord> records = gson.fromJson(data, listType);
BigDecimal totalbeginlocal = BigDecimal.ZERO; BigDecimal totalbeginlocal = BigDecimal.ZERO;
BigDecimal totalendlocal = BigDecimal.ZERO;
BigDecimal totayeardebitfor = BigDecimal.ZERO; BigDecimal totayeardebitfor = BigDecimal.ZERO;
BigDecimal totalyearcreditfor = BigDecimal.ZERO; BigDecimal totalyearcreditfor = BigDecimal.ZERO;
for (AccountRecord record : records) { for (AccountRecord record : records) {
totalbeginlocal = totalbeginlocal.add(record.getBeginlocal());//期初本位币金额 totalbeginlocal = totalbeginlocal.add(record.getBeginlocal());//期初本位币金额
totalendlocal = totalendlocal.add(record.getEndlocal());//期初本位币金额
totayeardebitfor = totayeardebitfor.add(record.getYeardebitfor());//yeardebitfor totayeardebitfor = totayeardebitfor.add(record.getYeardebitfor());//yeardebitfor
totalyearcreditfor = totalyearcreditfor.add(record.getYearcreditfor());//yearcreditfor totalyearcreditfor = totalyearcreditfor.add(record.getYearcreditfor());//yearcreditfor
} }
DynamicObjectCollection zcgjFinApprovedAmount = this.getModel().getDataEntity(true).getDynamicObjectCollection("zcgj_infundproject_entry"); DynamicObjectCollection zcgjFinApprovedAmount = this.getModel().getDataEntity(true).getDynamicObjectCollection("zcgj_infundproject_entry");
DynamicObject dynamicObject = zcgjFinApprovedAmount.get(rowIndex); DynamicObject dynamicObject = zcgjFinApprovedAmount.get(rowIndex);
dynamicObject.set("zcgj_iinitialreceivable",totalbeginlocal);//年初余额取科目余额表年初数 //年初余额 = 期末余额-本年累计借方+本年累计贷方
BigDecimal beginningbalanceofyear =totalendlocal.subtract(totayeardebitfor).add(totalyearcreditfor);
dynamicObject.set("zcgj_iinitialreceivable",beginningbalanceofyear);//年初余额取科目余额表年初数
dynamicObject.set("zcgj_monthbeginreceivable",totalbeginlocal);//月初应收余额
dynamicObject.set("zcgj_ytdoutputvalue",totayeardebitfor);//本年累计结算-借方 dynamicObject.set("zcgj_ytdoutputvalue",totayeardebitfor);//本年累计结算-借方
dynamicObject.set("zcgj_ytdpaymentreceived",totalyearcreditfor);//本年累计回款-贷方 dynamicObject.set("zcgj_ytdpaymentreceived",totalyearcreditfor);//本年累计回款-贷方
this.getView().updateView("zcgj_infundproject_entry"); this.getView().updateView("zcgj_infundproject_entry");
@ -144,6 +149,7 @@ public class FundingplanapplyAccountBalancePlugin extends AbstractBillPlugIn imp
DynamicObjectCollection zcgjFinApprovedAmount = this.getModel().getDataEntity(true).getDynamicObjectCollection("zcgj_infundproject_entry"); DynamicObjectCollection zcgjFinApprovedAmount = this.getModel().getDataEntity(true).getDynamicObjectCollection("zcgj_infundproject_entry");
DynamicObject dynamicObject = zcgjFinApprovedAmount.get(rowIndex); DynamicObject dynamicObject = zcgjFinApprovedAmount.get(rowIndex);
dynamicObject.set("zcgj_iinitialreceivable",BigDecimal.ZERO);//年初余额取科目余额表年初数 dynamicObject.set("zcgj_iinitialreceivable",BigDecimal.ZERO);//年初余额取科目余额表年初数
dynamicObject.set("zcgj_monthbeginreceivable",BigDecimal.ZERO);//年初余额取科目余额表年初数
dynamicObject.set("zcgj_ytdoutputvalue",BigDecimal.ZERO);//本年累计结算-借方 dynamicObject.set("zcgj_ytdoutputvalue",BigDecimal.ZERO);//本年累计结算-借方
dynamicObject.set("zcgj_ytdpaymentreceived",BigDecimal.ZERO);//本年累计回款-贷方 dynamicObject.set("zcgj_ytdpaymentreceived",BigDecimal.ZERO);//本年累计回款-贷方
this.getView().updateView("zcgj_infundproject_entry"); this.getView().updateView("zcgj_infundproject_entry");
@ -197,24 +203,30 @@ public class FundingplanapplyAccountBalancePlugin extends AbstractBillPlugIn imp
List<AccountRecord> records = gson.fromJson(data, listType); List<AccountRecord> records = gson.fromJson(data, listType);
BigDecimal totalbeginlocal = BigDecimal.ZERO; BigDecimal totalbeginlocal = BigDecimal.ZERO;
BigDecimal totalendlocal = BigDecimal.ZERO;
BigDecimal totayeardebitfor = BigDecimal.ZERO; BigDecimal totayeardebitfor = BigDecimal.ZERO;
BigDecimal totalyearcreditfor = BigDecimal.ZERO; BigDecimal totalyearcreditfor = BigDecimal.ZERO;
for (AccountRecord record : records) { for (AccountRecord record : records) {
totalbeginlocal = totalbeginlocal.add(record.getBeginlocal());//期初本位币金额 totalbeginlocal = totalbeginlocal.add(record.getBeginlocal());//期初本位币金额
totalendlocal = totalendlocal.add(record.getEndlocal());//期初本位币金额
totayeardebitfor = totayeardebitfor.add(record.getYeardebitfor());//yeardebitfor totayeardebitfor = totayeardebitfor.add(record.getYeardebitfor());//yeardebitfor
totalyearcreditfor = totalyearcreditfor.add(record.getYearcreditfor());//yearcreditfor totalyearcreditfor = totalyearcreditfor.add(record.getYearcreditfor());//yearcreditfor
} }
DynamicObjectCollection zcgjFinApprovedAmount = this.getModel().getDataEntity(true).getDynamicObjectCollection("zcgj_outfundproject_entry"); DynamicObjectCollection zcgjFinApprovedAmount = this.getModel().getDataEntity(true).getDynamicObjectCollection("zcgj_outfundproject_entry");
DynamicObject dynamicObject = zcgjFinApprovedAmount.get(rowIndex); DynamicObject dynamicObject = zcgjFinApprovedAmount.get(rowIndex);
dynamicObject.set("zcgj_openingpayable",totalbeginlocal);//年初余额取科目余额表年初数 //年初余额 = 期末余额-本年累计借方+本年累计贷方
dynamicObject.set("zcgj_ytdnetsettlement",totayeardebitfor);//本年累计结算-借方 BigDecimal beginningbalanceofyear =totalendlocal.subtract(totalyearcreditfor).add(totayeardebitfor);
dynamicObject.set("zcgj_ytdtotalpayment",totalyearcreditfor);//本年累计付款-贷方 dynamicObject.set("zcgj_openingpayable",beginningbalanceofyear);//年初余额取科目余额表年初数
dynamicObject.set("zcgj_monthbeginpayable",totalbeginlocal);//月初应付余额
dynamicObject.set("zcgj_ytdtotalpayment",totayeardebitfor);//本年累计付款-借方
dynamicObject.set("zcgj_ytdnetsettlement",totalyearcreditfor);//本年累计结算-贷方
this.getView().updateView("zcgj_outfundproject_entry"); this.getView().updateView("zcgj_outfundproject_entry");
} }
}else{ }else{
DynamicObjectCollection zcgjFinApprovedAmount = this.getModel().getDataEntity(true).getDynamicObjectCollection("zcgj_outfundproject_entry"); DynamicObjectCollection zcgjFinApprovedAmount = this.getModel().getDataEntity(true).getDynamicObjectCollection("zcgj_outfundproject_entry");
DynamicObject dynamicObject = zcgjFinApprovedAmount.get(rowIndex); DynamicObject dynamicObject = zcgjFinApprovedAmount.get(rowIndex);
dynamicObject.set("zcgj_openingpayable",BigDecimal.ZERO);//年初余额取科目余额表年初数 dynamicObject.set("zcgj_openingpayable",BigDecimal.ZERO);//年初余额取科目余额表年初数
dynamicObject.set("zcgj_monthbeginpayable",BigDecimal.ZERO);//年初余额取科目余额表年初数
dynamicObject.set("zcgj_ytdnetsettlement",BigDecimal.ZERO);//本年累计结算-借方 dynamicObject.set("zcgj_ytdnetsettlement",BigDecimal.ZERO);//本年累计结算-借方
dynamicObject.set("zcgj_ytdtotalpayment",BigDecimal.ZERO);//本年累计付款-贷方 dynamicObject.set("zcgj_ytdtotalpayment",BigDecimal.ZERO);//本年累计付款-贷方
this.getView().updateView("zcgj_outfundproject_entry"); this.getView().updateView("zcgj_outfundproject_entry");