From 7c175b4ce169e76e3cdc41e9ff76ddba04d1211c Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Fri, 20 May 2022 16:24:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/IcEventServiceImpl.java  | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
index d1050e7f47..f7a35fd0ae 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
@@ -731,7 +731,7 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
         messageFormDTO.setGridId(entity.getGridId());
         messageFormDTO.setUserId(entity.getCreatedBy());
         messageFormDTO.setTitle(UserMessageConstant.EVENT_TITILE);
-        messageFormDTO.setMessageContent(String.format("您上报的事件【%s】已经被转成项目，请查看"));
+        messageFormDTO.setMessageContent(String.format("%s对您上报的事件进行了回复，请查看。", (staffInfo.getAgencyName() + "-" + staffInfo.getRealName())));
         messageFormDTO.setReadFlag(Constant.UNREAD);
         messageFormDTO.setMessageType(UserMessageTypeConstant.IC_EVENT);
         messageFormDTO.setTargetId(entity.getId());
@@ -748,7 +748,7 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
             logList.add(logEntity(formDTO.getCustomerId(), entity.getId(), formDTO.getUserId(), date, "close_case", "close_case"));
 
             UserMessageFormDTO close = ConvertUtils.sourceToTarget(messageFormDTO, UserMessageFormDTO.class);
-            close.setMessageContent(String.format("您上报的事件【%s】已经被工作人员办结了，请查看"));
+            close.setMessageContent(String.format("您上报的事件已完成，请查看。"));
             msgList.add(close);
         }
         icEventOperationLogService.insertBatch(logList);
@@ -795,7 +795,12 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
             messageFormDTO.setGridId(entity.getGridId());
             messageFormDTO.setUserId(entity.getCreatedBy());
             messageFormDTO.setTitle(UserMessageConstant.EVENT_TITILE);
-            messageFormDTO.setMessageContent(String.format("您上报的事件【%s】已经被转成项目，请查看"));
+            //获取当前工作人员缓存信息
+            CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId());
+            if (null == staffInfo) {
+                throw new EpmetException(String.format("查询工作人员%s缓存信息失败...", formDTO.getUserId()));
+            }
+            messageFormDTO.setMessageContent(String.format("%s将您上报的事件转为项目，请查看。", staffInfo.getAgencyName()));
             messageFormDTO.setReadFlag(Constant.UNREAD);
             messageFormDTO.setMessageType(UserMessageTypeConstant.IC_EVENT);
             messageFormDTO.setTargetId(entity.getId());
@@ -847,7 +852,11 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
             messageFormDTO.setGridId(entity.getGridId());
             messageFormDTO.setUserId(entity.getCreatedBy());
             messageFormDTO.setTitle(UserMessageConstant.EVENT_TITILE);
-            messageFormDTO.setMessageContent(String.format("您上报的事件【%s】已经被转成服务，请查看"));
+            CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getDemandUserId());
+            if (null == staffInfo) {
+                throw new EpmetException(String.format("查询工作人员%s缓存信息失败...", formDTO.getDemandUserId()));
+            }
+            messageFormDTO.setMessageContent(String.format("%s将您上报的事件转为服务，请查看。", staffInfo.getAgencyName()));
             messageFormDTO.setReadFlag(Constant.UNREAD);
             messageFormDTO.setMessageType(UserMessageTypeConstant.IC_EVENT);
             messageFormDTO.setTargetId(entity.getId());