diff --git a/pom.xml b/pom.xml index ca08f09110eb0456003cfbc23b544f5f02290397..95e9094ebc3624a49212e2fed68c80307938eb9b 100644 --- a/pom.xml +++ b/pom.xml @@ -58,9 +58,5 @@ limitations under the License. com.neatlogic neatlogic-event-base - - com.neatlogic - neatlogic-eoa-base - diff --git a/src/main/java/neatlogic/module/process/dependency/handler/EoaTemplate2ProcessStepDependencyHandler.java b/src/main/java/neatlogic/module/process/dependency/handler/EoaTemplate2ProcessStepDependencyHandler.java index 3ce703a849888d64a1bbf833d2523b383db12d6c..9c02f0da09a79d31973bd0980d88b5aa8cf75b73 100644 --- a/src/main/java/neatlogic/module/process/dependency/handler/EoaTemplate2ProcessStepDependencyHandler.java +++ b/src/main/java/neatlogic/module/process/dependency/handler/EoaTemplate2ProcessStepDependencyHandler.java @@ -7,7 +7,7 @@ import neatlogic.framework.dependency.core.FixedTableDependencyHandlerBase; import neatlogic.framework.dependency.core.IFromType; import neatlogic.framework.dependency.dto.DependencyInfoVo; import neatlogic.framework.dependency.dto.DependencyVo; -import neatlogic.framework.eoa.enums.EoaFromType; +import neatlogic.framework.process.constvalue.ProcessFromType; import neatlogic.framework.process.dto.ProcessVo; import neatlogic.module.process.dao.mapper.ProcessMapper; import org.apache.commons.collections4.CollectionUtils; @@ -72,6 +72,6 @@ public class EoaTemplate2ProcessStepDependencyHandler extends FixedTableDependen @Override public IFromType getFromType() { - return EoaFromType.EOATEMPLATE; + return ProcessFromType.EOATEMPLATE; } } diff --git a/src/main/java/neatlogic/module/process/importexport/handler/ProcessImportExportHandler.java b/src/main/java/neatlogic/module/process/importexport/handler/ProcessImportExportHandler.java index 410544ae248065dc9ecd8ddf43790962ee88e749..53c8fb264c9a178a47663bd47e113542ba9bff7f 100644 --- a/src/main/java/neatlogic/module/process/importexport/handler/ProcessImportExportHandler.java +++ b/src/main/java/neatlogic/module/process/importexport/handler/ProcessImportExportHandler.java @@ -2,7 +2,6 @@ package neatlogic.module.process.importexport.handler; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import neatlogic.framework.eoa.enums.EoaImportExportHandlerType; import neatlogic.framework.importexport.constvalue.FrameworkImportExportHandlerType; import neatlogic.framework.importexport.core.ImportExportHandlerBase; import neatlogic.framework.importexport.core.ImportExportHandlerType; @@ -450,12 +449,12 @@ public class ProcessImportExportHandler extends ImportExportHandlerBase { continue; } if (action == IMPORT) { - Object newPrimaryKey = getNewPrimaryKey(EoaImportExportHandlerType.EOA_TEMPLATE, id, primaryChangeList); + Object newPrimaryKey = getNewPrimaryKey(ProcessImportExportHandlerType.EOA_TEMPLATE, id, primaryChangeList); if (newPrimaryKey != null) { eoaTemplateObj.put("id", newPrimaryKey); } } else if (action == EXPORT) { - doExportData(EoaImportExportHandlerType.EOA_TEMPLATE, id, dependencyList, zipOutputStream); + doExportData(ProcessImportExportHandlerType.EOA_TEMPLATE, id, dependencyList, zipOutputStream); } } }