From eaceda8ed1f3255a84b8a8199700f2cd78170722 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 22 Apr 2021 11:18:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83=E3=80=81=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E3=80=81=E5=8F=96=E6=B6=88=E3=80=81=E5=85=B3=E9=97=AD=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8=E8=AE=B0=E5=BD=95group=5Fmessage?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/act/service/impl/GroupActInfoServiceImpl.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
index bbd593b609..fbb0ff629c 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
@@ -210,7 +210,13 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
             groupMessageService.save(insert);
             return;
         }
-        groupMessageDTO.setOperateTime(groupActInfoEntity.getUpdatedTime());
+        if(GroupActConstant.CANCELED.equals(groupActInfoEntity.getStatus())){
+            groupMessageDTO.setOperateTime(groupActInfoEntity.getCanceledTime());
+        }else if(GroupActConstant.CLOSED.equals(groupActInfoEntity.getStatus())){
+            groupMessageDTO.setOperateTime(groupActInfoEntity.getClosedTime());
+        }else{
+            groupMessageDTO.setOperateTime(groupActInfoEntity.getUpdatedTime());
+        }
         groupMessageDTO.setStatus(groupActInfoEntity.getStatus());
         groupMessageService.update(groupMessageDTO);
     }