From 78507a5cf62072aa6871451ad2a55d0fb8a56395 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 12 Dec 2025 15:21:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9Acsx=20?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=97=B6=E9=97=B4=EF=BC=9A2025=E5=B9=B412?= =?UTF-8?q?=E6=9C=8812=E6=97=A5=20=E6=8F=90=E4=BA=A4=E5=86=85=E5=AE=B9?= =?UTF-8?q?=EF=BC=9A=E5=B8=A6=E6=81=AF=E5=80=BA=E5=8A=A1=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E8=A1=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sys/sys/plugin/report/InterestBearingRptListPlugin.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/InterestBearingRptListPlugin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/InterestBearingRptListPlugin.java index 6ed9ac2..8513cf3 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/InterestBearingRptListPlugin.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/InterestBearingRptListPlugin.java @@ -400,7 +400,7 @@ public class InterestBearingRptListPlugin extends AbstractReportListDataPlugin { "inner JOIN t_cfm_repaymentbill s6 ON s5.fid = s6.fid\n" + "WHERE (s2.floantype = 'loan' OR s2.floantype = 'sl' OR s2.floantype = 'bond') \n" + "AND (s1.fdrawtype = 'drawed' OR s1.fdrawtype = 'partpayment') \n" + - "AND t1.FBILLNO = s1.FBILLNO \n" + + "AND t1.FBILLNO = s1.FBILLNO and s6.fbillstatus='C'\n" + "GROUP BY to_char(s6.fbizdate,'yyyy') having to_char(s6.fbizdate,'yyyy') = '"+year+"')"; //年末未还金额 String selYearNmAmt = "(SELECT sum(sum(isnull(s1.fnotrepayamount,0))) yearwhamt\n" + @@ -712,8 +712,8 @@ public class InterestBearingRptListPlugin extends AbstractReportListDataPlugin { DataSet dataRes = DB.queryDataSet(this.getClass().getSimpleName(), DBRoute.of("fi"), selSql);//财务云 JoinDataSet join1 = dataRes.join(orgDataSet, JoinType.LEFT);//连接二级组织 DataSet dataRes1 = join1.on("shkd_ejgs","id").select(new String[]{"shkd_billid","shkd_billno","orgname shkd_ejgs","orgid","shkd_zqrzh","textcreditor","shkd_rzpz1","shkd_rzpzmx", - "shkd_rzqd","shkd_blxm","shkd_dybbkmmc","term","xcday","xcdate","startintdate","expiredate","NullToZero(selyearncamt)+NullToZero(selyearaddamt)-NullToZero(selyearyhkamt) selyearncamt", - "selyearaddamt","selyearyhkamt","selyearnmamt","drawamount","sumamt","sumzhrzcb","sumzhrzqx","zhrzcb","zhrzqx","SubStr(guaranteeway, 1, LEN(guaranteeway)-2) guaranteeway", + "shkd_rzqd","shkd_blxm","shkd_dybbkmmc","term","xcday","xcdate","startintdate","expiredate","selyearncamt selyearncamt", + "selyearaddamt","selyearyhkamt","NullToZero(selyearncamt)+NullToZero(selyearaddamt)-NullToZero(selyearyhkamt) selyearnmamt","drawamount","sumamt","sumzhrzcb","sumzhrzqx","zhrzcb","zhrzqx","SubStr(guaranteeway, 1, LEN(guaranteeway)-2) guaranteeway", "dbwkm","dbwname","lilv","remark", "selbj2025","sellx2025","selbj2026","sellx2026","selbj2027","sellx2027","selbj2028","sellx2028","selbj2029","sellx2029","selbj2030","sellx2030", "selbj2031","sellx2031","selbj2032","sellx2032","selbj2033","sellx2033","selbj2034","sellx2034","selbj2035","sellx2035",