From 1ce47f3fd2228df588d98c7fcfb78e1be22db5df Mon Sep 17 00:00:00 2001
From: sunyuchao <SunYuChao123>
Date: Tue, 6 Sep 2022 15:02:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=A0=E5=A5=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/IcMessageDTO.java         | 2 +-
 .../src/main/java/com/epmet/entity/IcMessageEntity.java   | 2 +-
 .../partyOrg/service/impl/IcPartyActServiceImpl.java      | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/IcMessageDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/IcMessageDTO.java
index 3451d342f3..1c7e9e9785 100644
--- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/IcMessageDTO.java
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/IcMessageDTO.java
@@ -42,7 +42,7 @@ public class IcMessageDTO implements Serializable {
 	private String app;
 
     /**
-     * 消息分类  党建小助手:party
+     * 消息分类   党建活动：party_act   党建日程：party_schedule
      */
 	private String messageType;
 
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/IcMessageEntity.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/IcMessageEntity.java
index dc937c6639..e13ee49b0a 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/IcMessageEntity.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/IcMessageEntity.java
@@ -42,7 +42,7 @@ public class IcMessageEntity extends BaseEpmetEntity {
 	private String app;
 
     /**
-     * 消息分类  党建小助手:party
+     * 消息分类   党建活动：party_act   党建日程：party_schedule
      */
 	private String messageType;
 
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java
index 52d1c14c2a..c5d1d7244b 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java
@@ -572,7 +572,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPart
                 StringBuffer str = new StringBuffer();
                 str.append("主题：").append(entity.getTopic()).append("\n").append("时间：").append(DateUtils.format(entity.getHoldTime(), "yyyy年MM月dd日 HH:mm:ss")).append("\n").append("地点：").append(entity.getAddress());
                 msg.setMessageContent(str.toString());
-                msg.setMessageType("party");
+                msg.setMessageType("party_act");
                 msg.setTargetId(formDTO.getIcPartyActId());
                 msg.setUserId(id);
                 msgList.add(msg);
@@ -586,7 +586,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPart
             StringBuffer str = new StringBuffer();
             str.append("主题：").append(entity.getTopic()).append("\n").append("时间：").append(DateUtils.format(entity.getHoldTime(), "yyyy年MM月dd日 HH:mm:ss")).append("\n").append("地点：").append(entity.getAddress());
             msg.setMessageContent(str.toString());
-            msg.setMessageType("party");
+            msg.setMessageType("party_act");
             msg.setTargetId(formDTO.getIcPartyActId());
             msg.setUserId(entity.getPublishStaffId());
             msgList.add(msg);
@@ -601,7 +601,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPart
             StringBuffer str = new StringBuffer();
             str.append("主题：").append(entity.getTopic()).append("\n").append("时间：").append(DateUtils.format(entity.getHoldTime(), "yyyy年MM月dd日 HH:mm:ss")).append("\n").append("地点：").append(entity.getAddress());
             msg.setMessageContent(str.toString());
-            msg.setMessageType("party");
+            msg.setMessageType("party_act");
             msg.setTargetId(formDTO.getIcPartyActId());
             msg.setUserId(entity.getPublishStaffId());
             msgList.add(msg);
@@ -616,7 +616,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPart
             StringBuffer str = new StringBuffer();
             str.append("日程：").append(schedule.getTitle()).append("\n").append("时间：").append(DateUtils.format(schedule.getHappenedTime(), "yyyy年MM月dd日 HH:mm:ss"));
             msg.setMessageContent(str.toString());
-            msg.setMessageType("party");
+            msg.setMessageType("party_schedule");
             msg.setTargetId(formDTO.getIcPartyActId());
             msg.setUserId(schedule.getStaffId());
             msgList.add(msg);