diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/MyReportedResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/MyReportedResultDTO.java index 32209d0249..d2df7d7a66 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/MyReportedResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/MyReportedResultDTO.java @@ -52,4 +52,14 @@ public class MyReportedResultDTO implements Serializable { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date showTime; + + /** + * true:显示回复;false:不显示回复按钮 + */ + private String replyButtonFlag; + + /** + * 事件是否被阅读过;1已读;针对报事人待处理列表 + */ + private Boolean readFlag; } 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 4e2452c6c2..83d20152fd 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 @@ -476,6 +476,21 @@ public class ResiEventServiceImpl extends BaseServiceImpl result = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.queryMyReported(formDTO.getUserId(), formDTO.getStatusCondition())); + result.getList().forEach(resultDTO->{ + if(EventConstant.EVENT_STATUS_CLOSED_CASE.equals(resultDTO.getStatus())){ + // 已办结的不显示回复按钮 + resultDTO.setReplyButtonFlag("false"); + }else{ + // 处理中的事件 + if(resultDTO.getReadFlag()){ + // 被别人看过了就显示回复 + resultDTO.setReplyButtonFlag("true"); + }else{ + //别人没看过 + resultDTO.setReplyButtonFlag("false"); + } + } + }); return result.getList(); } diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml index 1af9c54926..617d3c795c 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml @@ -51,6 +51,7 @@ + @@ -70,7 +71,8 @@ re.`STATUS`, re.SHIFT_PROJECT, re.LATEST_OPERATED_TIME, - rea.ATTACHMENT_URL as img_url + rea.ATTACHMENT_URL as img_url, + re.READ_FLAG from resi_event re left join resi_event_attachment rea on(re.id=rea.RESI_EVENT_ID