diff --git a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/Plugins.java b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/Plugins.java index 713dc4cb..bd2b5d7e 100644 --- a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/Plugins.java +++ b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/Plugins.java @@ -67,17 +67,6 @@ public class Plugins implements PluginListener { params2.put("templates", array2.toString()); list.add(new AppExtensionProfile("PAL报告->步骤竖表", "aslp://com.actionsoft.apps.coe.pal/registerOutputApp", params2)); - /*Map params4 = new HashMap(); - params4.put("groupName", "流程手册"); - params4.put("title", "流程手册"); - params4.put("targetMethodScope", PrReportComment.TARGET_METHOD_SCOPE);// 建模大类、建模方法，多个用逗号隔开，如果为空表示全部 - params4.put("targetMethodType", "");// 建模方法中的图元，为空表示只选择文件，不选择图元；为"-"表示所有类型图元 - params4.put("relationMethodScope", "-");// 如果设置-，表示不需要用户选择关联范围，向导页被忽略 - params4.put("lang", "cn");// 该App支持的语言，多个用逗号隔开 - params4.put("optionClass", Report4WizardOption.class.getName());// 附加的报表选项，如果该值没有，向导页被忽略 - params4.put("generClass", Report4Gener.class.getName());// 生成报告 - list.add(new AppExtensionProfile("PAL报告->流程手册", "aslp://com.actionsoft.apps.coe.pal/registerOutputApp", params4));*/ - return list; } diff --git a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java index 59000a11..48967483 100644 --- a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java +++ b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java @@ -3,7 +3,6 @@ package com.actionsoft.apps.coe.pal.output.pr.report1; import java.io.File; import java.util.*; -import com.actionsoft.apps.AppsConst; import com.actionsoft.apps.coe.pal.constant.CoEConstant; import com.actionsoft.apps.coe.pal.output.pr.util.PrReportComment; import com.actionsoft.apps.coe.pal.output.pr.util.ReportRepositoryCompare; @@ -12,7 +11,6 @@ import com.actionsoft.apps.coe.pal.pal.output.extend.OutputAppManager; import com.actionsoft.apps.coe.pal.pal.output.extend.OutputAppProfile; import com.actionsoft.apps.coe.pal.pal.output.model.OutputTaskModel; import com.actionsoft.apps.coe.pal.pal.output.util.OutputExcelUtil; -import com.actionsoft.apps.coe.pal.pal.output.util.OutputUtil; import com.actionsoft.apps.coe.pal.pal.output.util.OutputWordUtil; import com.actionsoft.apps.coe.pal.pal.repository.PALRepositoryQueryAPIManager; import com.actionsoft.apps.coe.pal.pal.repository.cache.PALRepositoryCache; @@ -28,7 +26,6 @@ import com.actionsoft.apps.coe.pal.pal.repository.upfile.model.UpfileModel; import com.actionsoft.apps.coe.pal.system.property.CoePropertyUtil; import com.actionsoft.apps.coe.pal.util.HighSecurityUtil; import com.actionsoft.apps.resource.plugin.profile.DCPluginProfile; -import com.actionsoft.bpms.commons.mvc.dao.IDaoQuery; import com.actionsoft.bpms.commons.mvc.view.ResponseObject; import com.actionsoft.bpms.server.DispatcherRequest; import com.actionsoft.bpms.server.UserContext; @@ -41,8 +38,10 @@ import com.actionsoft.sdk.local.api.internal.PlatformAPIImpl; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; + import static com.actionsoft.apps.coe.pal.pal.output.util.OutputWordUtil.specialCharTransfer; + /** * 生成流程手册-步骤横表横表的入口 * diff --git a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report2/Report2Gener.java b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report2/Report2Gener.java index 8d37fe2d..35b3af17 100644 --- a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report2/Report2Gener.java +++ b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report2/Report2Gener.java @@ -2,6 +2,7 @@ package com.actionsoft.apps.coe.pal.output.pr.report2; import java.util.*; +import com.actionsoft.apps.coe.pal.output.pr.util.PrReportComment; import com.actionsoft.apps.coe.pal.pal.output.extend.GenerLogExd; import com.actionsoft.apps.coe.pal.pal.output.extend.OutputAppManager; import com.actionsoft.apps.coe.pal.pal.output.extend.OutputAppProfile; @@ -19,8 +20,6 @@ import com.actionsoft.apps.coe.pal.system.property.CoePropertyUtil; import com.actionsoft.sdk.local.SDK; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; - -import com.actionsoft.apps.coe.pal.output.pr.util.PrReportComment; import com.actionsoft.bpms.commons.mvc.view.ResponseObject; import com.actionsoft.bpms.server.fs.DCContext; import com.actionsoft.sdk.local.api.internal.PlatformAPIImpl; diff --git a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/util/PrReportComment.java b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/util/PrReportComment.java index 42aadd4a..123ceccd 100644 --- a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/util/PrReportComment.java +++ b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/util/PrReportComment.java @@ -7,38 +7,20 @@ import java.io.IOException; import java.sql.Timestamp; import java.text.DateFormat; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Set; import javax.imageio.ImageIO; - import com.actionsoft.apps.coe.pal.constant.CoEConstant; import com.actionsoft.apps.coe.pal.pal.manage.publish.dao.PublishListHistory; import com.actionsoft.apps.coe.pal.pal.output.util.OutputWordUtil; import com.actionsoft.apps.coe.pal.pal.repository.PALRepositoryQueryAPIManager; -import com.actionsoft.apps.coe.pal.pal.repository.cache.PALRepositoryAttributeCache; -import com.actionsoft.apps.coe.pal.pal.repository.cache.PALRepositoryCache; -import com.actionsoft.apps.coe.pal.pal.repository.cache.PALRepositoryPropertyCache; -import com.actionsoft.apps.coe.pal.pal.repository.dao.PALRepositoryPropertyDao; -import com.actionsoft.apps.coe.pal.pal.repository.designer.relation.cache.DesignerShapeRelationCache; -import com.actionsoft.apps.coe.pal.pal.repository.designer.relation.model.DesignerShapeRelationModel; -import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryAttributeModel; import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryModel; -import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryPropertyModel; import com.actionsoft.apps.coe.pal.pal.repository.util.CoeProcessLevelUtil; -import com.actionsoft.apps.coe.pal.system.property.CoePropertyUtil; -import org.apache.commons.lang.StringUtils; - import com.actionsoft.bpms.org.cache.UserCache; import com.actionsoft.bpms.util.Base64; import com.actionsoft.bpms.util.UtilDate; import com.actionsoft.bpms.util.UtilFile; import com.actionsoft.bpms.util.UtilString; import com.actionsoft.sdk.local.SDK; - import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -66,8 +48,6 @@ public class PrReportComment { createUser = OutputWordUtil.specialCharTransfer(UserCache.getModel(createUser).getUserName()); } dataMap.put(OutputWordUtil.PL_CREATE_USER, createUser); // 编制人 - System.out.println("============版本"+repositoryModel.getVersion()); - dataMap.put(OutputWordUtil.PL_VERSION, repositoryModel.getVersion()); // 版本 String date = ""; diff --git a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/util/ReportRepositoryCompare.java b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/util/ReportRepositoryCompare.java index c9453674..7e987c49 100644 --- a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/util/ReportRepositoryCompare.java +++ b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/util/ReportRepositoryCompare.java @@ -6,13 +6,10 @@ import java.util.Collections; import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; - -import com.actionsoft.apps.coe.pal.constant.CoEConstant; import com.actionsoft.apps.coe.pal.pal.output.util.OutputWordUtil; import com.actionsoft.apps.coe.pal.pal.repository.PALRepositoryQueryAPIManager; import com.actionsoft.apps.coe.pal.pal.repository.cache.PALRepositoryAttributeCache; diff --git a/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/Plugins.java b/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/Plugins.java index d6f90eb2..b4543b52 100644 --- a/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/Plugins.java +++ b/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/Plugins.java @@ -4,7 +4,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; - import com.actionsoft.apps.coe.pal.pal.output.constant.OutputConst; import com.actionsoft.apps.listener.PluginListener; import com.actionsoft.apps.resource.AppContext; @@ -12,8 +11,8 @@ import com.actionsoft.apps.resource.plugin.profile.AWSPluginProfile; import com.actionsoft.apps.resource.plugin.profile.AppExtensionProfile; import com.actionsoft.apps.resource.plugin.profile.DCPluginProfile; import com.alibaba.fastjson.JSONArray; +import com.awspaas.apps.coe.pal.output.bd.report1.Report1WizardOptionbd; import com.awspaas.apps.coe.pal.output.bd.report1.Report1Gener; -import com.awspaas.apps.coe.pal.output.bd.report1.Report1WizardOption; public class Plugins implements PluginListener { @@ -29,7 +28,7 @@ public class Plugins implements PluginListener { // 注册应用扩展点 Map params1 = new HashMap(); - params1.put("groupName", "表达的手册"); + params1.put("groupName", "表达手册"); params1.put("title", "表单-手册"); /* params1.put("targetMethodScope", PrReportComment.TARGET_METHOD_SCOPE);// 建模大类、建模方法，多个用逗号隔开，如果为空表示全部 params1.put("targetMethodType", "");// 建模方法中的图元，为空表示只选择文件，不选择图元；为"-"表示所有类型图元 @@ -37,9 +36,8 @@ public class Plugins implements PluginListener { params1.put("targetMethodScope", "data.form");// 建模大类、建模方法，多个用逗号隔开，如果为空表示全部 org.normal params1.put("targetMethodType", "");// 建模方法中的图元，为空表示只选择文件，不选择图元；为"-"表示所有类型图元 params1.put("relationMethodScope", "-");// 如果设置-，表示不需要用户选择关联范围，向导页被忽略 - params1.put("lang", "cn");// 该App支持的语言，多个用逗号隔开 - params1.put("optionClass", Report1WizardOption.class.getName());// 附加的报表选项，如果该值没有，向导页被忽略 + params1.put("optionClass", Report1WizardOptionbd.class.getName());// 附加的报表选项，如果该值没有，向导页被忽略 params1.put("generClass", Report1Gener.class.getName());// 生成报告 // 模版上传下载参数 params1.put("isDownload", true); diff --git a/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/report1/Report1Gener.java b/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/report1/Report1Gener.java index e9327afb..23a60261 100644 --- a/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/report1/Report1Gener.java +++ b/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/report1/Report1Gener.java @@ -2,15 +2,12 @@ package com.awspaas.apps.coe.pal.output.bd.report1; import java.io.File; import java.util.*; - -import com.actionsoft.apps.AppsConst; import com.actionsoft.apps.coe.pal.constant.CoEConstant; import com.actionsoft.apps.coe.pal.pal.output.extend.GenerLogExd; import com.actionsoft.apps.coe.pal.pal.output.extend.OutputAppManager; import com.actionsoft.apps.coe.pal.pal.output.extend.OutputAppProfile; import com.actionsoft.apps.coe.pal.pal.output.model.OutputTaskModel; import com.actionsoft.apps.coe.pal.pal.output.util.OutputExcelUtil; -import com.actionsoft.apps.coe.pal.pal.output.util.OutputUtil; import com.actionsoft.apps.coe.pal.pal.output.util.OutputWordUtil; import com.actionsoft.apps.coe.pal.pal.repository.PALRepositoryQueryAPIManager; import com.actionsoft.apps.coe.pal.pal.repository.cache.PALRepositoryCache; @@ -26,7 +23,6 @@ import com.actionsoft.apps.coe.pal.pal.repository.upfile.model.UpfileModel; import com.actionsoft.apps.coe.pal.system.property.CoePropertyUtil; import com.actionsoft.apps.coe.pal.util.HighSecurityUtil; import com.actionsoft.apps.resource.plugin.profile.DCPluginProfile; -import com.actionsoft.bpms.commons.mvc.dao.IDaoQuery; import com.actionsoft.bpms.commons.mvc.view.ResponseObject; import com.actionsoft.bpms.server.DispatcherRequest; import com.actionsoft.bpms.server.UserContext; @@ -38,10 +34,12 @@ import com.actionsoft.sdk.local.SDK; import com.actionsoft.sdk.local.api.internal.PlatformAPIImpl; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import static com.actionsoft.apps.coe.pal.pal.output.util.OutputWordUtil.specialCharTransfer; import com.awspaas.apps.coe.pal.output.bd.util.PrReportComment; import com.awspaas.apps.coe.pal.output.bd.util.ReportRepositoryCompare; -import static com.actionsoft.apps.coe.pal.pal.output.util.OutputWordUtil.specialCharTransfer; + + /** * 生成流程手册-步骤横表横表的入口 @@ -196,7 +194,7 @@ public class Report1Gener { JSONArray KPITable = new JSONArray(); //相关绩效考核Table Set dangerSet = new HashSet();// 风险 - Set regulateSet = new HashSet();// 控制 + Set regulateSet = new HashSet<>();// 控制 Set KPISet = new HashSet();// kpi List> repositoryFileElements = CoeDesignerUtil.getShapeMessageJson4(repositoryId); //流程文件内容 diff --git a/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/report1/Report1WizardOption.java b/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/report1/Report1WizardOptionbd.java similarity index 82% rename from com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/report1/Report1WizardOption.java rename to com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/report1/Report1WizardOptionbd.java index 92da3f5b..8e09e7fe 100644 --- a/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/report1/Report1WizardOption.java +++ b/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/report1/Report1WizardOptionbd.java @@ -8,13 +8,13 @@ import com.actionsoft.sdk.local.api.internal.PlatformAPIImpl; * 向导收集该报告的特定选项 * */ -public class Report1WizardOption extends ActionWeb { +public class Report1WizardOptionbd extends ActionWeb { - public Report1WizardOption(UserContext userContext) { + public Report1WizardOptionbd(UserContext userContext) { super(userContext); } - public Report1WizardOption() { + public Report1WizardOptionbd() { } /** diff --git a/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/report3/Report3Gener.java b/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/report3/Report3Gener.java index 153460e6..4a631adc 100644 --- a/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/report3/Report3Gener.java +++ b/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/report3/Report3Gener.java @@ -3,7 +3,6 @@ package com.awspaas.apps.coe.pal.output.bd.report3; import java.util.HashMap; import java.util.List; import java.util.Map; - import com.actionsoft.apps.coe.pal.pal.method.cache.PALMethodCache; import com.actionsoft.apps.coe.pal.pal.method.model.PALMethodAttributeModel; import com.actionsoft.apps.coe.pal.pal.method.model.PALMethodModel; diff --git a/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/util/PrReportComment.java b/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/util/PrReportComment.java index 5bc52ff5..1686b959 100644 --- a/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/util/PrReportComment.java +++ b/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/util/PrReportComment.java @@ -7,31 +7,13 @@ import java.io.IOException; import java.sql.Timestamp; import java.text.DateFormat; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - import javax.imageio.ImageIO; - import com.actionsoft.apps.coe.pal.constant.CoEConstant; import com.actionsoft.apps.coe.pal.pal.manage.publish.dao.PublishListHistory; import com.actionsoft.apps.coe.pal.pal.output.util.OutputWordUtil; import com.actionsoft.apps.coe.pal.pal.repository.PALRepositoryQueryAPIManager; -import com.actionsoft.apps.coe.pal.pal.repository.cache.PALRepositoryAttributeCache; -import com.actionsoft.apps.coe.pal.pal.repository.cache.PALRepositoryCache; -import com.actionsoft.apps.coe.pal.pal.repository.cache.PALRepositoryPropertyCache; -import com.actionsoft.apps.coe.pal.pal.repository.dao.PALRepositoryPropertyDao; -import com.actionsoft.apps.coe.pal.pal.repository.designer.relation.cache.DesignerShapeRelationCache; -import com.actionsoft.apps.coe.pal.pal.repository.designer.relation.model.DesignerShapeRelationModel; -import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryAttributeModel; import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryModel; -import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryPropertyModel; import com.actionsoft.apps.coe.pal.pal.repository.util.CoeProcessLevelUtil; -import com.actionsoft.apps.coe.pal.system.property.CoePropertyUtil; -import org.apache.commons.lang.StringUtils; - import com.actionsoft.bpms.org.cache.UserCache; import com.actionsoft.bpms.util.Base64; import com.actionsoft.bpms.util.UtilDate; diff --git a/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/ReportPrController.java b/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/ReportPrController.java index 69962c00..8de90368 100644 --- a/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/ReportPrController.java +++ b/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/ReportPrController.java @@ -3,30 +3,17 @@ package com.awspaas.apps.coe.pal.output.zd; import com.actionsoft.apps.coe.pal.pal.output.OutPutReportWeb; import com.actionsoft.apps.coe.pal.pal.output.OutputAPIManager; -import com.actionsoft.apps.coe.pal.pal.output.constant.OutputConst; import com.actionsoft.apps.coe.pal.pal.output.dao.OutputTask; -import com.actionsoft.apps.coe.pal.pal.output.extend.OutputAppManager; -import com.actionsoft.apps.coe.pal.pal.output.extend.OutputAppProfile; import com.actionsoft.apps.coe.pal.pal.output.model.OutputTaskModel; import com.actionsoft.apps.coe.pal.pal.repository.PALRepositoryQueryAPIManager; -import com.actionsoft.apps.coe.pal.pal.repository.web.CoeProcessLevelWeb; import com.actionsoft.apps.coe.pal.util.HighSecurityUtil; -import com.actionsoft.apps.resource.plugin.profile.DCPluginProfile; import com.actionsoft.bpms.commons.mvc.view.ResponseObject; import com.actionsoft.bpms.server.UserContext; import com.actionsoft.bpms.server.bind.annotation.Controller; import com.actionsoft.bpms.server.bind.annotation.Mapping; -import com.actionsoft.bpms.server.fs.DCContext; import com.actionsoft.bpms.util.UUIDGener; -import com.actionsoft.bpms.util.UtilFile; -import com.actionsoft.exception.AWSException; -import com.actionsoft.sdk.local.SDK; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; /** * @author zhangming diff --git a/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java b/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java index 575d6a11..5868716b 100644 --- a/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java +++ b/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java @@ -3,14 +3,13 @@ package com.awspaas.apps.coe.pal.output.zd.report1; import java.io.File; import java.util.*; -import com.actionsoft.apps.AppsConst; + import com.actionsoft.apps.coe.pal.constant.CoEConstant; import com.actionsoft.apps.coe.pal.pal.output.extend.GenerLogExd; import com.actionsoft.apps.coe.pal.pal.output.extend.OutputAppManager; import com.actionsoft.apps.coe.pal.pal.output.extend.OutputAppProfile; import com.actionsoft.apps.coe.pal.pal.output.model.OutputTaskModel; import com.actionsoft.apps.coe.pal.pal.output.util.OutputExcelUtil; -import com.actionsoft.apps.coe.pal.pal.output.util.OutputUtil; import com.actionsoft.apps.coe.pal.pal.output.util.OutputWordUtil; import com.actionsoft.apps.coe.pal.pal.repository.PALRepositoryQueryAPIManager; import com.actionsoft.apps.coe.pal.pal.repository.cache.PALRepositoryCache; @@ -26,7 +25,6 @@ import com.actionsoft.apps.coe.pal.pal.repository.upfile.model.UpfileModel; import com.actionsoft.apps.coe.pal.system.property.CoePropertyUtil; import com.actionsoft.apps.coe.pal.util.HighSecurityUtil; import com.actionsoft.apps.resource.plugin.profile.DCPluginProfile; -import com.actionsoft.bpms.commons.mvc.dao.IDaoQuery; import com.actionsoft.bpms.commons.mvc.view.ResponseObject; import com.actionsoft.bpms.server.DispatcherRequest; import com.actionsoft.bpms.server.UserContext; diff --git a/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1WizardOption.java b/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1WizardOption.java index d769ff9a..792b7743 100644 --- a/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1WizardOption.java +++ b/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1WizardOption.java @@ -2,7 +2,6 @@ package com.awspaas.apps.coe.pal.output.zd.report1; import com.actionsoft.bpms.commons.mvc.view.ActionWeb; import com.actionsoft.bpms.server.UserContext; -import com.actionsoft.sdk.local.api.internal.PlatformAPIImpl; /** * 向导收集该报告的特定选项 diff --git a/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/util/PrReportComment.java b/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/util/PrReportComment.java index 5dfaff14..28a416e7 100644 --- a/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/util/PrReportComment.java +++ b/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/util/PrReportComment.java @@ -15,6 +15,7 @@ import java.util.Set; import javax.imageio.ImageIO; + import com.actionsoft.apps.coe.pal.constant.CoEConstant; import com.actionsoft.apps.coe.pal.pal.manage.publish.dao.PublishListHistory; import com.actionsoft.apps.coe.pal.pal.output.util.OutputWordUtil;