From d6af91ab65310656b9fdd1e6e541a755b53db93b Mon Sep 17 00:00:00 2001
From: "ys.git" <18439391935@163.com>
Date: Fri, 5 Dec 2025 14:54:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../listener/EngineModelListener.java            | 16 ++++++----------
 .../listener/EngineParamDetailListener.java      |  3 ---
 .../service/impl/ActivitiProcessServiceImpl.java |  4 ++--
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/xdap/self_development/listener/EngineModelListener.java b/src/main/java/com/xdap/self_development/listener/EngineModelListener.java
index 4df7a33..d108640 100644
--- a/src/main/java/com/xdap/self_development/listener/EngineModelListener.java
+++ b/src/main/java/com/xdap/self_development/listener/EngineModelListener.java
@@ -35,10 +35,6 @@ public class EngineModelListener implements ReadListener<DataEntryEngineModelExc
     private final String ycOrOt;
     private Integer versionNumber = 0;
     private Date date = new Date();
-    private String createdBy = "Excel导入";
-    private Date createdDate = date;
-    private String lastModifiedBy = "";
-    private Date lastModifiedDate = date;
     private XdapUsers usersPojo;
 
 
@@ -137,9 +133,9 @@ public class EngineModelListener implements ReadListener<DataEntryEngineModelExc
             modelPojo.setVersionNumber(versionNumber);
             modelPojo.setIsDelete(0);
             modelPojo.setCreatedBy(usersPojo.getId());
-            modelPojo.setLastUpdatedBy(lastModifiedBy);
-            modelPojo.setLastUpdateDate(lastModifiedDate);
-            modelPojo.setCreationDate(createdDate);
+            modelPojo.setLastUpdatedBy("");
+            modelPojo.setLastUpdateDate(new Date());
+            modelPojo.setCreationDate(new Date());
             modelPojo.setId(UUID.randomUUID().toString());
             modelPojos.add(modelPojo);
 //            sw.buildFromDatasource("test_demo").doInsert(modelPojo);
@@ -171,9 +167,9 @@ public class EngineModelListener implements ReadListener<DataEntryEngineModelExc
                 engineParamDetailPojo.setMajorVersion(versionNumber);
                 engineParamDetailPojo.setVersionStatus(ParamValueVersionEnum.DRAFT.getCode());
                 engineParamDetailPojo.setCreatedBy(usersPojo.getId());
-                engineParamDetailPojo.setLastUpdatedBy(lastModifiedBy);
-                engineParamDetailPojo.setLastUpdateDate(lastModifiedDate);
-                engineParamDetailPojo.setCreationDate(createdDate);
+                engineParamDetailPojo.setLastUpdatedBy("");
+                engineParamDetailPojo.setLastUpdateDate(new Date());
+                engineParamDetailPojo.setCreationDate(new Date());
                 engineParamDetailPojos.add(engineParamDetailPojo);
                 //为每个参数生成默认责任人
                 List<ResponsiblePerson> personPojos = responsiblePerService.selectByDepName(parameter.getDepartment());
diff --git a/src/main/java/com/xdap/self_development/listener/EngineParamDetailListener.java b/src/main/java/com/xdap/self_development/listener/EngineParamDetailListener.java
index 631dbe7..a804c64 100644
--- a/src/main/java/com/xdap/self_development/listener/EngineParamDetailListener.java
+++ b/src/main/java/com/xdap/self_development/listener/EngineParamDetailListener.java
@@ -35,9 +35,6 @@ public class EngineParamDetailListener implements ReadListener<EngineParamDetail
     private Integer versionNumber = 1;
     private Date date = new Date();
     private String createdBy = "Excel导入";
-    private Date createdDate = date;
-    private String lastModifiedBy = "";
-    private Date lastModifiedDate = date;
     Map<String, String> stringParameterMap;
     private RuntimeException importException = null;
     private ArrayList<String> successSheetName = null;
diff --git a/src/main/java/com/xdap/self_development/service/impl/ActivitiProcessServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/ActivitiProcessServiceImpl.java
index cc974cf..b2f1b65 100644
--- a/src/main/java/com/xdap/self_development/service/impl/ActivitiProcessServiceImpl.java
+++ b/src/main/java/com/xdap/self_development/service/impl/ActivitiProcessServiceImpl.java
@@ -274,11 +274,11 @@ public class ActivitiProcessServiceImpl implements ActivitiProcessService {
         record.setApprovalComment(comment);
         sw.buildFromDatasource("xdap_app_223770822127386625").doInsert(record);
 
-        if (!"拒绝".equals(operator) && !"同意".equals(operator)) {
+        if (!"REJECT".equals(operator) && !"PASS".equals(operator)) {
             throw new RuntimeException("无法识别的操作");
         }
         //驳回处理
-        if ("拒绝".equals(operator)) {
+        if ("REJECT".equals(operator)) {
             //更改参数状态
             sw.buildFromDatasource("xdap_app_223770822127386625")
                     .update("version_status", ParamValueVersionEnum.REFUSE.getCode())//改为已拒绝