From 60de4f6858010b64a963a4ba1dcd9d6f1766fd0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E8=B4=B5=E5=BC=BA?= Date: Mon, 7 Jul 2025 15:18:17 +0800 Subject: [PATCH] =?UTF-8?q?=E9=93=B6=E8=A1=8C=E4=BD=99=E9=A2=9D=E6=B1=87?= =?UTF-8?q?=E6=80=BB=E8=A1=A8=E6=94=B9=E5=8A=A8=EF=BC=8C=E5=90=88=E8=AE=A1?= =?UTF-8?q?=E8=A1=8C=E6=94=BE=E9=A6=96=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/BankBalanceSummaryFormPlugin.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/main/java/shjh/jhzj7/fi/fi/plugin/report/BankBalanceSummaryFormPlugin.java b/main/java/shjh/jhzj7/fi/fi/plugin/report/BankBalanceSummaryFormPlugin.java index d938723..2ffa16b 100644 --- a/main/java/shjh/jhzj7/fi/fi/plugin/report/BankBalanceSummaryFormPlugin.java +++ b/main/java/shjh/jhzj7/fi/fi/plugin/report/BankBalanceSummaryFormPlugin.java @@ -29,7 +29,7 @@ public class BankBalanceSummaryFormPlugin extends AbstractReportFormPlugin imple public static final String CIM_FINSUBSCRIBE = "cim_finsubscribe";//理财申购单 public static final String CIM_INTBILL_BATCH = "cim_intbill_batch";//理财收益批量预提 public static final String CIM_DEPOSIT = "cim_deposit";//定期存款处理 - private static final String[] FIELDS = {"1: 运营资金", "1.1 强共享公司", "1.2 弱共享公司", "2: 理财", "3: 定期", "合计"}; + private static final String[] FIELDS = {"合计","1: 运营资金", "1.1 强共享公司", "1.2 弱共享公司", "2: 理财", "3: 定期"}; private static final Log log = LogFactory.getLog(BankBalanceSummaryFormPlugin.class); @Override @@ -162,7 +162,7 @@ public class BankBalanceSummaryFormPlugin extends AbstractReportFormPlugin imple String field = fieldMap.get(type); if (field != null) { - int index = isShare ? 1 : 2; + int index = isShare ? 2 : 3; DynamicObject row1 = rowData.get(index); row1.set(field, total); } @@ -239,7 +239,7 @@ public class BankBalanceSummaryFormPlugin extends AbstractReportFormPlugin imple String field = fieldMap.get(type); if (field != null) { - DynamicObject row3 = rowData.get(3);//理财 + DynamicObject row3 = rowData.get(4);//理财 row3.set(field, total);//理财申购单的本金+计提收益 } } @@ -295,7 +295,7 @@ public class BankBalanceSummaryFormPlugin extends AbstractReportFormPlugin imple String field = fieldMap.get(type); if (field != null) { - DynamicObject row3 = rowData.get(4);//理财 + DynamicObject row3 = rowData.get(5);//理财 row3.set(field, total);//理财申购单的本金+计提收益 } } @@ -303,9 +303,9 @@ public class BankBalanceSummaryFormPlugin extends AbstractReportFormPlugin imple * 设置运营资金金额数据: 强共享 + 弱共享 */ private void setAmount(DynamicObjectCollection rowData) { - DynamicObject row0 = rowData.get(0);//运营资金 - DynamicObject row1 = rowData.get(1);//强共享 - DynamicObject row2 = rowData.get(2);//弱共享 + DynamicObject row0 = rowData.get(1);//运营资金 + DynamicObject row1 = rowData.get(2);//强共享 + DynamicObject row2 = rowData.get(3);//弱共享 row0.set("shjh_benchmarkamount", row1.getBigDecimal("shjh_benchmarkamount").add(row2.getBigDecimal("shjh_benchmarkamount")));//基准日期(余额) row0.set("shjh_sameyearamount", row1.getBigDecimal("shjh_sameyearamount").add(row2.getBigDecimal("shjh_sameyearamount")));//同年比较日期(余额) row0.set("shjh_monthonmonthrate", row1.getBigDecimal("shjh_monthonmonthrate").add(row2.getBigDecimal("shjh_monthonmonthrate")));//环比 @@ -317,10 +317,10 @@ public class BankBalanceSummaryFormPlugin extends AbstractReportFormPlugin imple * 设置合计数据:运营资金 + 理财 + 定期 */ private void setTotal(DynamicObjectCollection rowData) { - DynamicObject row5 = rowData.get(5);//合计 - DynamicObject row0 = rowData.get(0);//运营资金 - DynamicObject row3 = rowData.get(3);//2: 理财 - DynamicObject row4 = rowData.get(4);//3: 定期 + DynamicObject row5 = rowData.get(0);//合计 + DynamicObject row0 = rowData.get(1);//运营资金 + DynamicObject row3 = rowData.get(4);//2: 理财 + DynamicObject row4 = rowData.get(5);//3: 定期 row5.set("shjh_benchmarkamount", row0.getBigDecimal("shjh_benchmarkamount").add(row3.getBigDecimal("shjh_benchmarkamount")).add(row4.getBigDecimal("shjh_benchmarkamount")));//基准日期(余额) row5.set("shjh_sameyearamount", row0.getBigDecimal("shjh_sameyearamount").add(row3.getBigDecimal("shjh_sameyearamount")).add(row4.getBigDecimal("shjh_sameyearamount")));//同年比较日期(余额) row5.set("shjh_monthonmonthrate", row0.getBigDecimal("shjh_monthonmonthrate").add(row3.getBigDecimal("shjh_monthonmonthrate")).add(row4.getBigDecimal("shjh_monthonmonthrate")));//环比