议题管理待处理、已关闭、已转项目 init

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/EventIssueItemState.java

@@ -77,4 +77,16 @@ public interface EventIssueItemState {
      * 议题处理-关闭
      */
     int ISSUE_HANDLED_CLOSED= 2;
+    /**
+     * 事件状态字段
+     */
+    String EVENT_STATE = "EVENT_STATE";
+    /**
+     * 议题状态字段
+     */
+    String ISSUE_STATE = "ISSUE_STATE";
+    /**
+     * 项目状态字段
+     */
+    String ITEM_STATE = "ITEM_STATE";
 }

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDetailDTO.java

@@ -38,4 +38,8 @@ public class EpdcEventsDetailDTO implements Serializable {
      * 图片数据
      */
     private String[] imageArray;
+    /**
+     * 事件地址
+     */
+    private String address;
 }

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueWaitHandleOrClosedDTO.java

@@ -0,0 +1,52 @@
+package com.elink.esua.epdc.dto.issue;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Author LC
+ * @Date 2019/9/5 14:19
+ */
+@Data
+public class IssueWaitHandleOrClosedDTO implements Serializable {
+    private static final long serialVersionUID = -9108628659586683187L;
+
+    /**
+     * 议题ID
+     */
+    private String id;
+    /**
+     * 议题内容
+     */
+    private String issueContent;
+    /**
+     * 提交时间
+     */
+    private Date createdTime;
+    /**
+     * 提交人
+     */
+    private String nickName;
+    /**
+     * 参与人数
+     */
+    private Integer participateNum;
+    /**
+     * 支持人数
+     */
+    private Integer approveNum;
+    /**
+     * 反对人数
+     */
+    private Integer opposeNum;
+    /**
+     * 评论数
+     */
+    private Integer commentNum;
+    /**
+     * 浏览数
+     */
+    private Integer browseNum;
+}

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcEventsController.java

@@ -17,6 +17,7 @@
 
 package com.elink.esua.epdc.modules.events.controller;
 
+import com.elink.esua.epdc.commons.mybatis.annotation.DataFilter;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
@@ -25,7 +26,6 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
-import com.elink.esua.epdc.constant.EventIssueItemState;
 import com.elink.esua.epdc.dto.events.EpdcEventsDTO;
 import com.elink.esua.epdc.dto.events.EpdcEventsDetailDTO;
 import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO;
@@ -52,15 +52,16 @@ public class EpdcEventsController {
     private EpdcEventsService epdcEventsService;
 
     @GetMapping("page")
+    @DataFilter(tableAlias = "temp", deptId = "grid_id", prefix = "AND")
     public Result<PageData<EpdcEventsDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<EpdcEventsDTO> page = epdcEventsService.page(params);
+        PageData<EpdcEventsDTO> page = epdcEventsService.listOfPendingReviewEvents(params);
 
         return new Result<PageData<EpdcEventsDTO>>().ok(page);
     }
 
     @GetMapping("{id}")
     public Result<EpdcEventsDetailDTO> get(@PathVariable("id") String id){
-        EpdcEventsDetailDTO data = epdcEventsService.get(id);
+        EpdcEventsDetailDTO data = epdcEventsService.getEvent(id);
         data.setImageArray(data.getImages().split(","));
         return new Result<EpdcEventsDetailDTO>().ok(data);
     }

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

@@ -18,11 +18,15 @@
 package com.elink.esua.epdc.modules.events.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.events.EpdcEventsDTO;
 import com.elink.esua.epdc.dto.events.EpdcEventsDetailDTO;
 import com.elink.esua.epdc.modules.events.entity.EpdcEventsEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 事件表 事件表
  *
@@ -38,5 +42,21 @@ public interface EpdcEventsDao extends BaseDao<EpdcEventsEntity> {
      * @Author: liuchuang
      * @Date: 2019/9/4 20:31
      */
-    EpdcEventsDetailDTO getEventDetailById(@Param("id") String id);
+    EpdcEventsDetailDTO selectOneOfEventDetailById(@Param("id") String id);
+    /**
+     * 事件待审核列表
+     * @Params: [params]
+     * @Return: java.util.List<com.elink.esua.epdc.dto.events.EpdcEventsDTO>
+     * @Author: liuchuang
+     * @Date: 2019/9/5 19:42
+     */
+    List<EpdcEventsDTO> selectListOfPendingReviewEvents(Map<String, Object> params);
+    /**
+     * 事件待审核列表总数
+     * @Params: [params]
+     * @Return: long
+     * @Author: liuchuang
+     * @Date: 2019/9/5 19:46
+     */
+    long selectCountOfEvents(Map<String, Object> params);
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java

@@ -36,7 +36,14 @@ import java.util.Map;
  */
 public interface EpdcEventsService extends BaseService<EpdcEventsEntity> {
 
-    PageData<EpdcEventsDTO> page(Map<String, Object> params);
+    /**
+     * 事件待审核列表
+     * @Params: [params]
+     * @Return: com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.events.EpdcEventsDTO>
+     * @Author: liuchuang
+     * @Date: 2019/9/5 19:50
+     */
+    PageData<EpdcEventsDTO> listOfPendingReviewEvents(Map<String, Object> params);
 
     List<EpdcEventsDTO> list(Map<String, Object> params);
 
@@ -47,7 +54,7 @@ public interface EpdcEventsService extends BaseService<EpdcEventsEntity> {
      * @Author: liuchuang
      * @Date: 2019/9/4 20:47
      */
-    EpdcEventsDetailDTO get(String id);
+    EpdcEventsDetailDTO getEvent(String id);
 
     void save(EpdcEventsDTO dto);
 

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java

@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.enums.DelFlagEnum;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.Constant;
+import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 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.utils.Result;
@@ -37,6 +38,7 @@ import com.elink.esua.epdc.modules.issue.entity.IssueEntity;
 import com.elink.esua.epdc.modules.issue.entity.IssueHandleEntity;
 import com.elink.esua.epdc.modules.issue.service.IssueHandleService;
 import com.elink.esua.epdc.modules.issue.service.IssueService;
+import com.elink.esua.epdc.modules.item.entity.ItemEntity;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -62,13 +64,10 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
     private IssueHandleService issueHandleService;
 
     @Override
-    public PageData<EpdcEventsDTO> page(Map<String, Object> params) {
+    public PageData<EpdcEventsDTO> listOfPendingReviewEvents(Map<String, Object> params) {
-        IPage<EpdcEventsEntity> page = baseDao.selectPage(
+        List<EpdcEventsDTO> list = baseDao.selectListOfPendingReviewEvents(params);
-                getPage(params, Constant.CREATED_TIME, false),
+        long total = baseDao.selectCountOfEvents(params);
-                getWrapper(params)
+        return new PageData<>(list, total);
-        );
-
-        return getPageData(page, EpdcEventsDTO.class);
     }
 
     @Override
@@ -79,19 +78,17 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
     }
 
     private QueryWrapper<EpdcEventsEntity> getWrapper(Map<String, Object> params){
-        String startTime = (String)params.get("startTime");
+        String id = (String)params.get(FieldConstant.ID_HUMP);
-        String endTime = (String)params.get("endTime");
 
         QueryWrapper<EpdcEventsEntity> wrapper = new QueryWrapper<>();
-        wrapper.between(StringUtils.isNotBlank(startTime), Constant.CREATED_TIME, startTime, endTime);
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-        wrapper.eq(Constant.DEL_FLAG, DelFlagEnum.NORMAL.value());
 
         return wrapper;
     }
 
     @Override
-    public EpdcEventsDetailDTO get(String id) {
+    public EpdcEventsDetailDTO getEvent(String id) {
-        return baseDao.getEventDetailById(id);
+        return baseDao.selectOneOfEventDetailById(id);
     }
 
     @Override
@@ -126,6 +123,7 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
         EpdcEventsEntity entity = new EpdcEventsEntity();
         entity.setId(dto.getId());
         entity.setEventState(dto.getEventState());
+        entity.setIssueCategoryId(dto.getCategoryId());
         entity.setAdvice(dto.getAdvice());
         // 更新事件表审核状态
         updateById(entity);

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/IssueController.java

@@ -17,6 +17,7 @@
 
 package com.elink.esua.epdc.modules.issue.controller;
 
+import com.elink.esua.epdc.commons.mybatis.annotation.DataFilter;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
@@ -25,7 +26,9 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.constant.EventIssueItemState;
 import com.elink.esua.epdc.dto.issue.IssueDTO;
+import com.elink.esua.epdc.dto.issue.IssueWaitHandleOrClosedDTO;
 import com.elink.esua.epdc.modules.issue.excel.IssueExcel;
 import com.elink.esua.epdc.modules.issue.service.IssueService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,10 +52,49 @@ public class IssueController {
     @Autowired
     private IssueService issueService;
 
-    @GetMapping("page")
+    /**
-    public Result<PageData<IssueDTO>> page(@RequestParam Map<String, Object> params){
+     * 议题管理-待处理列表
-        PageData<IssueDTO> page = issueService.page(params);
+     * @Params: [params]
-        return new Result<PageData<IssueDTO>>().ok(page);
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.issue.IssueWaitHandleOrClosedDTO>>
+     * @Author: liuchuang
+     * @Date: 2019/9/5 16:49
+     */
+    @GetMapping("waitHandlePage")
+    @DataFilter(tableAlias = "issue", deptId = "grid_id", prefix = "AND")
+    public Result<PageData<IssueWaitHandleOrClosedDTO>> waitHandlePage(@RequestParam Map<String, Object> params){
+        params.put("state", EventIssueItemState.ISSUE_REVIEW_PASS);
+        PageData<IssueWaitHandleOrClosedDTO> page = issueService.listOfIssueWaitHandleOrClosed(params);
+        return new Result<PageData<IssueWaitHandleOrClosedDTO>>().ok(page);
+    }
+
+    /**
+     * 议题管理-已关闭列表
+     * @Params: [params]
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.issue.IssueWaitHandleOrClosedDTO>>
+     * @Author: liuchuang
+     * @Date: 2019/9/5 17:04
+     */
+    @GetMapping("closedPage")
+    @DataFilter(tableAlias = "issue", deptId = "grid_id", prefix = "AND")
+    public Result<PageData<IssueWaitHandleOrClosedDTO>> closedPage(@RequestParam Map<String, Object> params){
+        params.put("state", EventIssueItemState.ISSUE_CLOSED);
+        PageData<IssueWaitHandleOrClosedDTO> page = issueService.listOfIssueWaitHandleOrClosed(params);
+        return new Result<PageData<IssueWaitHandleOrClosedDTO>>().ok(page);
+    }
+
+    /**
+     * 议题管理-已转项目列表
+     * @Params: [params]
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.issue.IssueWaitHandleOrClosedDTO>>
+     * @Author: liuchuang
+     * @Date: 2019/9/5 17:32
+     */
+    @GetMapping("changedToItemPage")
+    @DataFilter(tableAlias = "issue", deptId = "grid_id", prefix = "AND")
+    public Result<PageData<IssueWaitHandleOrClosedDTO>> changedToItemPage(@RequestParam Map<String, Object> params){
+        params.put("state", EventIssueItemState.ISSUE_CHANGE_TO_ITEM);
+        PageData<IssueWaitHandleOrClosedDTO> page = issueService.listOfIssueWaitHandleOrClosed(params);
+        return new Result<PageData<IssueWaitHandleOrClosedDTO>>().ok(page);
     }
 
     @GetMapping("{id}")

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

@@ -18,9 +18,14 @@
 package com.elink.esua.epdc.modules.issue.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.issue.IssueWaitHandleOrClosedDTO;
 import com.elink.esua.epdc.modules.issue.entity.IssueEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+import java.util.Map;
+
+
 /**
  * 议题表 议题表
  *
@@ -29,5 +34,21 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface IssueDao extends BaseDao<IssueEntity> {
+    /**
+     * 议题待处理列表总数
+     * @Params: [startTime, endTime]
+     * @Return: java.util.List<com.elink.esua.epdc.dto.issue.IssueWaitHandleOrClosedDTO>
+     * @Author: liuchuang
+     * @Date: 2019/9/5 15:32
+     */
+    long selectCountOfIssue(Map<String, Object> params);
+    /**
+     * 议题待处理列表
+     * @Params: [startTime, endTime, curPage, pageSize]
+     * @Return: java.util.List<com.elink.esua.epdc.dto.issue.IssueWaitHandleOrClosedDTO>
+     * @Author: liuchuang
+     * @Date: 2019/9/5 14:47
+     */
+    List<IssueWaitHandleOrClosedDTO> selectListOfIssueWaitHandleOrClosed(Map<String, Object> params);
 
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java

@@ -20,6 +20,7 @@ package com.elink.esua.epdc.modules.issue.service;
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.dto.issue.IssueDTO;
+import com.elink.esua.epdc.dto.issue.IssueWaitHandleOrClosedDTO;
 import com.elink.esua.epdc.modules.issue.entity.IssueEntity;
 
 import java.util.List;
@@ -41,7 +42,7 @@ public interface IssueService extends BaseService<IssueEntity> {
      * @author
      * @date
      */
-    PageData<IssueDTO> page(Map<String, Object> params);
+    PageData<IssueWaitHandleOrClosedDTO> listOfIssueWaitHandleOrClosed(Map<String, Object> params);
 
     /**
      * 默认查询

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java

@@ -18,18 +18,16 @@
 package com.elink.esua.epdc.modules.issue.service.impl;
 
 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;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.dto.issue.IssueDTO;
+import com.elink.esua.epdc.dto.issue.IssueWaitHandleOrClosedDTO;
 import com.elink.esua.epdc.modules.issue.dao.IssueDao;
 import com.elink.esua.epdc.modules.issue.entity.IssueEntity;
-import com.elink.esua.epdc.modules.issue.redis.IssueRedis;
 import com.elink.esua.epdc.modules.issue.service.IssueService;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -46,16 +44,11 @@ import java.util.Map;
 @Service
 public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> implements IssueService {
 
-    @Autowired
-    private IssueRedis issueRedis;
-
     @Override
-    public PageData<IssueDTO> page(Map<String, Object> params) {
+    public PageData<IssueWaitHandleOrClosedDTO> listOfIssueWaitHandleOrClosed(Map<String, Object> params) {
-        IPage<IssueEntity> page = baseDao.selectPage(
+        List<IssueWaitHandleOrClosedDTO> list = baseDao.selectListOfIssueWaitHandleOrClosed(params);
-                getPage(params, FieldConstant.CREATED_TIME, false),
+        long total = baseDao.selectCountOfIssue(params);
-                getWrapper(params)
+        return new PageData<>(list, total);
-        );
-        return getPageData(page, IssueDTO.class);
     }
 
     @Override

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

@@ -7,17 +7,19 @@
         <result property="eventContent" column="EVENT_CONTENT"/>
         <result property="nickName" column="NICK_NAME"/>
         <result property="createdTime" column="CREATED_TIME"/>
+        <result property="address" column="ISSUE_ADDRESS"/>
         <collection property="images" ofType="java.lang.String">
             <result property="image" column="IMG_URL"/>
         </collection>
     </resultMap>
-    <select id="getEventDetailById" resultMap="EventDetailMap">
+    <select id="selectOneOfEventDetailById" resultMap="EventDetailMap">
         SELECT
             e.ID,
             e.EVENT_CONTENT,
             i.IMG_URL,
             e.NICK_NAME,
-            e.CREATED_TIME
+            e.CREATED_TIME,
+            e.ISSUE_ADDRESS
         FROM
             epdc_events e
             LEFT JOIN epdc_img i ON e.ID = i.REFERENCE_ID
@@ -28,4 +30,39 @@
         ORDER BY
             i.CREATED_TIME
     </select>
+
+    <select id="selectListOfPendingReviewEvents" resultType="com.elink.esua.epdc.dto.events.EpdcEventsDTO">
+        SELECT
+            temp.id,
+            temp.nick_Name AS nickName,
+            temp.event_content AS eventContent,
+            temp.CREATED_TIME AS createdTime
+        FROM
+            epdc_events temp
+        WHERE
+            temp.DEL_FLAG = '0'
+            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+                AND DATE_FORMAT( temp.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
+            </if>
+            <if test="deptId != null and deptId != ''">
+                AND temp.grid_id = #{deptId}
+            </if>
+            AND temp.EVENT_STATE = 0
+            LIMIT #{curPage}, #{limit}
+    </select>
+
+    <select id="selectCountOfEvents" resultType="long">
+        SELECT
+        count(i.ID) as total
+        FROM
+        epdc_events i
+        WHERE
+        i.DEL_FLAG = '0'
+        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+            AND DATE_FORMAT( i.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
+        </if>
+        <if test="deptId != null and deptId != ''">
+            AND temp.grid_id = #{deptId}
+        </if>
+    </select>
 </mapper>

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

@@ -2,5 +2,46 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.elink.esua.epdc.modules.issue.dao.IssueDao">
-
+    <select id="selectCountOfIssue" resultType="long">
+        SELECT
+        count(issue.ID) as total
+        FROM
+        epdc_issue issue
+        WHERE
+        issue.DEL_FLAG = '0'
+        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+            AND DATE_FORMAT( issue.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
+        </if>
+        <if test="deptId != null and deptId != ''">
+            AND issue.grid_id = #{deptId}
+        </if>
+    </select>
+    <select id="selectListOfIssueWaitHandleOrClosed" resultType="com.elink.esua.epdc.dto.issue.IssueWaitHandleOrClosedDTO">
+        SELECT
+            issue.ID,
+            issue.ISSUE_CONTENT AS issueContent,
+            e.CREATED_TIME AS createdTime,
+            e.NICK_NAME AS nickName,
+            e.APPROVE_NUM AS approveNum,
+            e.OPPOSE_NUM AS opposeNum,
+            e.BROWSE_NUM AS browseNum,
+            e.COMMENT_NUM AS commentNum,
+            ( e.OPPOSE_NUM + e.OPPOSE_NUM + e.BROWSE_NUM + e.COMMENT_NUM ) AS participateNum
+        FROM
+            epdc_issue issue
+            LEFT JOIN epdc_events e ON issue.EVENT_ID = e.ID
+            AND e.DEL_FLAG = '0'
+        WHERE
+            issue.DEL_FLAG = '0'
+            and issue.ISSUE_STATE = #{state}
+            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+                AND DATE_FORMAT( issue.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
+            </if>
+            <if test="deptId != null and deptId != ''">
+                AND issue.grid_id = #{deptId}
+            </if>
+        ORDER BY
+            issue.CREATED_TIME DESC
+            LIMIT #{curPage}, #{limit}
+    </select>
 </mapper>