From c257e17ff1fdef0dc385999cf00c3458ae02b60c Mon Sep 17 00:00:00 2001
From: linbangquan <1437892690@qq.com>
Date: Mon, 22 Jan 2024 14:28:46 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-EOA?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E5=9C=A8=E5=B7=A5=E5=8D=95=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1071564211060736]后端-EOA节点在工单中的操作详情 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1071564211060736
---
 pom.xml                                                      | 4 ----
 .../handler/EoaTemplate2ProcessStepDependencyHandler.java    | 4 ++--
 .../importexport/handler/ProcessImportExportHandler.java     | 5 ++---
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index ca08f0911..95e9094eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,9 +58,5 @@ limitations under the License.
             <groupId>com.neatlogic</groupId>
             <artifactId>neatlogic-event-base</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.neatlogic</groupId>
-            <artifactId>neatlogic-eoa-base</artifactId>
-        </dependency>
     </dependencies> 
 </project>
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 3ce703a84..9c02f0da0 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 410544ae2..53c8fb264 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);
                             }
                         }
                     }
-- 
Gitee