From 6a8bda28d4cad3ef1cc5425909e16090e8b325ea Mon Sep 17 00:00:00 2001 From: zhangzhiguo <421587375@qq.com> Date: Sat, 11 Oct 2025 16:21:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B5=84=E9=87=91=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E7=A7=91=E7=9B=AE=E4=BD=99=E9=A2=9D=E5=8F=96?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FundingplanapplyAccountBalancePlugin.java | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/FundingplanapplyAccountBalancePlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/FundingplanapplyAccountBalancePlugin.java index fe8ec6e..04134ae 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/FundingplanapplyAccountBalancePlugin.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/FundingplanapplyAccountBalancePlugin.java @@ -126,16 +126,21 @@ public class FundingplanapplyAccountBalancePlugin extends AbstractBillPlugIn imp List records = gson.fromJson(data, listType); BigDecimal totalbeginlocal = BigDecimal.ZERO; + BigDecimal totalendlocal = BigDecimal.ZERO; BigDecimal totayeardebitfor = BigDecimal.ZERO; BigDecimal totalyearcreditfor = BigDecimal.ZERO; for (AccountRecord record : records) { totalbeginlocal = totalbeginlocal.add(record.getBeginlocal());//期初本位币金额 + totalendlocal = totalendlocal.add(record.getEndlocal());//期初本位币金额 totayeardebitfor = totayeardebitfor.add(record.getYeardebitfor());//yeardebitfor totalyearcreditfor = totalyearcreditfor.add(record.getYearcreditfor());//yearcreditfor } DynamicObjectCollection zcgjFinApprovedAmount = this.getModel().getDataEntity(true).getDynamicObjectCollection("zcgj_infundproject_entry"); 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_ytdpaymentreceived",totalyearcreditfor);//本年累计回款-贷方 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"); DynamicObject dynamicObject = zcgjFinApprovedAmount.get(rowIndex); dynamicObject.set("zcgj_iinitialreceivable",BigDecimal.ZERO);//年初余额取科目余额表年初数 + dynamicObject.set("zcgj_monthbeginreceivable",BigDecimal.ZERO);//年初余额取科目余额表年初数 dynamicObject.set("zcgj_ytdoutputvalue",BigDecimal.ZERO);//本年累计结算-借方 dynamicObject.set("zcgj_ytdpaymentreceived",BigDecimal.ZERO);//本年累计回款-贷方 this.getView().updateView("zcgj_infundproject_entry"); @@ -197,24 +203,30 @@ public class FundingplanapplyAccountBalancePlugin extends AbstractBillPlugIn imp List records = gson.fromJson(data, listType); BigDecimal totalbeginlocal = BigDecimal.ZERO; + BigDecimal totalendlocal = BigDecimal.ZERO; BigDecimal totayeardebitfor = BigDecimal.ZERO; BigDecimal totalyearcreditfor = BigDecimal.ZERO; for (AccountRecord record : records) { totalbeginlocal = totalbeginlocal.add(record.getBeginlocal());//期初本位币金额 + totalendlocal = totalendlocal.add(record.getEndlocal());//期初本位币金额 totayeardebitfor = totayeardebitfor.add(record.getYeardebitfor());//yeardebitfor totalyearcreditfor = totalyearcreditfor.add(record.getYearcreditfor());//yearcreditfor } DynamicObjectCollection zcgjFinApprovedAmount = this.getModel().getDataEntity(true).getDynamicObjectCollection("zcgj_outfundproject_entry"); DynamicObject dynamicObject = zcgjFinApprovedAmount.get(rowIndex); - dynamicObject.set("zcgj_openingpayable",totalbeginlocal);//年初余额取科目余额表年初数 - dynamicObject.set("zcgj_ytdnetsettlement",totayeardebitfor);//本年累计结算-借方 - dynamicObject.set("zcgj_ytdtotalpayment",totalyearcreditfor);//本年累计付款-贷方 + //年初余额 = 期末余额-本年累计借方+本年累计贷方 + BigDecimal beginningbalanceofyear =totalendlocal.subtract(totalyearcreditfor).add(totayeardebitfor); + 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"); } }else{ DynamicObjectCollection zcgjFinApprovedAmount = this.getModel().getDataEntity(true).getDynamicObjectCollection("zcgj_outfundproject_entry"); DynamicObject dynamicObject = zcgjFinApprovedAmount.get(rowIndex); dynamicObject.set("zcgj_openingpayable",BigDecimal.ZERO);//年初余额取科目余额表年初数 + dynamicObject.set("zcgj_monthbeginpayable",BigDecimal.ZERO);//年初余额取科目余额表年初数 dynamicObject.set("zcgj_ytdnetsettlement",BigDecimal.ZERO);//本年累计结算-借方 dynamicObject.set("zcgj_ytdtotalpayment",BigDecimal.ZERO);//本年累计付款-贷方 this.getView().updateView("zcgj_outfundproject_entry"); From b6f019de22ae17101864573a3f7a7515a21e56c5 Mon Sep 17 00:00:00 2001 From: zhangzhiguo <421587375@qq.com> Date: Sat, 11 Oct 2025 16:21:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E7=BB=B4=E5=BA=A6?= =?UTF-8?q?=E7=A7=91=E7=9B=AE=E4=BD=99=E9=A2=9D=E5=8F=96=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/common/SubjectbalanceAutoData.java | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/common/SubjectbalanceAutoData.java b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/common/SubjectbalanceAutoData.java index 2ddefaa..0e25678 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/common/SubjectbalanceAutoData.java +++ b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/common/SubjectbalanceAutoData.java @@ -122,6 +122,13 @@ public class SubjectbalanceAutoData { } balanceQueryParamApi.setAccountAssgrp(accountAssgrp); groupBy.add(asseestype); + }else{ + Map>> accountAssgrp = new HashMap<>(); + List> li = new ArrayList<>(); + for (String accNum : accountNumber) { + accountAssgrp.put(accNum, li); + } + balanceQueryParamApi.setAccountAssgrp(accountAssgrp); } groupBy.add("account"); balanceQueryParamApi.setGroupBys(groupBy); @@ -155,15 +162,17 @@ public class SubjectbalanceAutoData { assistbalance.set("zcgj_sourcetype", asseestype); Map assgrp = record.getAssgrp(); - if (assgrp.containsKey("0032")) { - if (assgrp.get("0032") != null) { - 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) { - assistbalance.set("zcgj_costcompanynumber", assgrp.get("0017").getNumber()); - assistbalance.set("zcgj_costcompanyname", assgrp.get("0017").getName()); + if(assgrp!=null){ + if (assgrp.containsKey("0032")) { + if (assgrp.get("0032") != null) { + 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) { + assistbalance.set("zcgj_costcompanynumber", assgrp.get("0017").getNumber()); + assistbalance.set("zcgj_costcompanyname", assgrp.get("0017").getName()); + } } } addEntities.add(assistbalance);