From 8ce37257019f856fa2cf1e38912805f12fac4c34 Mon Sep 17 00:00:00 2001 From: zengweihai Date: Tue, 3 Dec 2024 11:39:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E8=80=83=E5=AF=9F?= =?UTF-8?q?=E6=B1=87=E6=80=BB=E5=8F=96=E6=95=B0=E6=B2=A1=E6=9C=89=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=8A=A5=E9=94=99=E5=BC=82=E5=B8=B8=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/data/SupInspectSumReportDataPlugin.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/main/java/shkd/repc/resm/report/data/SupInspectSumReportDataPlugin.java b/main/java/shkd/repc/resm/report/data/SupInspectSumReportDataPlugin.java index bd53e25..f557848 100644 --- a/main/java/shkd/repc/resm/report/data/SupInspectSumReportDataPlugin.java +++ b/main/java/shkd/repc/resm/report/data/SupInspectSumReportDataPlugin.java @@ -1,18 +1,18 @@ package shkd.repc.resm.report.data; import kd.bos.algo.*; +import kd.bos.algo.dataset.select.SimpleSelectDataSet; import kd.bos.algo.input.CollectionInput; import kd.bos.dataentity.entity.DynamicObject; import kd.bos.dataentity.entity.DynamicObjectCollection; -import kd.bos.entity.report.AbstractReportListDataPlugin; -import kd.bos.entity.report.FilterInfo; -import kd.bos.entity.report.FilterItemInfo; -import kd.bos.entity.report.ReportQueryParam; +import kd.bos.entity.report.*; import kd.bos.orm.query.QCP; import kd.bos.orm.query.QFilter; +import kd.bos.report.ReportQuery; import kd.bos.servicehelper.BusinessDataServiceHelper; import kd.bos.servicehelper.org.OrgUnitServiceHelper; import kd.bos.servicehelper.user.UserServiceHelper; +import kd.fi.er.report.invoice.service.InvoiceDataSetFactory; import kd.sdk.plugin.Plugin; import java.math.BigDecimal; @@ -107,6 +107,7 @@ public class SupInspectSumReportDataPlugin extends AbstractReportListDataPlugin qFilter.and("multisuppliertype.fbasedataid.id",QCP.in,supplierGroupIdList); } + return qFilter; } @@ -118,8 +119,8 @@ public class SupInspectSumReportDataPlugin extends AbstractReportListDataPlugin public Collection addFirmParams(QFilter examTaskFilter){ Collection firmParams = null ; DynamicObject[] resm_myexams = BusinessDataServiceHelper.load("resm_myexam", "id,name,org,examsuppliername,modifytime,evalscore,creator,entry_evalscore,entry_evalscore.qeug_scoredesc,entry_evalscore.scoredesc", examTaskFilter.toArray());//加载数据源 - if (resm_myexams != null && resm_myexams.length > 0){ - firmParams = new ArrayList(resm_myexams.length);//初始化考察任务数据集合 + firmParams = new ArrayList(resm_myexams.length);//初始化考察任务数据集合 + if (resm_myexams.length > 0){ for (int i = 0; i < resm_myexams.length; i++) { Object[] firmParam = new Object[9];//创建行数据 DynamicObject resm_myexam = resm_myexams[i];//单个考察任务数据 @@ -152,7 +153,6 @@ public class SupInspectSumReportDataPlugin extends AbstractReportListDataPlugin firmParams.add(firmParam); } } - return firmParams; }