评论的回复列表

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

@@ -4,6 +4,8 @@ package com.elink.esua.epdc.controller;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.dto.category.EventCategoryDTO;
+import com.elink.esua.epdc.dto.comment.form.WorkCommentReplyFormDTO;
+import com.elink.esua.epdc.dto.comment.result.WorkEventsCommentsDTO;
 import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO;
 import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO;
 import com.elink.esua.epdc.dto.issue.form.*;
@@ -121,4 +123,13 @@ public class ApiWorkIssueController {
         ValidatorUtils.validateEntity(dto);
         return workIssueService.handleSubmit(dto);
     }
+
+    /**
+     *
+     * 事件评论回复列表接口
+     */
+    @GetMapping("event/commentReplyList")
+    public Result<WorkEventsCommentsDTO> commentReplyList(WorkCommentReplyFormDTO workCommentReplyFormDTO){
+        return workIssueService.commentReplyList(workCommentReplyFormDTO);
+    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkIssueFeignClient.java

@@ -3,6 +3,8 @@ package com.elink.esua.epdc.feign;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.category.EventCategoryDTO;
+import com.elink.esua.epdc.dto.comment.form.WorkCommentReplyFormDTO;
+import com.elink.esua.epdc.dto.comment.result.WorkEventsCommentsDTO;
 import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO;
 import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO;
 import com.elink.esua.epdc.dto.issue.form.*;
@@ -105,4 +107,12 @@ public interface WorkIssueFeignClient {
      */
     @PostMapping(value = "events/epdc-app/work/issue/handleSubmit", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result handleSubmit(IssueWaitHandleSubmitFormDTO dto);
+
+    /**
+     * 工作端-事件评论回复列表接口
+     * @param workCommentReplyFormDTO
+     * @return
+     */
+    @GetMapping(value = "events/epdc-app/comment/commentReplyList", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<WorkEventsCommentsDTO> commentReplyList(WorkCommentReplyFormDTO workCommentReplyFormDTO);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkIssueFeignClientFallback.java

@@ -4,6 +4,8 @@ import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.category.EventCategoryDTO;
+import com.elink.esua.epdc.dto.comment.form.WorkCommentReplyFormDTO;
+import com.elink.esua.epdc.dto.comment.result.WorkEventsCommentsDTO;
 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;
@@ -71,4 +73,9 @@ public class WorkIssueFeignClientFallback implements WorkIssueFeignClient {
     public Result handleSubmit(IssueWaitHandleSubmitFormDTO dto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "handleSubmit", dto);
     }
+
+    @Override
+    public Result<WorkEventsCommentsDTO> commentReplyList(WorkCommentReplyFormDTO workCommentReplyFormDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "commentReplyList", workCommentReplyFormDTO);
+    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkIssueService.java

@@ -20,6 +20,8 @@ package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.category.EventCategoryDTO;
+import com.elink.esua.epdc.dto.comment.form.WorkCommentReplyFormDTO;
+import com.elink.esua.epdc.dto.comment.result.WorkEventsCommentsDTO;
 import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO;
 import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO;
 import com.elink.esua.epdc.dto.issue.form.*;
@@ -100,4 +102,13 @@ public interface WorkIssueService {
      * @return
      */
     Result handleSubmit(IssueWaitHandleSubmitFormDTO dto);
+
+    /**
+     * 事件评论回复列表接口
+     * @param workCommentReplyFormDTO
+     * @return
+     */
+    Result<WorkEventsCommentsDTO> commentReplyList(WorkCommentReplyFormDTO workCommentReplyFormDTO);
+
+
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkIssueServiceImpl.java

@@ -19,6 +19,8 @@ package com.elink.esua.epdc.service.impl;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.category.EventCategoryDTO;
+import com.elink.esua.epdc.dto.comment.form.WorkCommentReplyFormDTO;
+import com.elink.esua.epdc.dto.comment.result.WorkEventsCommentsDTO;
 import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO;
 import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO;
 import com.elink.esua.epdc.dto.issue.form.*;
@@ -137,4 +139,14 @@ public class WorkIssueServiceImpl implements WorkIssueService {
     public Result handleSubmit(IssueWaitHandleSubmitFormDTO dto) {
         return workIssueFeignClient.handleSubmit(dto);
     }
+
+    /**
+     * 事件评论回复列表接口
+     * @param workCommentReplyFormDTO
+     * @return
+     */
+    @Override
+    public Result<WorkEventsCommentsDTO> commentReplyList(WorkCommentReplyFormDTO workCommentReplyFormDTO) {
+        return workIssueFeignClient.commentReplyList(workCommentReplyFormDTO);
+    }
 }

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/form/WorkCommentReplyFormDTO.java

@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.dto.comment.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+
+/**
+ * 事件评论回复列表接口
+ *
+ */
+@Data
+public class WorkCommentReplyFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String commentId;
+
+}

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

@@ -0,0 +1,34 @@
+package com.elink.esua.epdc.dto.comment.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 事件评论DTO
+ * @Author LC
+ * @Date 2019/9/6 17:20
+ */
+@Data
+public class WorkEventsCommentsDTO implements Serializable {
+    private static final long serialVersionUID = 2112619345374657409L;
+
+    private String userName;
+
+    private String userFace;
+
+    private Date createdTime;
+
+    private String content;
+
+    private String likeCount;
+
+    private String unLikeCount;
+
+    /**
+     * 回复评论信息
+     */
+    private List<WorkReplyCommentDTO> replies;
+}

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

@@ -0,0 +1,25 @@
+package com.elink.esua.epdc.dto.comment.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 被回复的评论
+ * @Author LC
+ * @Date 2019/9/6 17:25
+ */
+@Data
+public class WorkReplyCommentDTO implements Serializable {
+    private static final long serialVersionUID = 3501567846629315395L;
+
+
+    private String replyUserName;
+
+    private String replyUserFace;
+
+    private Date createdTime;
+
+    private String content;
+}

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

@@ -54,6 +54,14 @@ public class EpdcEventsDetailDTO implements Serializable {
      * 事件地址
      */
     private String address;
+    /**
+     * 图片
+     */
+    private List<String> handleResidentImages;
+    /**
+     * 事件地址
+     */
+    private String advice;
     /**
      * 纬度
      */

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

@@ -23,7 +23,9 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.dto.comment.CommentStatementFormDTO;
 import com.elink.esua.epdc.dto.comment.form.CommentFormDTO;
 import com.elink.esua.epdc.dto.comment.form.EventCommentsFormDTO;
+import com.elink.esua.epdc.dto.comment.form.WorkCommentReplyFormDTO;
 import com.elink.esua.epdc.dto.comment.result.EventCommentsResultDTO;
+import com.elink.esua.epdc.dto.comment.result.WorkEventsCommentsDTO;
 import com.elink.esua.epdc.dto.issue.form.WorkEventCommentListFormDTO;
 import com.elink.esua.epdc.dto.issue.result.WorkEventCommentResultDTO;
 import com.elink.esua.epdc.modules.comment.service.EventCommentService;
@@ -87,4 +89,13 @@ public class AppEventCommentController {
     public Result<List<WorkEventCommentResultDTO>> commentList(@RequestBody WorkEventCommentListFormDTO formDTO){
         return eventCommentService.selectWorkHotOrNewEventComment(formDTO);
     }
+
+    /**
+     *
+     * 事件评论回复列表接口
+     */
+    @GetMapping("commentReplyList")
+    public Result<WorkEventsCommentsDTO> commentReplyList(WorkCommentReplyFormDTO workCommentReplyFormDTO){
+        return eventCommentService.commentReplyList(workCommentReplyFormDTO);
+    }
 }

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

@@ -18,7 +18,10 @@
 package com.elink.esua.epdc.modules.comment.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.comment.form.EventCommentsFormDTO;
+import com.elink.esua.epdc.dto.comment.form.WorkCommentReplyFormDTO;
+import com.elink.esua.epdc.dto.comment.result.WorkEventsCommentsDTO;
 import com.elink.esua.epdc.dto.events.EpdcEventsCommentsDTO;
 import com.elink.esua.epdc.dto.issue.form.WorkEventCommentListFormDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueHotCommentResultDTO;
@@ -103,4 +106,10 @@ public interface EventCommentDao extends BaseDao<EventCommentEntity> {
     List<WorkEventCommentResultDTO> selectWorkHotOrNewEventComment(WorkEventCommentListFormDTO formDTO);
 
 
+    /**
+     * 工作端-事件评论回复列表接口
+     * @param workCommentReplyFormDTO
+     * @return
+     */
+    WorkEventsCommentsDTO commentReplyList(WorkCommentReplyFormDTO workCommentReplyFormDTO);
 }

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

@@ -24,7 +24,9 @@ import com.elink.esua.epdc.dto.comment.EpdcCommentsAndAttitudeFromTopicFormDTO;
 import com.elink.esua.epdc.dto.comment.EventCommentDTO;
 import com.elink.esua.epdc.dto.comment.form.CommentFormDTO;
 import com.elink.esua.epdc.dto.comment.form.EventCommentsFormDTO;
+import com.elink.esua.epdc.dto.comment.form.WorkCommentReplyFormDTO;
 import com.elink.esua.epdc.dto.comment.result.EventCommentsResultDTO;
+import com.elink.esua.epdc.dto.comment.result.WorkEventsCommentsDTO;
 import com.elink.esua.epdc.dto.issue.form.WorkEventCommentListFormDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueHotCommentResultDTO;
 import com.elink.esua.epdc.dto.issue.result.WorkEventCommentResultDTO;
@@ -170,4 +172,12 @@ public interface EventCommentService extends BaseService<EventCommentEntity> {
      * @return
      */
     Result<List<WorkEventCommentResultDTO>> selectWorkHotOrNewEventComment(WorkEventCommentListFormDTO formDTO);
+
+
+    /**
+     * 工作端-事件评论回复列表接口
+     * @param workCommentReplyFormDTO
+     * @return
+     */
+    Result<WorkEventsCommentsDTO> commentReplyList(WorkCommentReplyFormDTO workCommentReplyFormDTO);
 }

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

@@ -31,7 +31,9 @@ import com.elink.esua.epdc.dto.comment.EventCommentDTO;
 import com.elink.esua.epdc.dto.comment.EventCommentUserAttitudeDTO;
 import com.elink.esua.epdc.dto.comment.form.CommentFormDTO;
 import com.elink.esua.epdc.dto.comment.form.EventCommentsFormDTO;
+import com.elink.esua.epdc.dto.comment.form.WorkCommentReplyFormDTO;
 import com.elink.esua.epdc.dto.comment.result.EventCommentsResultDTO;
+import com.elink.esua.epdc.dto.comment.result.WorkEventsCommentsDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
 import com.elink.esua.epdc.dto.events.EpdcEventsCommentsDTO;
 import com.elink.esua.epdc.dto.issue.form.WorkEventCommentListFormDTO;
@@ -357,4 +359,16 @@ public class EventCommentServiceImpl extends BaseServiceImpl<EventCommentDao, Ev
         List<WorkEventCommentResultDTO> list = baseDao.selectWorkHotOrNewEventComment(formDTO);
         return new Result<List<WorkEventCommentResultDTO>>().ok(list);
     }
+
+    /**
+     * 工作端-事件评论回复列表接口
+     * @param workCommentReplyFormDTO
+     * @return
+     */
+    @Override
+    public Result<WorkEventsCommentsDTO> commentReplyList(WorkCommentReplyFormDTO workCommentReplyFormDTO) {
+        WorkEventsCommentsDTO workEventsCommentsDTO = baseDao.commentReplyList(workCommentReplyFormDTO);
+        return new Result<WorkEventsCommentsDTO>().ok(workEventsCommentsDTO);
+
+    }
 }

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

@@ -195,6 +195,6 @@ public interface EpdcEventsService extends BaseService<EpdcEventsEntity> {
      * @param formDto
      * @return
      */
-    Result<List<IssuePendingResponseResultDTO>> listIssuePendingResponse(@RequestBody IssuePendingResponseFormDTO formDto);
+    Result<List<IssuePendingResponseResultDTO>> listIssuePendingResponse(IssuePendingResponseFormDTO formDto);
 
 }

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

@@ -219,14 +219,14 @@ public interface IssueService extends BaseService<IssueEntity> {
      * @param formDto
      * @return
      */
-    Result<IssueStateStatisticsResultDTO> stateStatistics(@RequestBody IssueStateStatisticsFormDTO formDto);
+    Result<IssueStateStatisticsResultDTO> stateStatistics(IssueStateStatisticsFormDTO formDto);
 
     /**
      * 工作端-待回应列表
      * @param formDto
      * @return
      */
-    Result<List<IssuePendingResponseResultDTO>> listIssuePendingResponse(@RequestBody IssuePendingResponseFormDTO formDto);
+    Result<List<IssuePendingResponseResultDTO>> listIssuePendingResponse(IssuePendingResponseFormDTO formDto);
 
     /**
      * 工作端-议题待处理或者已关闭的最新最热列表

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

@@ -205,4 +205,42 @@
         LIMIT #{pageIndex},#{pageSize}
     </select>
 
+    <resultMap id="workCommentReplyListMap" type="com.elink.esua.epdc.dto.comment.result.WorkEventsCommentsDTO">
+        <result property="userName" column="USER_NAME"/>
+        <result property="userFace" column="USER_FACE"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="content" column="CONTENT"/>
+        <result property="likeCount" column="LIKE_COUNT"/>
+        <result property="unLikeCount" column="UN_LIKE_COUNT"/>
+        <collection property="replies" ofType="com.elink.esua.epdc.dto.comment.result.WorkReplyCommentDTO">
+            <result property="replyUserName" column="replyUserName"/>
+            <result property="replyUserFace" column="replyUserFace"/>
+            <result property="createdTime" column="createdTime"/>
+            <result property="content" column="content"/>
+        </collection>
+    </resultMap>
+
+    <select id="commentReplyList" resultMap="workCommentReplyListMap">
+        SELECT
+        com.USER_NAME,
+        com.USER_FACE,
+        com.CREATED_TIME,
+        com.CONTENT,
+        com.LIKE_COUNT,
+        com.UN_LIKE_COUNT,
+        rep.USER_NAME AS replyUserName,
+        rep.USER_FACE AS replyUserFace,
+        rep.CREATED_TIME AS createdTime,
+        rep.CONTENT AS content
+        FROM
+        epdc_event_comment com
+        LEFT JOIN epdc_event_comment rep ON com.ID = rep.COMMENT_ID
+        AND rep.COMMENT_TYPE = '1'
+        AND rep.SHIELD_FLAG = '0'
+        AND rep.DEL_FLAG = '0'
+        WHERE
+        com.DEL_FLAG = '0'
+        AND com.ID = #{commentId}
+    </select>
+
 </mapper>

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

@@ -18,6 +18,9 @@
         <collection property="imageArray" ofType="java.lang.String">
             <result property="image" column="IMG_URL"/>
         </collection>
+        <collection property="handleResidentImages" ofType="java.lang.String">
+            <result property="image" column="IIMG_URL"/>
+        </collection>
     </resultMap>
     <select id="selectOneOfEventDetailById" resultMap="eventDetailMap">
         SELECT
@@ -26,17 +29,22 @@
             e.USER_FACE,
             e.IS_PARTY_MEMBER,
             i.IMG_URL,
+            ii.IMG_URL as IIMG_URL,
             e.NICK_NAME,
             e.MOBILE,
             e.CREATED_TIME,
             e.ISSUE_ADDRESS,
             e.ISSUE_LATITUDE,
             e.ISSUE_LONGITUDE,
+            e.ADVICE,
             CONCAT(e.AREA,e.STREET,e.COMMUNITY,e.GRID) AS ownGrid
         FROM
             epdc_events e
             LEFT JOIN epdc_img i ON e.ID = i.REFERENCE_ID
             AND i.DEL_FLAG = '0'
+            LEFT JOIN epdc_img ii ON e.ID = ii.REFERENCE_ID
+            AND ii.DEL_FLAG = '0'
+            AND ii.IMG_TYPE = 'eventsReject'
         WHERE
             e.DEL_FLAG = '0'
             AND e.ID = #{id}
@@ -287,6 +295,7 @@
         <if test="formDto.timestamp != null">
             <![CDATA[ AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}
         </if>
+        order by CREATED_TIME
         LIMIT #{pageIndex},#{pageSize}
     </select>
 

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

@@ -536,12 +536,15 @@
                     #{id}
                 </foreach>
                 <![CDATA[ AND DATE_FORMAT(t1.DISTRIBUTE_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}
+                ORDER BY
+                <if test='orderType == "1"'>( t2.APPROVE_NUM + t2.OPPOSE_NUM + t2.COMMENT_NUM + t2.BROWSE_NUM ) DESC,</if>
+                issue.DISTRIBUTE_TIME DESC
                 LIMIT #{pageIndex},#{pageSize}
             ) temp
         )
         ORDER BY
-        <if test='orderType == "1"'>statementNum DESC</if>
+        <if test='orderType == "1"'>statementNum DESC,</if>
-        <if test='orderType == "0"'>issue.DISTRIBUTE_TIME DESC</if>
+        issue.DISTRIBUTE_TIME DESC
     </select>