From ac1c73a3549cfcedb5518f8a4fe8e0eb714a14f9 Mon Sep 17 00:00:00 2001 From: yinzuomei Date: Mon, 10 Feb 2020 20:04:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E8=A7=A3=E5=86=B3=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../item/result/UnsolvedItemResultDTO.java | 57 +++++++++++++++++++ .../item/controller/ItemController.java | 13 +++++ .../esua/epdc/modules/item/dao/ItemDao.java | 10 ++++ .../modules/item/service/ItemService.java | 10 ++++ .../item/service/impl/ItemServiceImpl.java | 18 ++++++ .../main/resources/mapper/item/ItemDao.xml | 51 +++++++++++++++++ 6 files changed, 159 insertions(+) create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/UnsolvedItemResultDTO.java diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/UnsolvedItemResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/UnsolvedItemResultDTO.java new file mode 100644 index 000000000..14fd2efe8 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/UnsolvedItemResultDTO.java @@ -0,0 +1,57 @@ +package com.elink.esua.epdc.dto.item.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Description 未解决项目列表 + * @Author yinzuomei + * @Date 2020/2/10 18:58 + */ +@Data +public class UnsolvedItemResultDTO implements Serializable { + private static final long serialVersionUID = 7659596790013430029L; + /** + * epdc_item表主键 + */ + private String id; + + /** + * 议题内容-项目摘要 + */ + private String itemContent; + + /** + * 发布时间 + */ + private Date releaseTime; + + /** + * 所有部门 + */ + private String allDeptNames; + + /** + * 发布人用户昵称 + */ + private String nickName; + + /** + * 处理次数 + */ + private Integer solveNum; + + /** + *最新进展处理时间 + */ + private Date latestHandleTime; + + /** + * 最新进展处理部门 + */ + private String latestHandleDeptName; + + +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java index d0e230492..1ecb34a5f 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java @@ -20,6 +20,7 @@ package com.elink.esua.epdc.modules.item.controller; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.item.result.ItemResultDTO; +import com.elink.esua.epdc.dto.item.result.UnsolvedItemResultDTO; import com.elink.esua.epdc.modules.item.service.ItemService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -56,4 +57,16 @@ public class ItemController { return new Result>().ok(page); } + /** + * @param params + * @return com.elink.esua.epdc.dto.item.result.UnsolvedItemResultDTO + * @Author yinzuomei + * @Description 未解决项目列表查询 + * @Date 2020/2/10 19:08 + **/ + @GetMapping("pageUnsolvedItem") + public Result> pageUnsolvedItem(@RequestParam Map params) { + PageData page = itemService.listUnsolvedItemResultDTO(params); + return new Result>().ok(page); + } } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java index 81319ce3e..6e83edcad 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java @@ -19,6 +19,7 @@ package com.elink.esua.epdc.modules.item.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.dto.item.result.ItemResultDTO; +import com.elink.esua.epdc.dto.item.result.UnsolvedItemResultDTO; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -39,4 +40,13 @@ public interface ItemDao extends BaseDao { * @Date 2020/2/10 13:53 **/ List selectListHottestItemResultDTO(Map params); + + /** + * @param params + * @return java.util.List + * @Author yinzuomei + * @Description 未解决项目列表查询 + * @Date 2020/2/10 19:16 + **/ + List selectListUnsolvedItemResultDTO(Map params); } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java index eedbbc6ba..2c30cedd0 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java @@ -2,6 +2,7 @@ package com.elink.esua.epdc.modules.item.service; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.dto.item.result.ItemResultDTO; +import com.elink.esua.epdc.dto.item.result.UnsolvedItemResultDTO; import java.util.Map; @@ -21,4 +22,13 @@ public interface ItemService { * @Date 2020/2/10 13:46 **/ PageData listItemResultDTO(Map params); + + /** + * @param params + * @return com.elink.esua.epdc.dto.item.result.UnsolvedItemResultDTO + * @Author yinzuomei + * @Description 未解决项目列表查询 + * @Date 2020/2/10 19:11 + **/ + PageData listUnsolvedItemResultDTO(Map params); } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index c6a499082..ebca0a70a 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -8,6 +8,7 @@ import com.elink.esua.epdc.commons.tools.security.user.UserDetail; import com.elink.esua.epdc.datasources.DataSourceNames; import com.elink.esua.epdc.datasources.annotation.DataSource; import com.elink.esua.epdc.dto.item.result.ItemResultDTO; +import com.elink.esua.epdc.dto.item.result.UnsolvedItemResultDTO; import com.elink.esua.epdc.modules.item.dao.ItemDao; import com.elink.esua.epdc.modules.item.service.ItemService; import org.springframework.stereotype.Service; @@ -38,4 +39,21 @@ public class ItemServiceImpl extends BaseServiceImpl imp List list = baseDao.selectListHottestItemResultDTO(params); return new PageData<>(list, page.getTotal()); } + + /** + * @param params + * @return com.elink.esua.epdc.dto.item.result.UnsolvedItemResultDTO + * @Author yinzuomei + * @Description 未解决项目列表查询 + * @Date 2020/2/10 19:13 + **/ + @Override + @DataSource(name = DataSourceNames.FOURTH) + public PageData listUnsolvedItemResultDTO(Map params) { + UserDetail userDetail = SecurityUser.getUser(); + params.put("deptIdList", userDetail.getDeptIdList()); + IPage page = getPage(params); + List list = baseDao.selectListUnsolvedItemResultDTO(params); + return new PageData<>(list, page.getTotal()); + } } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/item/ItemDao.xml index d2dca2d1d..7b04ebb77 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/item/ItemDao.xml @@ -50,4 +50,55 @@ ORDER BY expressAttitudeNum DESC + + +