Merge remote-tracking branch 'origin/dev_resi_event' into develop

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",""),
+     PUBLISH ( "publish","发布事件"),
-     RECALL( "recall",""),
+     RECALL( "recall","撤回事件"),
-     REPLY ("reply",""),
+     REPLY ("reply","回复"),
-     SHIFIT_PROJECT ( "shift_project",""),
+     SHIFIT_PROJECT ( "shift_project","立项"),
-     CLOSE_CASE ( "close_case",""),
+     CLOSE_CASE ( "close_case","办结"),
-     CHOOSE_RESOLVE ( "choose_resolve",""),
+     CHOOSE_RESOLVE ( "choose_resolve","选择是否解决"),
-     READ( "read","");
+     READ( "read","查看事件");
 
 
     private String code;

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);
 
     }