From 9dbeb3805dda1f69b2579f85ce011722aec6ce03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=87=91=E9=B9=8F?= Date: Fri, 29 Nov 2019 14:45:13 +0800 Subject: [PATCH 1/4] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../category/controller/CategoryController.java | 9 +++++++++ .../modules/category/service/CategoryService.java | 7 +++++++ .../service/impl/CategoryServiceImpl.java | 13 ++++++++++++- .../epdc/modules/events/dao/EpdcEventsDao.java | 3 +-- .../modules/events/service/EpdcEventsService.java | 3 +-- .../service/impl/EpdcEventsServiceImpl.java | 4 ++-- .../esua/epdc/modules/issue/dao/IssueDao.java | 3 +-- .../issue/service/impl/IssueServiceImpl.java | 15 ++++++--------- .../resources/mapper/events/EpdcEventsDao.xml | 6 +++--- .../src/main/resources/mapper/issue/IssueDao.xml | 11 ++++------- 10 files changed, 46 insertions(+), 28 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/controller/CategoryController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/controller/CategoryController.java index 5dc5aae29..9ddd04bab 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/controller/CategoryController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/controller/CategoryController.java @@ -31,6 +31,7 @@ import com.elink.esua.epdc.modules.category.service.CategoryService; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; import java.util.HashMap; @@ -93,4 +94,12 @@ public class CategoryController { ExcelUtils.exportExcelToTarget(response, null, list, CategoryExcel.class); } + /*** + * 导入分类Excel表格 + */ + @PostMapping("importExcel") + public Result importExcel(@RequestParam("file") MultipartFile file) { + return categoryService.insertPartyList(file); + } + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/CategoryService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/CategoryService.java index a3024ba3d..b855a241a 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/CategoryService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/CategoryService.java @@ -18,8 +18,10 @@ package com.elink.esua.epdc.modules.category.service; import com.elink.esua.epdc.commons.mybatis.service.BaseService; +import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.category.CategoryDTO; import com.elink.esua.epdc.modules.category.entity.CategoryEntity; +import org.springframework.web.multipart.MultipartFile; import java.util.List; import java.util.Map; @@ -94,4 +96,9 @@ public interface CategoryService extends BaseService { * @param id */ List getPidListById(Long id); + + /*** + * 导入分类表格 + */ + Result insertPartyList(MultipartFile file); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/impl/CategoryServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/impl/CategoryServiceImpl.java index c1b8185fd..f771bcb9a 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/impl/CategoryServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/impl/CategoryServiceImpl.java @@ -17,7 +17,9 @@ package com.elink.esua.epdc.modules.category.service.impl; -import com.baomidou.mybatisplus.core.conditions.Wrapper; +import cn.afterturn.easypoi.excel.ExcelImportUtil; +import cn.afterturn.easypoi.excel.entity.ImportParams; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; @@ -27,6 +29,7 @@ import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; +import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.utils.TreeUtils; import com.elink.esua.epdc.dto.category.CategoryDTO; import com.elink.esua.epdc.modules.category.dao.CategoryDao; @@ -37,7 +40,9 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; +import java.io.File; import java.util.*; /** @@ -212,4 +217,10 @@ public class CategoryServiceImpl extends BaseServiceImpl { /** *根据网格id和状态获取议题状态统计 * @param deptIdList - * @param state * @return */ - int selectCountOfEventState(List deptIdList, int state); + Map selectCountOfEventState(List deptIdList); /** * 查询待回应列表 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java index ec161bc53..97a789e9d 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java @@ -185,10 +185,9 @@ public interface EpdcEventsService extends BaseService { /** * 根据状态和网格id查询书量 * @param deptIdList - * @param state * @return */ - int selectCountOfEventState(List deptIdList, int state); + Map selectCountOfEventState(List deptIdList); /** * 待回应列表 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java index 9c6d41215..ea1f9c472 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java @@ -447,8 +447,8 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl deptIdList, int state) { - return baseDao.selectCountOfEventState(deptIdList,state); + public Map selectCountOfEventState(List deptIdList) { + return baseDao.selectCountOfEventState(deptIdList); } @Override diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java index 1e9e4b99b..221add95d 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java @@ -134,10 +134,9 @@ public interface IssueDao extends BaseDao { /** * 工作端-根据网格id和状态查询数量 * @param deptIdList - * @param state * @return */ - int selectCountOfIssueState(List deptIdList, int state); + Map selectCountOfIssueState(List deptIdList); /** * 工作端-议题待处理或者已关闭的最新最热列表 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java index 251f3a265..0247381b0 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java @@ -423,17 +423,14 @@ public class IssueServiceImpl extends BaseServiceImpl imp }else { list = SecurityUser.getUser().getDeptIdList(); } - Integer pendingHandleNum = baseDao.selectCountOfIssueState(list,0); - Integer closed = baseDao.selectCountOfIssueState(list,2); - - Integer pendingResponseNum = epdcEventsService.selectCountOfEventState(list,0); - Integer rejectedNum = epdcEventsService.selectCountOfEventState(list,2); + Map map1 = baseDao.selectCountOfIssueState(list); + Map map2 = epdcEventsService.selectCountOfEventState(list); IssueStateStatisticsResultDTO dto = new IssueStateStatisticsResultDTO(); - dto.setClosed(closed); - dto.setPendingHandleNum(pendingHandleNum); - dto.setRejectedNum(rejectedNum); - dto.setPendingResponseNum(pendingResponseNum); + dto.setClosed(Integer.parseInt(map1.get("closed").toString())); + dto.setPendingHandleNum(Integer.parseInt(map1.get("pendingHandleNum").toString())); + dto.setRejectedNum(Integer.parseInt(map2.get("rejectedNum").toString())); + dto.setPendingResponseNum(Integer.parseInt(map2.get("pendingResponseNum").toString())); return new Result().ok(dto); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml index 2e1e6cd3a..344d1b94e 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml @@ -268,16 +268,16 @@ SELECT COUNT(ID) AS num FROM epdc_events WHERE DEL_FLAG = '0' AND grid_id = #{deptId} AND EVENT_STATE = #{state} - SELECT - COUNT(ID) AS num + sum(case when EVENT_STATE=0 then 1 else 0 end ) as rejectedNum, + sum(case when EVENT_STATE=2 then 1 else 0 end ) as pendingResponseNum FROM epdc_events WHERE DEL_FLAG = '0' AND GRID_ID IN #{id} - AND EVENT_STATE = #{state} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml index 0c023ef1a..e0c80408a 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml @@ -429,10 +429,10 @@ AND ID NOT IN ( SELECT ISSUE_ID FROM epdc_issue_handle WHERE DEL_FLAG = '0' AND HANDLER_DEPT_ID = #{deptId} AND STATE ]]> 0 ) - - SELECT - COUNT( ID ) AS num + sum(case when ISSUE_STATE=0 then 1 else 0 end ) as pendingHandleNum, + sum(case when ISSUE_STATE=2 then 1 else 0 end ) as closed FROM epdc_issue WHERE @@ -441,11 +441,8 @@ #{id} - AND ISSUE_STATE = #{state} - - @@ -534,7 +531,7 @@ eve.OPPOSE_NUM, eve.BROWSE_NUM, eve.COMMENT_NUM, - ( eve.APPROVE_NUM + eve.OPPOSE_NUM + eve.COMMENT_NUM + eve.BROWSE_NUM ) AS STATEMENT_NUM + ( eve.APPROVE_NUM + eve.OPPOSE_NUM + eve.COMMENT_NUM + eve.BROWSE_NUM ) AS STATEMENT_NUM, img.IMG_URL FROM epdc_issue issue From f08a9e87cb9c67fe1818eb8caa2ea00f0cb0f45e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= Date: Fri, 29 Nov 2019 14:50:32 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/service/impl/SysDeptServiceImpl.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java index eed24aaf8..61d57a772 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java @@ -257,19 +257,19 @@ public class SysDeptServiceImpl extends BaseServiceImpl Date: Fri, 29 Nov 2019 14:51:47 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/service/impl/SysDeptServiceImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java index 61d57a772..f21905f2b 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java @@ -261,15 +261,15 @@ public class SysDeptServiceImpl extends BaseServiceImpl Date: Fri, 29 Nov 2019 14:55:38 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/service/impl/SysDeptServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java index f21905f2b..23e947b5f 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java @@ -266,10 +266,10 @@ public class SysDeptServiceImpl extends BaseServiceImpl