议题已驳回事件列表和详情数据 init

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

@@ -0,0 +1,49 @@
+package com.elink.esua.epdc.dto.events;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 已关闭事件详情DTO
+ * @Author LC
+ * @Date 2019/9/6 14:40
+ */
+@Data
+public class EpdcRejectEventDetailDTO implements Serializable {
+    private static final long serialVersionUID = 1859147277434313829L;
+    /**
+     * 事件ID
+     */
+    private String id;
+    /**
+     * 事件内容
+     */
+    private String eventContent;
+    /**
+     * 提交人
+     */
+    private String nickName;
+    /**
+     * 提交事件
+     */
+    private Date createdTime;
+    /**
+     * 事件地址
+     */
+    private String address;
+    /**
+     * 事件状态
+     */
+    private String stateName;
+    /**
+     * 驳回意见
+     */
+    private String advice;
+    /**
+     * 事件图片
+     */
+    private List<String> images;
+}

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

@@ -0,0 +1,30 @@
+package com.elink.esua.epdc.dto.events;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author LC
+ * @Date 2019/9/6 15:01
+ */
+@Data
+public class EpdcRejectEventsDTO implements Serializable {
+    private static final long serialVersionUID = 6690317385292584525L;
+    /**
+     * 事件ID
+     */
+    private String id;
+    /**
+     * 提交人
+     */
+    private String nickName;
+    /**
+     * 提交时间
+     */
+    private String createdTime;
+    /**
+     * 时间内容
+     */
+    private String eventContent;
+}

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

@@ -26,6 +26,8 @@ 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.dto.events.EpdcRejectEventDetailDTO;
+import com.elink.esua.epdc.dto.events.EpdcRejectEventsDTO;
 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;
@@ -114,4 +116,31 @@ public class EpdcEventsController {
         return epdcEventsService.eventReview(dto);
     }
 
+    /**
+     * 已驳回事件列表
+     * @Params: [params]
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.events.EpdcRejectEventsDTO>>
+     * @Author: liuchuang
+     * @Date: 2019/9/6 15:11
+     */
+    @GetMapping("rejectEvents")
+    @DataFilter(tableAlias = "temp", deptId = "grid_id", prefix = "AND", isPendingCreator = false)
+    public Result<PageData<EpdcRejectEventsDTO>> rejectEvents(@RequestParam Map<String, Object> params){
+        PageData<EpdcRejectEventsDTO> page = epdcEventsService.listOfRejectEvents(params);
+        return new Result<PageData<EpdcRejectEventsDTO>>().ok(page);
+    }
+
+    /**
+     * 已驳回事件详情
+     * @Params: [id]
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.events.EpdcRejectEventDetailDTO>
+     * @Author: liuchuang
+     * @Date: 2019/9/6 14:51
+     */
+    @GetMapping("rejectEventDetail/{id}")
+    public Result<EpdcRejectEventDetailDTO> rejectEventDetail(@PathVariable("id") String id) {
+        EpdcRejectEventDetailDTO data = epdcEventsService.getRejectEventDetail(id);
+        return new Result<EpdcRejectEventDetailDTO>().ok(data);
+    }
+
 }

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

@@ -18,6 +18,8 @@
 package com.elink.esua.epdc.modules.events.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.events.EpdcRejectEventDetailDTO;
+import com.elink.esua.epdc.dto.events.EpdcRejectEventsDTO;
 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;
@@ -51,4 +53,20 @@ public interface EpdcEventsDao extends BaseDao<EpdcEventsEntity> {
      * @Date: 2019/9/5 19:42
      */
     List<EpdcEventsDTO> selectListOfPendingReviewEvents(Map<String, Object> params);
+    /**
+     * 已驳回事件列表
+     * @Params: []
+     * @Return: java.util.List<com.elink.esua.epdc.dto.events.EpdcRejectEventsDTO>
+     * @Author: liuchuang
+     * @Date: 2019/9/6 15:04
+     */
+    List<EpdcRejectEventsDTO> selectListOfRejectEvents(Map<String, Object> params);
+    /**
+     * 已驳回事件详情
+     * @Params: []
+     * @Return: com.elink.esua.epdc.dto.events.EpdcRejectEventDetailDTO
+     * @Author: liuchuang
+     * @Date: 2019/9/6 14:46
+     */
+    EpdcRejectEventDetailDTO selectOneOfRejectEventDetail(@Param("id") String id);
 }

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

@@ -20,6 +20,8 @@ package com.elink.esua.epdc.modules.events.service;
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.events.EpdcRejectEventDetailDTO;
+import com.elink.esua.epdc.dto.events.EpdcRejectEventsDTO;
 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;
@@ -70,4 +72,22 @@ public interface EpdcEventsService extends BaseService<EpdcEventsEntity> {
      * @Date: 2019/9/5 9:35
      */
     Result eventReview(EpdcEventsReviewFormDTO dto);
+
+    /**
+     * 已驳回事件列表
+     * @Params: [params]
+     * @Return: com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.events.EpdcRejectEventsDTO>
+     * @Author: liuchuang
+     * @Date: 2019/9/6 15:08
+     */
+    PageData<EpdcRejectEventsDTO> listOfRejectEvents(Map<String, Object> params);
+
+    /**
+     * 已驳回事件详情
+     * @Params: []
+     * @Return: com.elink.esua.epdc.dto.events.EpdcRejectEventDetailDTO
+     * @Author: liuchuang
+     * @Date: 2019/9/6 14:49
+     */
+    EpdcRejectEventDetailDTO getRejectEventDetail(String id);
 }

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

@@ -19,26 +19,24 @@ package com.elink.esua.epdc.modules.events.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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;
 import com.elink.esua.epdc.constant.EventIssueItemState;
+import com.elink.esua.epdc.dto.events.EpdcRejectEventDetailDTO;
+import com.elink.esua.epdc.dto.events.EpdcRejectEventsDTO;
 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;
 import com.elink.esua.epdc.modules.events.dao.EpdcEventsDao;
 import com.elink.esua.epdc.modules.events.entity.EpdcEventsEntity;
-import com.elink.esua.epdc.modules.events.redis.EpdcEventsRedis;
 import com.elink.esua.epdc.modules.events.service.EpdcEventsService;
 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;
@@ -143,6 +141,18 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
         return new Result();
     }
 
+    @Override
+    public PageData<EpdcRejectEventsDTO> listOfRejectEvents(Map<String, Object> params) {
+        IPage<EpdcRejectEventsDTO> page = getPage(params);
+        List<EpdcRejectEventsDTO> list = baseDao.selectListOfRejectEvents(params);
+        return new PageData<>(list, page.getTotal());
+    }
+
+    @Override
+    public EpdcRejectEventDetailDTO getRejectEventDetail(String id) {
+        return baseDao.selectOneOfRejectEventDetail(id);
+    }
+
     /**
      * 初始化议题
      * @Params: [entity]

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

@@ -64,7 +64,6 @@ public class IssueController {
     @GetMapping("page")
     @DataFilter(tableAlias = "issue", deptId = "grid_id", prefix = "AND", isPendingCreator = false)
     public Result<PageData<IssueWaitHandleOrClosedDTO>> waitHandlePage(@RequestParam Map<String, Object> params){
-        params.put("state", EventIssueItemState.ISSUE_REVIEW_PASS);
         PageData<IssueWaitHandleOrClosedDTO> page = issueService.listOfIssues(params);
         return new Result<PageData<IssueWaitHandleOrClosedDTO>>().ok(page);
     }

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

@@ -2,7 +2,7 @@
 <!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.events.dao.EpdcEventsDao">
-    <resultMap id="EventDetailMap" type="com.elink.esua.epdc.dto.events.EpdcEventsDetailDTO">
+    <resultMap id="eventDetailMap" type="com.elink.esua.epdc.dto.events.EpdcEventsDetailDTO">
         <result property="id" column="ID"/>
         <result property="eventContent" column="EVENT_CONTENT"/>
         <result property="nickName" column="NICK_NAME"/>
@@ -12,7 +12,7 @@
             <result property="image" column="IMG_URL"/>
         </collection>
     </resultMap>
-    <select id="selectOneOfEventDetailById" resultMap="EventDetailMap">
+    <select id="selectOneOfEventDetailById" resultMap="eventDetailMap">
         SELECT
             e.ID,
             e.EVENT_CONTENT,
@@ -49,4 +49,51 @@
             </if>
             AND temp.EVENT_STATE = 0
     </select>
+
+    <select id="selectListOfRejectEvents" resultType="com.elink.esua.epdc.dto.events.EpdcRejectEventsDTO">
+        SELECT
+            temp.ID AS id,
+            temp.NICK_NAME AS nickName,
+            temp.CREATED_TIME AS createdTime,
+            temp.EVENT_CONTENT AS eventContent
+        FROM
+            epdc_events temp
+        WHERE
+            temp.DEL_FLAG = '0'
+            AND temp.EVENT_STATE = 2
+        ORDER BY
+            temp.CREATED_TIME DESC
+    </select>
+
+    <resultMap id="rejectEventDetailMap" type="com.elink.esua.epdc.dto.events.EpdcRejectEventDetailDTO">
+        <result property="id" column="ID"/>
+        <result property="eventContent" column="EVENT_CONTENT"/>
+        <result property="nickName" column="NICK_NAME"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="address" column="ISSUE_ADDRESS"/>
+        <result property="stateName" column="STATE_NAME"/>
+        <result property="advice" column="ADVICE"/>
+        <collection property="images" ofType="java.lang.String">
+            <result property="image" column="IMG_URL"/>
+        </collection>
+    </resultMap>
+    <select id="selectOneOfRejectEventDetail" resultMap="rejectEventDetailMap">
+        SELECT
+            temp.ID,
+            temp.NICK_NAME,
+            temp.CREATED_TIME,
+            temp.EVENT_CONTENT,
+            temp.ISSUE_ADDRESS,
+            '已驳回' AS STATE_NAME,
+            temp.ADVICE,
+            img.IMG_URL
+        FROM
+            epdc_events temp
+            LEFT JOIN epdc_img img ON temp.ID = img.REFERENCE_ID
+            AND img.DEL_FLAG = '0'
+        WHERE
+            temp.DEL_FLAG = '0'
+            AND temp.id = #{id}
+        ORDER BY img.CREATED_TIME
+    </select>
 </mapper>