|
|
@@ -11,6 +11,8 @@ import com.github.pagehelper.Page;
|
|
|
import com.github.pagehelper.PageHelper;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
+import java.text.SimpleDateFormat;
|
|
|
+import java.util.Date;
|
|
|
import java.util.List;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
@@ -65,16 +67,27 @@ public class NoticeServiceImpl implements NoticeService {
|
|
|
if (notice == null) {
|
|
|
throw new BusinessException("无此通知");
|
|
|
}
|
|
|
- return NoticeMapper.INSTANCE.noticeToNoticeViewDto(notice);
|
|
|
+
|
|
|
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
+
|
|
|
+ NoticeViewDto dto = NoticeMapper.INSTANCE.noticeToNoticeViewDto(notice);
|
|
|
+ dto.setPublishTime(dateFormat.format(new Date(notice.getPublishTime())));
|
|
|
+ return dto;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public PageResponse<NoticeViewDto> searchNotice(NoticeSearchDto dto) {
|
|
|
- try (Page<Notice> page = PageHelper.startPage(dto.getPage(), dto.getPageCapacity())){
|
|
|
+ try (Page<Notice> page = PageHelper.startPage(dto.getPage(), dto.getPageCapacity())) {
|
|
|
List<Notice> notices = noticeDao.selectByType(dto.getType());
|
|
|
|
|
|
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
+
|
|
|
List<NoticeViewDto> list = notices.stream()
|
|
|
- .map(NoticeMapper.INSTANCE::noticeToNoticeViewDto)
|
|
|
+ .map(i -> {
|
|
|
+ NoticeViewDto viewDto = NoticeMapper.INSTANCE.noticeToNoticeViewDto(i);
|
|
|
+ viewDto.setPublishTime(dateFormat.format(new Date(i.getPublishTime())));
|
|
|
+ return viewDto;
|
|
|
+ })
|
|
|
.collect(Collectors.toList());
|
|
|
|
|
|
PageResponse<NoticeViewDto> response = new PageResponse<>();
|