From bd6a5a8143f27b883ea54d778d7c42f5bc6b5f94 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 16 Apr 2020 15:59:30 +0800 Subject: [PATCH] =?UTF-8?q?=E7=83=AD=E5=BF=83=E5=B1=85=E6=B0=91=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E8=A1=A8=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5=E5=AF=B9?= =?UTF-8?q?=E4=BA=8E=E4=BB=A3=E7=A0=81=E6=B7=BB=E5=8A=A0=E7=9B=B8=E5=BA=94?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/warmhearted/ResiWarmheartedApplyDTO.java | 10 ++++++++++ .../warmhearted/entity/ResiWarmheartedApplyEntity.java | 10 ++++++++++ .../warmhearted/excel/ResiWarmheartedApplyExcel.java | 6 ++++++ 3 files changed, 26 insertions(+) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/ResiWarmheartedApplyDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/ResiWarmheartedApplyDTO.java index 31c92d0a34..4f301d4ba1 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/ResiWarmheartedApplyDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/ResiWarmheartedApplyDTO.java @@ -69,6 +69,16 @@ public class ResiWarmheartedApplyDTO implements Serializable { */ private String refuseReason; + /** + * 审核人员已读未读标识(未读:unread 界面显示红点; 已读:read 不显示红点) + */ + private String readFlag; + + /** + * 消息通知内容 + */ + private String messageText; + /** * 热心居民申请行为记录表Id (resi_warmhearted_visit.id) */ diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/entity/ResiWarmheartedApplyEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/entity/ResiWarmheartedApplyEntity.java index 6c5545dabf..4df8b1c43c 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/entity/ResiWarmheartedApplyEntity.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/entity/ResiWarmheartedApplyEntity.java @@ -68,6 +68,16 @@ public class ResiWarmheartedApplyEntity extends BaseEpmetEntity { */ private String refuseReason; + /** + * 审核人员已读未读标识(未读:unread 界面显示红点; 已读:read 不显示红点) + */ + private String readFlag; + + /** + * 消息通知内容 + */ + private String messageText; + /** * 热心居民申请行为记录表Id (resi_warmhearted_visit.id) */ diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/excel/ResiWarmheartedApplyExcel.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/excel/ResiWarmheartedApplyExcel.java index cee8444ca4..f04c5afcaa 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/excel/ResiWarmheartedApplyExcel.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/excel/ResiWarmheartedApplyExcel.java @@ -52,6 +52,12 @@ public class ResiWarmheartedApplyExcel { @Excel(name = "拒绝理由") private String refuseReason; + @Excel(name = "阅读标记") + private String readFlag; + + @Excel(name = "消息通知内容") + private String messageText; + @Excel(name = "热心居民申请行为记录表Id (resi_warmhearted_visit.id)") private String resiWarmVisitId;