提交人：陈绍鑫

日期：2025/11/25 14：30
内容:计划编制报表

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," +
-            "detailext12 as shkd_cljrzwye," +
+            "total_fdetailext12 as total_fdetailext12," +
-            "detailext13 as shkd_yxsx," +
+            "total_fdetailext13 as total_fdetailext13," +
             "total_fdetailext15 as shkd_dytqhk," +
             "total_fdetailext16 as shkd_dydqhk," +
             "total_fdetailext17 as shkd_dyxd," +
@@ -105,21 +105,7 @@ 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());//财务云
@@ -138,6 +124,19 @@ public class PlanReportPlugin extends AbstractReportListDataPlugin {
         JoinDataSet join = dangyueres.join(xiayueyueres, JoinType.FULL);
         DataSet finish = join.on("fbankcateid1", "fbankcateid").select(mergedFieldNames).finish();
         finish=finish.addField("(case when fbankcateid1!=null and fbankcateid1!=0 then fbankcateid1 else fbankcateid end)","shkd_jrjg");
+        DataSet dataSet_sum =  DB.queryDataSet(this.getClass().getSimpleName(), DBRoute.of("fi"),
+                "SELECT\n" +
+                        "fbankcateid AS bankcate,\n" +
+                        "SUM(fdetailext12) AS shkd_cljrzwye,\n" +
+                        "SUM(fdetailext13) AS shkd_yxsx\n" +
+                        "FROM\n" +
+                        "t_fpm_reportdatadetail\n" +
+                        "WHERE\n" +
+                        "fid = "+id+"\n" +
+                        "GROUP BY\n" +
+                        "fbankcateid");//财务云
+        JoinDataSet join1 = finish.join(dataSet_sum, JoinType.LEFT);
+        finish = join1.on("shkd_jrjg", "bankcate").select(finish.getRowMeta().getFieldNames(),new String[]{"shkd_cljrzwye", "shkd_yxsx"}).finish();
         //小计
         finish=finish.addField("(case when shkd_dyxd!=null then shkd_dyxd else 0 end)+(case when shkd_dyxzrz!=null then shkd_dyxzrz else 0 end)-(case when shkd_dytqhk!=null then shkd_dytqhk else 0 end)-(case when shkd_dydqhk!=null then shkd_dydqhk else 0 end)","shkd_dyxj");
         finish=finish.addField("(case when shkd_xyxd!=null then shkd_xyxd else 0 end)+(case when shkd_xyxzrz!=null then shkd_xyxzrz else 0 end)-(case when shkd_xytqhk!=null then shkd_xytqhk else 0 end)-(case when shkd_xydqhk!=null then shkd_xydqhk else 0 end)","shkd_xyxj");