Browse Source

Merge remote-tracking branch 'origin/dev_resi_event' into develop

dev_shibei_match
yinzuomei 4 years ago
parent
commit
9b0dd5a9c0
  1. 6
      epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/UserMentionResultDTO.java
  2. 8
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java

6
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;
}

8
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<ResiEventDao, ResiEven
PageInfo<UserMentionResultDTO> 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();
}

Loading…
Cancel
Save