Merge remote-tracking branch 'origin/dev_1118' into dev_1118

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);
+    }
+
 }

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<CategoryEntity> {
      * @param id
      */
     List<CategoryEntity> getPidListById(Long id);
+
+    /***
+     * 导入分类表格
+     */
+    Result insertPartyList(MultipartFile file);
 }

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<CategoryDao, CategoryEn
         subCategoryIdList.add(id);
         return subCategoryIdList;
     }
+
+    @Override
+    public Result insertPartyList(MultipartFile file) {
+
+        return new Result();
+    }
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java

@@ -132,10 +132,9 @@ public interface EpdcEventsDao extends BaseDao<EpdcEventsEntity> {
     /**
      *根据网格id和状态获取议题状态统计
      * @param deptIdList
-     * @param state
      * @return
      */
-    int selectCountOfEventState(List<Long> deptIdList, int state);
+    Map selectCountOfEventState(List<Long> deptIdList);
 
     /**
      * 查询待回应列表

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<EpdcEventsEntity> {
     /**
      * 根据状态和网格id查询书量
      * @param deptIdList
-     * @param state
      * @return
      */
-    int selectCountOfEventState(List<Long> deptIdList, int state);
+    Map selectCountOfEventState(List<Long> deptIdList);
 
     /**
      * 待回应列表

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<EpdcEventsDao, EpdcEv
     }
 
     @Override
-    public int selectCountOfEventState(List<Long> deptIdList, int state) {
+    public Map selectCountOfEventState(List<Long> deptIdList) {
-        return baseDao.selectCountOfEventState(deptIdList,state);
+        return baseDao.selectCountOfEventState(deptIdList);
     }
 
     @Override

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<IssueEntity> {
     /**
      * 工作端-根据网格id和状态查询数量
      * @param deptIdList
-     * @param state
      * @return
      */
-    int selectCountOfIssueState(List<Long> deptIdList, int state);
+    Map selectCountOfIssueState(List<Long> deptIdList);
 
     /**
      * 工作端-议题待处理或者已关闭的最新最热列表

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<IssueDao, IssueEntity> imp
         }else {
             list = SecurityUser.getUser().getDeptIdList();
         }
-        Integer pendingHandleNum = baseDao.selectCountOfIssueState(list,0);
+        Map map1 = baseDao.selectCountOfIssueState(list);
-        Integer closed = baseDao.selectCountOfIssueState(list,2);
+        Map map2 = epdcEventsService.selectCountOfEventState(list);
-
-        Integer pendingResponseNum = epdcEventsService.selectCountOfEventState(list,0);
-        Integer rejectedNum = epdcEventsService.selectCountOfEventState(list,2);
 
         IssueStateStatisticsResultDTO dto = new IssueStateStatisticsResultDTO();
-        dto.setClosed(closed);
+        dto.setClosed(Integer.parseInt(map1.get("closed").toString()));
-        dto.setPendingHandleNum(pendingHandleNum);
+        dto.setPendingHandleNum(Integer.parseInt(map1.get("pendingHandleNum").toString()));
-        dto.setRejectedNum(rejectedNum);
+        dto.setRejectedNum(Integer.parseInt(map2.get("rejectedNum").toString()));
-        dto.setPendingResponseNum(pendingResponseNum);
+        dto.setPendingResponseNum(Integer.parseInt(map2.get("pendingResponseNum").toString()));
         return new Result<IssueStateStatisticsResultDTO>().ok(dto);
     }
 

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml

@@ -270,16 +270,16 @@
         SELECT COUNT(ID) AS num FROM epdc_events WHERE DEL_FLAG = '0' AND grid_id = #{deptId} AND EVENT_STATE = #{state}
     </select>
 
-    <select id="selectCountOfEventState" resultType="int">
+    <select id="selectCountOfEventState" resultType="java.util.HashMap">
         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
         <foreach collection="deptIdList" item="id" index="index" open="(" close=")" separator=",">
             #{id}
         </foreach>
-        AND EVENT_STATE = #{state}
     </select>
 
     <resultMap id="pendingResponseMap" type="com.elink.esua.epdc.dto.issue.result.IssuePendingResponseResultDTO">

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml

@@ -430,10 +430,10 @@
         AND ID NOT IN ( SELECT ISSUE_ID FROM epdc_issue_handle WHERE DEL_FLAG = '0' AND HANDLER_DEPT_ID = #{deptId} AND STATE <![CDATA[ <> ]]> 0 )
     </select>
 
-
+    <select id="selectCountOfIssueState" resultType="java.util.HashMap">
-    <select id="selectCountOfIssueState" resultType="int">
         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
@@ -442,11 +442,8 @@
         <foreach collection="deptIdList" item="id" index="index" open="(" close=")" separator=",">
             #{id}
         </foreach>
-        AND ISSUE_STATE = #{state}
     </select>
 
-
-
     <resultMap id="workIssueList" type="com.elink.esua.epdc.dto.issue.result.WorkIssueListResultDTO">
         <result property="id" column="ID"/>
         <result property="eventId" column="EVENT_ID"/>
@@ -535,7 +532,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