From 2b3144aca93189855872f0f622e534a69ddb89c0 Mon Sep 17 00:00:00 2001
From: csx <1981897232@qq.com>
Date: Tue, 25 Nov 2025 13:57:24 +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/11/25=2014?=
 =?UTF-8?q?=EF=BC=9A30=20=E5=86=85=E5=AE=B9:=E8=AE=A1=E5=88=92=E7=BC=96?=
 =?UTF-8?q?=E5=88=B6=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sys/plugin/report/PlanReportPlugin.java   | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/PlanReportPlugin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/PlanReportPlugin.java
index 2c03df2..9b729a1 100644
--- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/PlanReportPlugin.java
+++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/PlanReportPlugin.java
@@ -48,8 +48,8 @@ public class PlanReportPlugin extends AbstractReportListDataPlugin {
     private static final String DANGYUE_SELECT = "fbillno," +
             "fstartdate_yyyyMM as dangyueqijian," +
             "fbankcateid as fbankcateid1," +
-            "total_fdetailext12 as shkd_cljrzwye," +
-            "total_fdetailext13 as shkd_yxsx," +
+            "detailext12 as shkd_cljrzwye," +
+            "detailext13 as shkd_yxsx," +
             "total_fdetailext15 as shkd_dytqhk," +
             "total_fdetailext16 as shkd_dydqhk," +
             "total_fdetailext17 as shkd_dyxd," +
@@ -105,7 +105,21 @@ public class PlanReportPlugin extends AbstractReportListDataPlugin {
 
         StringBuilder dangyuesqlBuilder=getsql(id,zdm,dangyue,shkd_km);
         DataSet dangyueres = DB.queryDataSet(this.getClass().getSimpleName(), DBRoute.of("fi"), dangyuesqlBuilder.toString());//财务云
-        dangyueres= dangyueres.select(DANGYUE_SELECT);
+
+        DataSet dataSet_sum =  DB.queryDataSet(this.getClass().getSimpleName(), DBRoute.of("fi"),
+                "SELECT\n" +
+                        "fbankcateid AS bankcate,\n" +
+                        "SUM(fdetailext12) AS detailext12,\n" +
+                        "SUM(fdetailext13) AS detailext13\n" +
+                        "FROM\n" +
+                        "t_fpm_reportdatadetail\n" +
+                        "WHERE\n" +
+                        "fid = "+id+"\n" +
+                        "GROUP BY\n" +
+                        "fbankcateid");//财务云
+        JoinDataSet join1 = dangyueres.join(dataSet_sum, JoinType.LEFT);
+        DataSet finish1 = join1.on("fbankcateid", "bankcate").select(dangyueres.getRowMeta().getFieldNames(),new String[]{"detailext12", "detailext13"}).finish();
+        dangyueres= finish1.select(DANGYUE_SELECT);
 
         StringBuilder xiayueyuesqlBuilder=getsql(id,zdm,xiayueyue,shkd_km);
         DataSet xiayueyueres = DB.queryDataSet(this.getClass().getSimpleName(), DBRoute.of("fi"), xiayueyuesqlBuilder.toString());//财务云