From af6c11252f16a07822a9ff7c53deaa7923ce3556 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 26 Apr 2021 11:00:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=97=B6=E9=97=B4=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/group/result/AllGroupListResultDTO.java | 5 ++--- .../dto/notice/result/NoticeDetailResultDTO.java | 16 +++++++++------- .../notice/service/impl/NoticeServiceImpl.java | 3 ++- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/AllGroupListResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/AllGroupListResultDTO.java index 8ec0a07554..d31e01cab8 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/AllGroupListResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/AllGroupListResultDTO.java @@ -5,9 +5,8 @@ import lombok.Data; import java.io.Serializable; /** - * @Description 推荐小组查询返参 - * @Author yinzuomei - * @Date 2020/3/28 17:11 + * @Author sun + * @Description 所有小组查询-接口返参 */ @Data public class AllGroupListResultDTO implements Serializable { diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/result/NoticeDetailResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/result/NoticeDetailResultDTO.java index eec820ee53..8709f48263 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/result/NoticeDetailResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/result/NoticeDetailResultDTO.java @@ -1,15 +1,11 @@ package com.epmet.resi.group.dto.notice.result; -import com.epmet.resi.group.dto.notice.form.AddNoticeFormDTO; -import com.epmet.resi.group.dto.topic.form.FileDTO; -import com.fasterxml.jackson.annotation.JsonIgnore; +import com.alibaba.fastjson.annotation.JSONField; import lombok.Data; import lombok.NoArgsConstructor; -import org.hibernate.validator.constraints.Length; -import javax.validation.constraints.NotBlank; import java.io.Serializable; -import java.util.ArrayList; +import java.util.Date; import java.util.List; /** @@ -39,7 +35,13 @@ public class NoticeDetailResultDTO implements Serializable { /** * 发布时间yyyy-MM-dd HH:mm */ - private String releaseTime; + @JSONField(format="yyyy-MM-dd HH:mm") + private Date releaseTime; + /** + * 通知过期时间(此时间需大于变更时间) + */ + @JSONField(format="yyyy-MM-dd HH:mm") + private Date expirationTime; /** * 发布人头像 */ diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeServiceImpl.java index 9f91a71585..871f2c23f0 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeServiceImpl.java @@ -469,7 +469,8 @@ public class NoticeServiceImpl extends BaseServiceImpl resultDTO.setTitle(entity.getTitle()); resultDTO.setContent(entity.getContent()); resultDTO.setIsChange(entity.getIsChange()); - resultDTO.setReleaseTime(entity.getChangeTime().toString()); + resultDTO.setReleaseTime(entity.getChangeTime()); + resultDTO.setExpirationTime(entity.getExpirationTime()); StringBuffer name = new StringBuffer(); StringBuffer url = new StringBuffer(); resultDTOList.forEach(user -> {