From 6c0b952e2adb95382ea71a49154f034d6deeb50c Mon Sep 17 00:00:00 2001 From: chenshaoxin <1981897232@qq.com> Date: Fri, 11 Apr 2025 17:14:36 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9A?= =?UTF-8?q?=E9=99=88=E7=BB=8D=E9=91=AB=20=E6=97=A5=E6=9C=9F=EF=BC=9A2025/4?= =?UTF-8?q?/11=2017=EF=BC=9A30=20=E5=86=85=E5=AE=B9=EF=BC=9A=E9=87=91?= =?UTF-8?q?=E8=9E=8D=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/FinanceReportFormPlugin.java | 63 ++++++++++--------- 1 file changed, 33 insertions(+), 30 deletions(-) diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/FinanceReportFormPlugin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/FinanceReportFormPlugin.java index ce32a49..4fcbe09 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/FinanceReportFormPlugin.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/FinanceReportFormPlugin.java @@ -130,7 +130,6 @@ public class FinanceReportFormPlugin extends AbstractReportFormPlugin implement @Override public void beforeCreateFilterInfo(CreateFilterInfoEvent event) { super.beforeCreateFilterInfo(event); - System.out.println(666); } // @Override @@ -142,11 +141,12 @@ public class FinanceReportFormPlugin extends AbstractReportFormPlugin implement @Override protected void filterContainerInit(FilterContainerInitEvent contInitEvent, ReportQueryParam queryParam) { super.filterContainerInit(contInitEvent, queryParam); - FilterColumn orgFilter = contInitEvent.getFilterColumn("shkd_seluserpower"); } @Override public void initDefaultQueryParam(ReportQueryParam queryParam) { + ReportFilter filter = this.getView().getControl("reportfilterap");//调用页面的自动查询 + queryParam.setFilter(filter.getReportQueryParam().getFilter()); super.initDefaultQueryParam(queryParam); Boolean shkd_isone = (Boolean) this.getModel().getValue("shkd_isone");//是否在第一层 HasPermOrgResult userHasPermOrgs = PermissionServiceHelper.getUserHasPermOrgs(Long.parseLong(RequestContext.get().getUserId())); @@ -175,13 +175,13 @@ public class FinanceReportFormPlugin extends AbstractReportFormPlugin implement Object shkd_selorg = formShowParameter.getCustomParam("shkd_selorg"); Object shkd_seldate = formShowParameter.getCustomParam("shkd_seldate"); Object shkd_selmoney = formShowParameter.getCustomParam("shkd_selmoney"); - Object shkd_isone = formShowParameter.getCustomParam("shkd_isone"); if (shkd_selorg != null) { - this.getModel().setValue("shkd_selorg", shkd_selorg); - this.getModel().setValue("shkd_seldate", shkd_seldate); - this.getModel().setValue("shkd_selmoney", shkd_selmoney); - this.getModel().setValue("shkd_isone", shkd_isone); - this.getModel().setValue("shkd_seluserpower", null); + DynamicObject dynamicObject = BusinessDataServiceHelper.loadSingle((Long) shkd_selorg, "bos_org"); + this.getView().getModel().setValue("shkd_selorg", dynamicObject); + this.getView().getModel().setValue("shkd_seldate", shkd_seldate); + this.getView().getModel().setValue("shkd_selmoney", shkd_selmoney); + this.getView().getModel().setValue("shkd_isone", false); + this.getView().getModel().setValue("shkd_seluserpower", null); ReportFilter filter = this.getView().getControl("reportfilterap");//调用页面的自动查询 filter.search(); } @@ -344,31 +344,34 @@ public class FinanceReportFormPlugin extends AbstractReportFormPlugin implement QFilter filter = new QFilter("shkd_org", QCP.equals, id); DynamicObject paixu = BusinessDataServiceHelper.loadSingle("shkd_orgorderby", filter.toArray()); if (paixu==null){ - return; - } - DynamicObjectCollection shkd_entryentity = paixu.getDynamicObjectCollection("shkd_entryentity"); - // 创建一个HashMap来存储转换后的结果 - Map map = new HashMap<>(); - int s=0; - // 假设你可以通过遍历DynamicObjectCollection，来获取其中的元素 - for (DynamicObject obj : shkd_entryentity) { - DynamicObject key = obj.getDynamicObject("shkd_ywdy"); - int value = s++; - map.put(key.getString("number"), value); // 将键值对放入HashMap - } - - //按字段 组织配置 排序 - - Collections.sort(rowData , new Comparator(){ - @Override - public int compare(DynamicObject dynamicObject1, DynamicObject dynamicObject2) { - return (map.get(dynamicObject1.getString("shkd_orgnumber"))==null?100:map.get(dynamicObject1.getString("shkd_orgnumber")))-(map.get(dynamicObject2.getString("shkd_orgnumber"))==null?100:map.get(dynamicObject2.getString("shkd_orgnumber"))); + //添加“集团内债务融资未抵消“合计行 + addheji(rowData); + }else { + DynamicObjectCollection shkd_entryentity = paixu.getDynamicObjectCollection("shkd_entryentity"); + // 创建一个HashMap来存储转换后的结果 + Map map = new HashMap<>(); + int s=0; + // 假设你可以通过遍历DynamicObjectCollection，来获取其中的元素 + for (DynamicObject obj : shkd_entryentity) { + DynamicObject key = obj.getDynamicObject("shkd_ywdy"); + int value = s++; + map.put(key.getString("number"), value); // 将键值对放入HashMap } - }); + //按字段 组织配置 排序 + + Collections.sort(rowData , new Comparator(){ + @Override + public int compare(DynamicObject dynamicObject1, DynamicObject dynamicObject2) { + return (map.get(dynamicObject1.getString("shkd_orgnumber"))==null?100:map.get(dynamicObject1.getString("shkd_orgnumber")))-(map.get(dynamicObject2.getString("shkd_orgnumber"))==null?100:map.get(dynamicObject2.getString("shkd_orgnumber"))); + } + + }); + //添加“集团内债务融资未抵消“合计行 + addheji(rowData); + } + - //添加“集团内债务融资未抵消“合计行 - addheji(rowData); } From da1cff7235e4d990ca2fa357ea0eee8f68c0d819 Mon Sep 17 00:00:00 2001 From: chenshaoxin <1981897232@qq.com> Date: Fri, 11 Apr 2025 17:50:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9A?= =?UTF-8?q?=E9=99=88=E7=BB=8D=E9=91=AB=20=E6=97=A5=E6=9C=9F=EF=BC=9A2025/4?= =?UTF-8?q?/11=2017=EF=BC=9A30=20=E5=86=85=E5=AE=B9=EF=BC=9A=E9=87=91?= =?UTF-8?q?=E8=9E=8D=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shkd/sys/sys/plugin/report/FinanceReportFormPlugin.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/FinanceReportFormPlugin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/FinanceReportFormPlugin.java index 4fcbe09..833e177 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/FinanceReportFormPlugin.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/FinanceReportFormPlugin.java @@ -145,10 +145,12 @@ public class FinanceReportFormPlugin extends AbstractReportFormPlugin implement @Override public void initDefaultQueryParam(ReportQueryParam queryParam) { - ReportFilter filter = this.getView().getControl("reportfilterap");//调用页面的自动查询 - queryParam.setFilter(filter.getReportQueryParam().getFilter()); super.initDefaultQueryParam(queryParam); Boolean shkd_isone = (Boolean) this.getModel().getValue("shkd_isone");//是否在第一层 + if (!shkd_isone){ + ReportFilter filter = this.getView().getControl("reportfilterap");//调用页面的自动查询 + queryParam.setFilter(filter.getReportQueryParam().getFilter()); + } HasPermOrgResult userHasPermOrgs = PermissionServiceHelper.getUserHasPermOrgs(Long.parseLong(RequestContext.get().getUserId())); //有权的组织 List hasPermOrgs = userHasPermOrgs.getHasPermOrgs();