移动端我的议题详情接口 init

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java

@@ -4,6 +4,7 @@ import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO;
+import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO;
 import com.elink.esua.epdc.dto.issue.form.IssueFormDTO;
 import com.elink.esua.epdc.dto.issue.form.IssuesAndEventsOfMineFormDTO;
 import com.elink.esua.epdc.dto.issue.form.StatementFormDTO;
@@ -145,5 +146,16 @@ public class ApiIssueController {
         return issueService.listIssuesAndEventsOfMine(userDetail, formDTO);
     }
 
+    /**
+     * 事件详情
+     * @Params: [eventId]
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO>
+     * @Author: liuchuang
+     * @Date: 2019/9/17 17:36
+     */
+    @GetMapping("eventDetail/{eventId}")
+    public Result<EventAppDetailResultDTO> eventDetail(@PathVariable String eventId) {
+        return issueService.getEventDetail(eventId);
+    }
 
 }

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

@@ -0,0 +1,40 @@
+package com.elink.esua.epdc.dto.events.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 待审核或审核不通过事件详情
+ * @Author LC
+ * @Date 2019/9/17 17:28
+ */
+@Data
+public class EventAppDetailResultDTO implements Serializable {
+    private static final long serialVersionUID = 1171586248033198322L;
+    /**
+     * 事件ID
+     */
+    private String id;
+    /**
+     * 事件内容
+     */
+    private String content;
+    /**
+     * 发布时间
+     */
+    private String distributeTime;
+    /**
+     * 图片
+     */
+    private List<String> images;
+    /**
+     * 事件地址
+     */
+    private String address;
+    /**
+     * 审核不通过意见
+     */
+    private String advice;
+}

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

@@ -19,6 +19,7 @@ package com.elink.esua.epdc.modules.events.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.dto.events.*;
+import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO;
 import com.elink.esua.epdc.modules.events.entity.EpdcEventsEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -112,4 +113,13 @@ public interface EpdcEventsDao extends BaseDao<EpdcEventsEntity> {
      * @param eventId
      */
     void updateOpposeNumSubtract(String eventId);
+
+    /**
+     * 移动端-事件详情
+     * @Params: [eventId]
+     * @Return: com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO
+     * @Author: liuchuang
+     * @Date: 2019/9/17 17:44
+     */
+    EventAppDetailResultDTO selectOneOfEventDetail(String eventId);
 }

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

@@ -23,6 +23,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.events.*;
 import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO;
 import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO;
+import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO;
 import com.elink.esua.epdc.modules.events.entity.EpdcEventsEntity;
 
 import java.util.List;
@@ -146,4 +147,13 @@ public interface EpdcEventsService extends BaseService<EpdcEventsEntity> {
      * @Date: 2019/9/9 11:57
      */
     boolean modifyBrowseNumById(String eventId);
+
+    /**
+     * 移动端-事件详情
+     * @Params: [eventId]
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO>
+     * @Author: liuchuang
+     * @Date: 2019/9/17 17:36
+     */
+    Result<EventAppDetailResultDTO> getEventDetail(String eventId);
 }

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

@@ -30,6 +30,7 @@ import com.elink.esua.epdc.constant.ImageConstant;
 import com.elink.esua.epdc.dto.events.*;
 import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO;
 import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO;
+import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO;
 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.service.EpdcEventsService;
@@ -196,6 +197,12 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
         return this.updateById(epdcEventsEntity);
     }
 
+    @Override
+    public Result<EventAppDetailResultDTO> getEventDetail(String eventId) {
+        EventAppDetailResultDTO data = baseDao.selectOneOfEventDetail(eventId);
+        return new Result<EventAppDetailResultDTO>().ok(data);
+    }
+
     /**
      * 初始化议题
      * @Params: [entity]

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

@@ -3,6 +3,7 @@ package com.elink.esua.epdc.modules.issue.controller;
 import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO;
 import com.elink.esua.epdc.dto.issue.form.*;
 import com.elink.esua.epdc.dto.issue.result.*;
 import com.elink.esua.epdc.modules.issue.service.EventUserAttitudeService;
@@ -102,4 +103,16 @@ public class EpdcAppIssueController {
         ValidatorUtils.validateEntity(formDTO);
         return issueService.listIssuesAndEventsOfMine(formDTO);
     }
+
+    /**
+     * 事件详情
+     * @Params: [eventId]
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO>
+     * @Author: liuchuang
+     * @Date: 2019/9/17 17:40
+     */
+    @GetMapping("eventDetail/{eventId}")
+    public Result<EventAppDetailResultDTO> eventDetail(@PathVariable String eventId) {
+        return issueService.getEventDetail(eventId);
+    }
 }

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

@@ -198,4 +198,31 @@
         WHERE ID = #{eventId}
     </update>
 
+    <resultMap id="eventDetailResultMap" type="com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO">
+        <result property="id" column="ID"/>
+        <result property="content" column="EVENT_CONTENT"/>
+        <result property="distributeTime" column="CREATED_TIME"/>
+        <result property="address" column="ISSUE_ADDRESS"/>
+        <result property="advice" column="ADVICE"/>
+        <collection property="images" ofType="java.lang.String">
+            <result property="image" column="IMG_URL"/>
+        </collection>
+    </resultMap>
+    <select id="selectOneOfEventDetail" resultMap="eventDetailResultMap">
+        SELECT
+            eve.ID,
+            eve.EVENT_CONTENT,
+            eve.CREATED_TIME,
+            eve.ISSUE_ADDRESS,
+            eve.ADVICE,
+            img.IMG_URL
+        FROM
+            epdc_events eve
+            LEFT JOIN epdc_img img ON eve.ID = img.REFERENCE_ID
+            AND img.DEL_FLAG = '0'
+        WHERE
+            eve.DEL_FLAG = '0'
+            AND eve.ID = #{eventId}
+    </select>
+
 </mapper>