From ae4475f04d548bdd56c1428e0002d1a846774068 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 4 Aug 2021 10:58:30 +0800
Subject: [PATCH 1/3] actiondesc

---
 .../main/java/com/epmet/service/impl/ResiEventServiceImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index 17bfd10d46..40c0d3d72d 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -183,7 +183,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
         publishLog.setUserId(formDTO.getUserId());
         publishLog.setUserIdentity(EventConstant.REPORT_USER);
         publishLog.setActionCode(ResiEventAction.PUBLISH.getCode());
-        publishLog.setActionDesc(ResiEventAction.PUBLISH.getDesc());
+        publishLog.setActionDesc(ResiEventAction.getDesc(ResiEventAction.PUBLISH.getCode()));
         publishLog.setOperateTime(resiEventEntity.getCreatedTime());
         resiEventOperationLogDao.insert(publishLog);
         //9、返回事件id

From 38f60cf12c81de23089dba75fa06754103317502 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 4 Aug 2021 10:59:49 +0800
Subject: [PATCH 2/3] actiondesc

---
 .../java/com/epmet/constant/ResiEventAction.java   | 14 +++++++-------
 .../epmet/service/impl/ResiEventServiceImpl.java   |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ResiEventAction.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ResiEventAction.java
index f525143772..ff9f721e1e 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ResiEventAction.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ResiEventAction.java
@@ -16,13 +16,13 @@ public enum ResiEventAction {
     // 5、办结：close_case;
     // 6、选择是否已解决：choose_resolve;
     // 7、查看阅读事件：read：人大代表未读=>已读；工作人员待处理=>处理中；
-     PUBLISH ( "publish",""),
-     RECALL( "recall",""),
-     REPLY ("reply",""),
-     SHIFIT_PROJECT ( "shift_project",""),
-     CLOSE_CASE ( "close_case",""),
-     CHOOSE_RESOLVE ( "choose_resolve",""),
-     READ( "read","");
+     PUBLISH ( "publish","发布事件"),
+     RECALL( "recall","撤回事件"),
+     REPLY ("reply","回复"),
+     SHIFIT_PROJECT ( "shift_project","立项"),
+     CLOSE_CASE ( "close_case","办结"),
+     CHOOSE_RESOLVE ( "choose_resolve","选择是否解决"),
+     READ( "read","查看事件");
 
 
     private String code;
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index 40c0d3d72d..17bfd10d46 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -183,7 +183,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
         publishLog.setUserId(formDTO.getUserId());
         publishLog.setUserIdentity(EventConstant.REPORT_USER);
         publishLog.setActionCode(ResiEventAction.PUBLISH.getCode());
-        publishLog.setActionDesc(ResiEventAction.getDesc(ResiEventAction.PUBLISH.getCode()));
+        publishLog.setActionDesc(ResiEventAction.PUBLISH.getDesc());
         publishLog.setOperateTime(resiEventEntity.getCreatedTime());
         resiEventOperationLogDao.insert(publishLog);
         //9、返回事件id

From f57da006160d11939b6dcdb73a34c4126c8cdd1c Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 4 Aug 2021 11:01:38 +0800
Subject: [PATCH 3/3] =?UTF-8?q?time=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/service/impl/ResiEventServiceImpl.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index 17bfd10d46..1907cba24c 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -185,6 +185,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
         publishLog.setActionCode(ResiEventAction.PUBLISH.getCode());
         publishLog.setActionDesc(ResiEventAction.PUBLISH.getDesc());
         publishLog.setOperateTime(resiEventEntity.getCreatedTime());
+        publishLog.setCreatedTime(resiEventEntity.getCreatedTime());
         resiEventOperationLogDao.insert(publishLog);
         //9、返回事件id
         ResiEventIdDTO resiEventIdDTO=new ResiEventIdDTO();
@@ -324,6 +325,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
         reCallLog.setActionCode(ResiEventAction.RECALL.getCode());
         reCallLog.setActionDesc(ResiEventAction.RECALL.getDesc());
         reCallLog.setOperateTime(resiEventEntity.getLatestOperatedTime());
+        reCallLog.setCreatedTime(resiEventEntity.getLatestOperatedTime());
         resiEventOperationLogDao.insert(reCallLog);
 
     }