From 9ab7cde67d3de8fc416f9b60c9340c6d1e88ea85 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.com> Date: Fri, 24 Sep 2021 11:17:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=85=E5=AE=B9=E7=AE=A1=E7=90=86-=E5=AF=BC?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/dto/NoticeDTO.java | 5 +++ .../epdc/controller/NoticeController.java | 4 +- .../elink/esua/epdc/excel/NoticeExcel.java | 37 +++++-------------- .../esua/epdc/service/NoticeService.java | 10 +++++ .../epdc/service/impl/NoticeServiceImpl.java | 22 +++++++++++ .../src/main/resources/mapper/NoticeDao.xml | 1 + 6 files changed, 49 insertions(+), 30 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/NoticeDTO.java b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/NoticeDTO.java index efe32422..13af97fe 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/NoticeDTO.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/NoticeDTO.java @@ -80,6 +80,11 @@ public class NoticeDTO implements Serializable { */ private Date releaseTime; + /** + * 发布时间 + */ + private String releaseTimeStr; + /** * 乐观锁 */ diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/NoticeController.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/NoticeController.java index 9c83c8e6..ebdd8222 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/NoticeController.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/NoticeController.java @@ -94,8 +94,8 @@ public class NoticeController { @GetMapping("export") public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = noticeService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, NoticeExcel.class); + List list = noticeService.selectListOfNoticeDTO(params); + ExcelUtils.exportExcelToTarget(response, "内容管理", list, NoticeExcel.class); } /** diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/excel/NoticeExcel.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/excel/NoticeExcel.java index 03ea19e6..3318ed41 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/excel/NoticeExcel.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/excel/NoticeExcel.java @@ -31,41 +31,22 @@ import java.util.Date; @Data public class NoticeExcel { - @Excel(name = "主键") - private String id; - @Excel(name = "通知标题") private String noticeTitle; - @Excel(name = "通知内容") - private String noticeContent; - - @Excel(name = "发布通知部门") - private String dept; + @Excel(name = "所属模块") + private String categoryName; - @Excel(name = "发布通知部门ID") - private String deptId; + @Excel(name = "联系电话") + private String mobile; @Excel(name = "阅读量") private Integer readingAmount; - @Excel(name = "乐观锁") - private Integer revision; - - @Excel(name = "创建人") - private String createdBy; - - @Excel(name = "创建时间") - private Date createdTime; - - @Excel(name = "更新人") - private String updatedBy; - - @Excel(name = "更新时间") - private Date updatedTime; - - @Excel(name = "删除标记") - private String delFlag; + @Excel(name = "已发布") + private String noticeReleaseState; + @Excel(name = "发布时间") + private String releaseTimeStr; -} \ No newline at end of file +} diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/NoticeService.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/NoticeService.java index b2008291..bd43b3cf 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/NoticeService.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/NoticeService.java @@ -199,4 +199,14 @@ public interface NoticeService extends BaseService { */ void updateNoticeCommentNum(String id); + /** + * 查询全部 + * + * @param params + * @return java.util.List + * @Author zhangyong + * @Date 10:21 2021-09-24 + **/ + List selectListOfNoticeDTO(Map params); + } diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java index 41cb8a80..16a2cbba 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java @@ -403,4 +403,26 @@ public class NoticeServiceImpl extends BaseServiceImpl public void updateNoticeCommentNum(String id) { baseDao.updateNoticeCommentNum(id); } + + @Override + public List selectListOfNoticeDTO(Map params) { + String noticeTitle = (String) params.get("noticeTitle"); + String noticeCategory = ((String) params.get("noticeCategory")); + if (StringUtils.isNotBlank(noticeCategory)) { + params.put("noticeCategory", noticeCategory.trim()); + } + if(StringUtils.isNotBlank(noticeTitle)){ + params.put("noticeTitle", noticeTitle.trim()); + } + params.put("createdBy",SecurityUser.getUserId()); + List dtos = baseDao.selectListOfNoticeDTO(params); + for (NoticeDTO dto : dtos) { + if (NumConstant.ZERO_STR.equals(dto.getNoticeReleaseState())) { + dto.setNoticeReleaseState("否"); + } else { + dto.setNoticeReleaseState("是"); + } + } + return baseDao.selectListOfNoticeDTO(params); + } } diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeDao.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeDao.xml index 24844a3f..8aff521e 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeDao.xml +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeDao.xml @@ -156,6 +156,7 @@ t1.CREATOR_NAME, t1.NOTICE_RELEASE_STATE, t1.RELEASE_TIME, + DATE_FORMAT(t1.RELEASE_TIME, '%Y-%m-%d %H:%i:%s') releaseTimeStr, t1.REVISION, t1.CREATED_BY, t1.CREATED_TIME,