From 11c0e27a8a5b9092dcd141fa36c98094aaf87847 Mon Sep 17 00:00:00 2001 From: chenshaoxin <1981897232@qq.com> Date: Wed, 23 Apr 2025 11:22:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9A=E9=99=88?= =?UTF-8?q?=E7=BB=8D=E9=91=AB=20=E6=97=A5=E6=9C=9F=EF=BC=9A2025/4/23=2016?= =?UTF-8?q?=EF=BC=9A30=20=E5=86=85=E5=AE=B9:=E4=B8=8A=E5=88=92=E4=B8=8B?= =?UTF-8?q?=E6=8B=A8=EF=BC=88new=EF=BC=89=E6=8F=92=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sys/plugin/report/transbillreportnewPlugin.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/transbillreportnewPlugin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/transbillreportnewPlugin.java index a0925b5..ece9585 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/transbillreportnewPlugin.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/transbillreportnewPlugin.java @@ -118,14 +118,15 @@ public class transbillreportnewPlugin extends AbstractTmcTreeReportDataPlugin { //期末 - List sumAmountFieldList1 = new ArrayList(5); + List sumAmountFieldList1 = new ArrayList(6); sumAmountFieldList1.add("shkd_qcye"); sumAmountFieldList1.add("shkd_qckyye"); sumAmountFieldList1.add("upamount"); sumAmountFieldList1.add("downamount"); sumAmountFieldList1.add("shkd_qmye"); sumAmountFieldList1.add("shkd_qmkyye"); -// this.setSumAmountFieldList(sumAmountFieldList1); + sumAmountFieldList1.add("differenceamount"); + this.setSumAmountFieldList(sumAmountFieldList1); //期末余额 dataSet = dataSet.addField("shkd_qcye+upamount- downamount", "shkd_qmye"); dataSet = dataSet.addField("shkd_qckyye+upamount- downamount", "shkd_qmkyye"); @@ -314,12 +315,12 @@ public class transbillreportnewPlugin extends AbstractTmcTreeReportDataPlugin { // GroupbyDataSet group = dataSet.groupBy(new String[]{"parentorg", "parentorgid", "bank", "bankid","sonorg","sonorgid","shkd_subacct"}); // dataSet = group.sum("shkd_qcamount").finish(); StringBuilder sqlBuilder = new StringBuilder("/*dialect*/ "); - sqlBuilder.append("SELECT faccountbankid as shkd_subacct, fmodifytime,famount as downamount, fvalibalance as upamount,fcurrencyid as currency \n" + + sqlBuilder.append("SELECT faccountbankid as shkd_subacct, fcreatetime,famount as downamount, fvalibalance as upamount,fcurrencyid as currency \n" + "FROM t_bei_bankbalance\n" + - "WHERE (faccountbankid, fmodifytime) IN (\n" + - " SELECT faccountbankid, MAX(fmodifytime)\n" + + "WHERE (faccountbankid, fcreatetime) IN (\n" + + " SELECT faccountbankid, MAX(fcreatetime)\n" + " FROM t_bei_bankbalance\n" + - " WHERE fmodifytime < '"+startdate+"'\n" + + " WHERE fcreatetime < '"+startdate+"'\n" + " GROUP BY faccountbankid\n" + ")"); DataSet res = DB.queryDataSet(this.getClass().getSimpleName(), DBRoute.of("fi"), sqlBuilder.toString());//财务云