From a0ba787b3d6d21e92172b4ecf5ddf2a63b7c2864 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 5 Aug 2021 14:32:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=8A=A5=E4=BA=8B?= =?UTF-8?q?=E4=BA=BA=E6=98=AF=E4=BA=BA=E5=A4=A7=E4=BB=A3=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E5=B9=B6=E4=B8=94=E8=87=AA=E5=B7=B1=E8=89=BE=E7=89=B9=E4=BA=86?= =?UTF-8?q?=E8=87=AA=E5=B7=B1=EF=BC=8C=E5=9C=A8=E4=B8=AA=E4=BA=BA=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=E6=9C=AA=E8=AF=BB=E5=88=97=E8=A1=A8=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E6=9B=B4=E6=94=B9=E4=B8=BA=E5=B7=B2=E8=AF=BB?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dao/ResiEventMentionDao.java | 2 ++ .../java/com/epmet/service/impl/ResiEventServiceImpl.java | 5 +++-- .../src/main/resources/mapper/ResiEventMentionDao.xml | 7 +++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventMentionDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventMentionDao.java index 15062a1385..76aaeb9162 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventMentionDao.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventMentionDao.java @@ -65,4 +65,6 @@ public interface ResiEventMentionDao extends BaseDao { * @date 2021/8/4 17:41 */ int updateRedDotShow(@Param("resiEventId") String resiEventId,@Param("excludeUserId")String excludeUserId); + + ResiEventMentionEntity selectUser(@Param("eventId") String eventId, @Param("userId")String userId); } \ No newline at end of file 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 b102b84c85..ebeda707f1 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 @@ -120,8 +120,9 @@ public class ResiEventServiceImpl extends BaseServiceImpl AND DEL_FLAG = '0' + + \ No newline at end of file From 232ed3c0e67bb0614e37084764747d828b5d1b3a Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 5 Aug 2021 14:46:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BA=BA=E5=A4=A7=E5=88=97=E8=A1=A8?= =?UTF-8?q?=EF=BC=8C=E8=BF=94=E5=9B=9E=E6=98=AF=E5=90=A6=E5=8F=AF=E5=9B=9E?= =?UTF-8?q?=E5=A4=8D=EF=BC=8C=E5=8F=AA=E8=A6=81=E5=8A=9E=E7=BB=93=E6=88=96?= =?UTF-8?q?=E8=80=85=E7=AB=8B=E9=A1=B9=E4=BA=86=EF=BC=8C=E4=B8=8D=E5=8F=AF?= =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/result/UserMentionResultDTO.java | 6 ++++++ .../java/com/epmet/service/impl/ResiEventServiceImpl.java | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/UserMentionResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/UserMentionResultDTO.java index 95ac2e2527..48bb9583ba 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/UserMentionResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/UserMentionResultDTO.java @@ -52,4 +52,10 @@ public class UserMentionResultDTO implements Serializable { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date showTime; + + /** + * true:显示回复；false：不显示回复按钮 + */ + private String replyButtonFlag; + } 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 ebeda707f1..285448dec6 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 @@ -507,6 +507,14 @@ public class ResiEventServiceImpl extends BaseServiceImpl result = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> resiEventMentionDao.selectMentionList(formDTO.getUserId(), formDTO.getReadFlag())); + result.getList().forEach(dto->{ + if(dto.getShiftProject()||dto.getStatus().equals(EventConstant.EVENT_STATUS_CLOSED_CASE)){ + // 立项和办结了不能回复哈。 + dto.setReplyButtonFlag("false"); + }else{ + dto.setReplyButtonFlag("true"); + } + }); return result.getList(); }