From cbdac5146e7ed7aa5e9c901f59e5112f8e1f4660 Mon Sep 17 00:00:00 2001 From: zack Date: Fri, 30 Apr 2021 15:53:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=E6=9C=AC?= =?UTF-8?q?=E5=9C=B0=E7=BC=96=E8=AF=91=E5=8F=91=E7=8E=B0=E8=BF=99=E4=B8=AA?= =?UTF-8?q?=E6=96=87=E6=A1=A3=E6=8F=92=E4=BB=B6=E9=87=8C=E9=9D=A2=E7=9A=84?= =?UTF-8?q?=E7=B1=BB=E7=BC=96=E8=AF=91=E4=B8=8D=E9=80=9A=E8=BF=87=E4=BA=86?= =?UTF-8?q?=EF=BC=8C=E7=BA=A0=E6=AD=A3=E4=B8=8B=EF=BC=8C=E8=BF=99=E4=B8=AA?= =?UTF-8?q?=E7=B1=BB=E5=9C=A8=E6=96=87=E6=A1=A3=E9=87=8C=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E7=94=A8=E5=88=B0=EF=BC=8C=E6=97=A0=E9=9C=80=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/fr/function/ReportCheck.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/fr/function/ReportCheck.java b/src/main/java/com/fr/function/ReportCheck.java index 21d57da..9620d4f 100644 --- a/src/main/java/com/fr/function/ReportCheck.java +++ b/src/main/java/com/fr/function/ReportCheck.java @@ -1,13 +1,11 @@ // 自定义函数实现表间校验 package com.fr.function; -import java.util.HashMap; import com.fr.base.ResultFormula; import com.fr.base.operator.common.CommonOperator; import com.fr.chart.activator.ChartBaseActivator; import com.fr.config.activator.BaseDBActivator; import com.fr.config.activator.ConfigurationActivator; -import com.fr.data.impl.config.activator.RestrictionActivator; import com.fr.env.operator.CommonOperatorImpl; import com.fr.io.TemplateWorkBookIO; import com.fr.json.JSONArray; @@ -17,15 +15,18 @@ import com.fr.main.workbook.ResultWorkBook; import com.fr.module.Module; import com.fr.module.tool.ActivatorToolBox; import com.fr.report.ReportActivator; +import com.fr.report.RestrictionActivator; import com.fr.report.cell.CellElement; import com.fr.report.module.ReportBaseActivator; import com.fr.report.report.ResultReport; import com.fr.script.AbstractFunction; import com.fr.stable.WriteActor; -import com.fr.store.StateServerActivator; +import com.fr.store.StateServiceActivator; import com.fr.workspace.simple.SimpleWork; import com.fr.write.cal.WB; +import java.util.HashMap; + public class ReportCheck extends AbstractFunction { private static HashMap wMap = new HashMap(); @@ -39,7 +40,7 @@ public class ReportCheck extends AbstractFunction { // 定义报表运行环境,用于执行报表 Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(), new ConfigurationActivator(), - new StateServerActivator(), + new StateServiceActivator(), new ReportBaseActivator(), new RestrictionActivator(), new ReportActivator(),