From 3afcb5e8832dd141e46d8ff4cef77a121417ed9d Mon Sep 17 00:00:00 2001 From: yujintao Date: Sat, 1 Feb 2020 11:39:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/controller/NoticeController.java | 6 ++++++ .../java/com/elink/esua/epdc/dao/NoticeDao.java | 12 ++++++++++++ .../elink/esua/epdc/service/NoticeService.java | 10 ++++++++++ .../epdc/service/impl/NoticeServiceImpl.java | 10 ++++++++++ .../src/main/resources/mapper/NoticeDao.xml | 17 +++++++++++++++++ 5 files changed, 55 insertions(+) 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 c9d71275d..b87e5a5f2 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 @@ -55,6 +55,12 @@ public class NoticeController { return new Result>().ok(page); } + @GetMapping("pageForReadOnly") + public Result> pageForReadOnly(@RequestParam Map params) { + PageData page = noticeService.pageForReadOnly(params); + return new Result>().ok(page); + } + @GetMapping("{id}") public Result get(@PathVariable("id") String id) { NoticeDTO data = noticeService.get(id); diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/NoticeDao.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/NoticeDao.java index f71bbcefc..6f220a2d9 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/NoticeDao.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/NoticeDao.java @@ -18,6 +18,7 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.NoticeDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeListFormDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeDetailResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeListResultDTO; @@ -26,6 +27,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** * 通知表 @@ -75,4 +77,14 @@ public interface NoticeDao extends BaseDao { * @date 2019/9/25 14:28 */ int updateNoticeById(NoticeEntity entity); + + /** + * 根据用户数据权限，匹配通知部门关系表 + * + * @param params + * @return java.util.List + * @author work@yujt.net.cn + * @date 2020/2/1 11:28 + */ + List selectListByDeptId(Map params); } \ 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 cb5bc8106..2203e62d9 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 @@ -137,4 +137,14 @@ public interface NoticeService extends BaseService { * @date 2019/9/6 15:55 */ Result updateReadingAmount(EpdcNoticeBrowseFormDTO formDto); + + /** + * 分页查询通知列表 + * + * @param params + * @return com.elink.esua.epdc.commons.tools.page.PageData + * @author work@yujt.net.cn + * @date 2020/2/1 11:37 + */ + PageData pageForReadOnly(Map params); } \ 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/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 cf46a1606..bbc391b1b 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 @@ -83,6 +83,16 @@ public class NoticeServiceImpl extends BaseServiceImpl return getPageData(page, NoticeDTO.class); } + @Override + public PageData pageForReadOnly(Map params) { + String noticeTitle = (String) params.get("noticeTitle"); + params.put("noticeTitle", noticeTitle.trim()); + params.put("deptIdList", SecurityUser.getUser().getDeptIdList()); + IPage page = getPage(params); + List list = baseDao.selectListByDeptId(params); + return new PageData<>(list, page.getTotal()); + } + @Override public List list(Map params) { List entityList = baseDao.selectList(getWrapper(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 273298a79..cf436e05d 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 @@ -54,4 +54,21 @@ dept_name=#{deptName} WHERE id = #{id} AND del_flag = '0' + + + \ No newline at end of file