From 0ecb3ed8c60fa95d036ffbc9d51de98bd872fd5b Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 29 Dec 2021 14:15:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E6=8F=90=E7=A4=BA=E7=BC=96=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/commons/tools/exception/EpmetErrorCode.java  | 1 +
 .../main/java/com/epmet/service/impl/ResiEventServiceImpl.java  | 2 +-
 .../src/main/resources/mapper/ResiEventDao.xml                  | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
index c20f195c9e..47079e14a8 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
@@ -113,6 +113,7 @@ public enum EpmetErrorCode {
 	CAN_NOT_REPLY_RESI_EVENT_SELF(8606,"当前事件待处理,不可回复"),
 	RESI_EVENT_CAN_NOT_CLOSE_CASE(8607,"事件尚未处理，请处理完成后进行办结"),
 	RESI_EVENT_SHIFT_PROJECT(8608,"事件已立项，请勿重复操作"),
+	RESI_EVENT_SUBMIT(8616,"事件内容和语音不能同时为空"),
 
 	PLEASE_CHOOSE_RECEIVER(8609,"请选择接收人"),
 	REPLY_INFO_CONTENT_NOT_NULL(8610,"回复内容不能为空"),
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 f6a0d6438d..2c7d977980 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
@@ -294,7 +294,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
         if(StringUtils.isBlank(formDTO.getEventContent()) && org.apache.commons.collections4.CollectionUtils.isEmpty(formDTO.getVoiceList())) {
             //话题内容和语音不能同时为空
             log.error("事件内容和语音不能同时为空");
-            throw new RenException("事件内容和语音不能同时为空");
+            throw new RenException(EpmetErrorCode.RESI_EVENT_SUBMIT.getCode(), EpmetErrorCode.RESI_EVENT_SUBMIT.getMsg());
         }
         if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(formDTO.getVoiceList()) && StringUtils.isBlank(formDTO.getEventContent())) {
             formDTO.setEventContent("语音事件");
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
index da42e14284..abf751fae0 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
@@ -145,7 +145,7 @@
     </resultMap>
     <select id="selectEventDetail" resultMap="selectEventDetailMap">
         SELECT
-            IFNULL(DATE_FORMAT(re.CREATED_TIME,'%Y-%m-%d %H:%i'),'') AS eventTime,
+            IFNULL(DATE_FORMAT(re.CREATED_TIME,'%Y-%m-%d %H:%i:%s'),'') AS eventTime,
             IFNULL(re.EVENT_CONTENT,'') AS eventContent,
             IFNULL(re.ADDRESS,'') AS eventAddress,
             (CASE WHEN re.`STATUS` = 'processing' THEN FALSE WHEN re.`STATUS` = 'closed_case' THEN TRUE ELSE FALSE END) AS isClosed,