修改屏蔽评论操作

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

@@ -50,6 +50,10 @@ public class EpdcEventsCommentsDTO implements Serializable {
      * 用户信息
      */
     private UserBaseInfoDto user;
+    /**
+     * 屏蔽标识 0：未屏蔽，1：已屏蔽
+     */
+    private String shieldFlag;
     /**
      * 回复评论信息
      */

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/entity/EventCommentEntity.java

@@ -103,4 +103,9 @@ public class EventCommentEntity extends BaseEpdcEntity {
      */
 	private Integer unLikeCount;
 
+	/**
+	 * 屏蔽标识 0：未屏蔽，1：已屏蔽
+	 */
+	private String shieldFlag;
+
 }

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

@@ -83,7 +83,7 @@ public interface IssueDao extends BaseDao<IssueEntity> {
      * @Author: liuchuang
      * @Date: 2019/9/7 10:26
      */
-    void updateCommentDelFlag(@Param("commentIds") String[] commentIds);
+    void updateCommentShieldFlag(@Param("commentIds") String[] commentIds);
 
     /**
      * 移动端-议题最新最热列表

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

@@ -244,7 +244,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result modifyCommentById(String[] commentIds) {
-        baseDao.updateCommentDelFlag(commentIds);
+        baseDao.updateCommentShieldFlag(commentIds);
         return new Result();
     }
 

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

@@ -93,6 +93,7 @@
             </if>
             WHERE
                 t1.DEL_FLAG = '0'
+                AND t1.SHIELD_FLAG = '0'
                 <![CDATA[ AND DATE_FORMAT(t1.CREATED_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}
                 AND t1.EVENT_ID = #{eventId}
             ORDER BY
@@ -169,6 +170,7 @@
             epdc_event_comment
         WHERE
             DEL_FLAG = '0'
+            AND SHIELD_FLAG = '0'
             AND EVENT_ID = #{eventId}
         ORDER BY
             statementNum DESC,

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

@@ -120,6 +120,7 @@
         <result property="commentId" column="ID"/>
         <result property="content" column="CONTENT"/>
         <result property="commentTime" column="CREATED_TIME"/>
+        <result property="shieldFlag" column="SHIELD_FLAG"/>
         <result property="user.userId" column="USER_ID"/>
         <result property="user.userName" column="USER_NAME"/>
         <result property="user.userFace" column="USER_FACE"/>
@@ -135,6 +136,7 @@
             t2.USER_ID,
             t2.USER_FACE,
             t2.USER_NAME,
+            t2.SHIELD_FLAG,
             t3.ID AS replyId,
             t3.USER_NAME AS replyUserName,
             t3.CONTENT AS replyContent
@@ -147,7 +149,8 @@
                 t1.CREATED_TIME,
                 t1.USER_ID,
                 t1.USER_FACE,
-                t1.USER_NAME
+                t1.USER_NAME,
+                t1.SHIELD_FLAG
             FROM
                 epdc_event_comment t1
             WHERE

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

@@ -146,8 +146,8 @@
             createdTime DESC
     </select>
 
-    <update id="updateCommentDelFlag">
-        UPDATE epdc_event_comment SET DEL_FLAG = '1' WHERE ID IN
+    <update id="updateCommentShieldFlag">
+        UPDATE epdc_event_comment SET SHIELD_FLAG = '1' WHERE ID IN
         <foreach collection="commentIds" item="commentId" index="no" open="("
                  separator="," close=")">
             #{commentId}