From 71de0275effa846b9dac3f8529d6e1e971b26956 Mon Sep 17 00:00:00 2001 From: yinzuomei Date: Tue, 11 Feb 2020 17:10:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E8=B0=83=E5=BA=A6=E5=B7=B2?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E3=80=81=E6=9C=AA=E8=A7=A3=E5=86=B3=E5=88=97?= =?UTF-8?q?=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/DifficultItemResultDTO.java | 33 ++++ .../result/ReportSolvedItemResultDTO.java | 57 +++++++ .../result/ReportUnsolvedItemResultDTO.java | 49 ++++++ .../impl/IssueAnalysisServiceImpl.java | 1 + .../controller/ItemAnalysisController.java | 28 +++- .../modules/item/dao/ItemAnalysisDao.java | 22 ++- .../item/service/ItemAnalysisService.java | 22 ++- .../service/impl/ItemAnalysisServiceImpl.java | 46 +++++- .../resources/mapper/item/ItemAnalysisDao.xml | 142 ++++++++++++++++++ 9 files changed, 387 insertions(+), 13 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReportSolvedItemResultDTO.java create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReportUnsolvedItemResultDTO.java diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/DifficultItemResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/DifficultItemResultDTO.java index a76137bb2..5294817a6 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/DifficultItemResultDTO.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/DifficultItemResultDTO.java @@ -13,15 +13,48 @@ import java.util.Date; @Data public class DifficultItemResultDTO implements Serializable { private static final long serialVersionUID = -4125919212689714492L; + /** + * 主键 + */ private String id; + /** + * 项目内容 + */ private String itemContent; + /** + * 转项目时间 + */ private Date createdTime; + /** + * 处理次数 + */ private Integer operatNum; + /** + * 是否流转网格化平台 + */ private String reportFlag; + /** + * 涉及部门数量 + */ private Integer deptNum; + /** + * 项目状态 + */ private String itemState; + /** + * 处理完毕时间 + */ private Date processedTime; + /** + * 处理时长 + */ private Integer takeTime; + /** + * 项目来源网格名称 + */ private String allDeptNames; + /** + * 居民满意度评价 + */ private String evaluationScore; } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReportSolvedItemResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReportSolvedItemResultDTO.java new file mode 100644 index 000000000..71adffc99 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReportSolvedItemResultDTO.java @@ -0,0 +1,57 @@ +package com.elink.esua.epdc.dto.item.result; + +import com.sun.org.apache.xpath.internal.operations.String; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Description 区域调度-已解决项目列表 + * @Author yinzuomei + * @Date 2020/2/11 15:12 + */ +@Data +public class ReportSolvedItemResultDTO implements Serializable { + private static final long serialVersionUID = -600933427201742607L; + /** + * 主键 + */ + private String id; + /** + * 项目内容 + */ + private String itemContent; + /** + * 转项目时间 + */ + private Date createdTime; + /** + * 网格名称 + */ + private String grid; + /** + * 向网格化平台上报部门 + */ + private String reportDept; + /** + * 向网格化平台上报时间 + */ + private Date reportTime; + /** + * 最新处理部门 + */ + private Date lastHandlerTime; + /** + * 最新处理时间 + */ + private String lasthandlerDept; + /** + * 项目状态 + */ + private String itemState; + /** + * 居民评价 + */ + private String evaluationScore; +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReportUnsolvedItemResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReportUnsolvedItemResultDTO.java new file mode 100644 index 000000000..9f78ba40b --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/ReportUnsolvedItemResultDTO.java @@ -0,0 +1,49 @@ +package com.elink.esua.epdc.dto.item.result; + +import com.sun.org.apache.xpath.internal.operations.String; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Description 区域调度-解决中项目列表 + * @Author yinzuomei + * @Date 2020/2/11 15:10 + */ +@Data +public class ReportUnsolvedItemResultDTO implements Serializable { + private static final long serialVersionUID = 2364303777789369092L; + /** + * 主键 + */ + private String id; + /** + * 项目内容 + */ + private String itemContent; + /** + * 转项目时间 + */ + private Date createdTime; + /** + * 网格名称 + */ + private String grid; + /** + * 向网格化平台上报部门 + */ + private String reportDept; + /** + * 向网格化平台吹哨时间 + */ + private Date reportTime; + /** + * 最新进展处理部门 + */ + private Date lastHandlerTime; + /** + * 最新进展处理时间 + */ + private String lasthandlerDept; +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueAnalysisServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueAnalysisServiceImpl.java index fe16ebbac..a2d801b36 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueAnalysisServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueAnalysisServiceImpl.java @@ -76,6 +76,7 @@ public class IssueAnalysisServiceImpl extends BaseServiceImpl listIssueClassifiedStatistic(Map params) { UserDetail userDetail = SecurityUser.getUser(); diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemAnalysisController.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemAnalysisController.java index 35485182e..060623a39 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemAnalysisController.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemAnalysisController.java @@ -19,9 +19,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.DifficultItemResultDTO; -import com.elink.esua.epdc.dto.item.result.ItemResultDTO; -import com.elink.esua.epdc.dto.item.result.UnsolvedItemResultDTO; +import com.elink.esua.epdc.dto.item.result.*; import com.elink.esua.epdc.modules.item.service.ItemAnalysisService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -84,5 +82,29 @@ public class ItemAnalysisController { return new Result>().ok(page); } + /** + * @param params + * @return com.elink.esua.epdc.dto.item.result.ReportUnsolvedItemResultDTO + * @Author yinzuomei + * @Description 区域调度-解决中项目列表 + * @Date 2020/2/11 15:11 + **/ + @GetMapping("pageReportUnsolvedItem") + public Result> pageReportUnsolvedItem(@RequestParam Map params) { + PageData page = itemAnalysisService.listReportUnsolvedItemDTO(params); + return new Result>().ok(page); + } + /** + * @param params + * @return com.elink.esua.epdc.dto.item.result.ReportSolvedItemResultDTO + * @Author yinzuomei + * @Description 区域调度-已解决项目列表 + * @Date 2020/2/11 15:11 + **/ + @GetMapping("pageReportSolvedItem") + public Result> pageReportSolvedItem(@RequestParam Map params) { + PageData page = itemAnalysisService.listReportSolvedItemResultDTO(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/ItemAnalysisDao.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemAnalysisDao.java index 209a41066..4d6b92451 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemAnalysisDao.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemAnalysisDao.java @@ -18,9 +18,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.DifficultItemResultDTO; -import com.elink.esua.epdc.dto.item.result.ItemResultDTO; -import com.elink.esua.epdc.dto.item.result.UnsolvedItemResultDTO; +import com.elink.esua.epdc.dto.item.result.*; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -59,4 +57,22 @@ public interface ItemAnalysisDao extends BaseDao { * @Date 2020/2/11 13:14 **/ List selectListDifficultItemResultDTO(Map params); + + /** + * @param params + * @return java.util.List + * @Author yinzuomei + * @Description 区域调度-解决中项目列表 + * @Date 2020/2/11 15:14 + **/ + List selectListReportUnsolvedItemResultDTO(Map params); + + /** + * @param params + * @return java.util.List + * @Author yinzuomei + * @Description 区域调度-已解决项目列表 + * @Date 2020/2/11 15:15 + **/ + List selectListReportSolvedItemResultDTO(Map params); } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemAnalysisService.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemAnalysisService.java index 94c17f074..adb2f88f5 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemAnalysisService.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemAnalysisService.java @@ -1,9 +1,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.DifficultItemResultDTO; -import com.elink.esua.epdc.dto.item.result.ItemResultDTO; -import com.elink.esua.epdc.dto.item.result.UnsolvedItemResultDTO; +import com.elink.esua.epdc.dto.item.result.*; import java.util.Map; @@ -41,4 +39,22 @@ public interface ItemAnalysisService { * @Date 2020/2/11 13:13 **/ PageData listDifficultItemResultDTO(Map params); + + /** + * @param params + * @return com.elink.esua.epdc.commons.tools.page.PageData + * @Author yinzuomei + * @Description 区域调度-解决中项目列表 + * @Date 2020/2/11 15:13 + **/ + PageData listReportUnsolvedItemDTO(Map params); + + /** + * @param params + * @return com.elink.esua.epdc.commons.tools.page.PageData + * @Author yinzuomei + * @Description 区域调度-已解决项目列表 + * @Date 2020/2/11 15:13 + **/ + PageData listReportSolvedItemResultDTO(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/ItemAnalysisServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemAnalysisServiceImpl.java index 7418e6a89..987fbabc3 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemAnalysisServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemAnalysisServiceImpl.java @@ -7,9 +7,7 @@ import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; 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.DifficultItemResultDTO; -import com.elink.esua.epdc.dto.item.result.ItemResultDTO; -import com.elink.esua.epdc.dto.item.result.UnsolvedItemResultDTO; +import com.elink.esua.epdc.dto.item.result.*; import com.elink.esua.epdc.modules.item.dao.ItemAnalysisDao; import com.elink.esua.epdc.modules.item.service.ItemAnalysisService; import org.slf4j.Logger; @@ -75,6 +73,7 @@ public class ItemAnalysisServiceImpl extends BaseServiceImpl listDifficultItemResultDTO(Map params) { UserDetail userDetail = SecurityUser.getUser(); @@ -82,9 +81,48 @@ public class ItemAnalysisServiceImpl extends BaseServiceImpl(null, 0); } params.put("deptIdList", userDetail.getDeptIdList()); - logger.info("!!!!!!!!!!!!!!!!!!orderType=" + params.get("orderType")); IPage page = getPage(params); List list = baseDao.selectListDifficultItemResultDTO(params); return new PageData<>(list, page.getTotal()); } + + /** + * @param params + * @return com.elink.esua.epdc.commons.tools.page.PageData + * @Author yinzuomei + * @Description 区域调度-解决中项目列表 + * @Date 2020/2/11 15:13 + **/ + @DataSource(name = DataSourceNames.FOURTH) + @Override + public PageData listReportUnsolvedItemDTO(Map params) { + UserDetail userDetail = SecurityUser.getUser(); + if (null == userDetail.getDeptIdList() || userDetail.getDeptIdList().size() == 0) { + return new PageData<>(null, 0); + } + params.put("deptIdList", userDetail.getDeptIdList()); + IPage page = getPage(params); + List list = baseDao.selectListReportUnsolvedItemResultDTO(params); + return new PageData<>(list, page.getTotal()); + } + + /** + * @param params + * @return com.elink.esua.epdc.commons.tools.page.PageData + * @Author yinzuomei + * @Description 区域调度-已解决项目列表 + * @Date 2020/2/11 15:13 + **/ + @DataSource(name = DataSourceNames.FOURTH) + @Override + public PageData listReportSolvedItemResultDTO(Map params) { + UserDetail userDetail = SecurityUser.getUser(); + if (null == userDetail.getDeptIdList() || userDetail.getDeptIdList().size() == 0) { + return new PageData<>(null, 0); + } + params.put("deptIdList", userDetail.getDeptIdList()); + IPage page = getPage(params); + List list = baseDao.selectListReportSolvedItemResultDTO(params); + return new PageData<>(list, page.getTotal()); + } } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/item/ItemAnalysisDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/item/ItemAnalysisDao.xml index c19595a2a..0edb17657 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/item/ItemAnalysisDao.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/item/ItemAnalysisDao.xml @@ -191,4 +191,146 @@ AND reportFlag = #{reportFlag} + + + + + +