Merge remote-tracking branch 'origin/develop' into develop

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/UserMentionResultDTO.java

@@ -52,4 +52,10 @@ public class UserMentionResultDTO implements Serializable {
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date showTime;
+
+    /**
+     * true:显示回复；false：不显示回复按钮
+     */
+    private String replyButtonFlag;
+
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventMentionDao.java

@@ -65,4 +65,6 @@ public interface ResiEventMentionDao extends BaseDao<ResiEventMentionEntity> {
      * @date 2021/8/4 17:41
      */
     int updateRedDotShow(@Param("resiEventId") String resiEventId,@Param("excludeUserId")String excludeUserId);
+
+    ResiEventMentionEntity selectUser(@Param("eventId") String eventId, @Param("userId")String userId);
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java

@@ -120,8 +120,9 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
         if (null == eventEntity) {
             throw new RenException(String.format("没有找到事件记录,eventId:%s",formDTO.getEventId()));
         }
-        if(formDTO.getUserId().equals(eventEntity.getReportUserId())){
-            log.warn("报事人查看详情不需要调用此接口");
+        ResiEventMentionEntity resiEventMentionEntity=resiEventMentionDao.selectUser(formDTO.getEventId(),formDTO.getUserId());
+        if (formDTO.getUserId().equals(eventEntity.getReportUserId()) && null == resiEventMentionEntity) {
+            log.warn("报事人查看详情不需要调用此接口,如果既是报事人又是人大代表，自己艾特了自己，需要更新为已读");
             return;
         }
         // 这个事件已经被查看了
@@ -506,6 +507,14 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
         PageInfo<UserMentionResultDTO> result = PageHelper.startPage(formDTO.getPageNo(),
                 formDTO.getPageSize()).doSelectPageInfo(() -> resiEventMentionDao.selectMentionList(formDTO.getUserId(),
                 formDTO.getReadFlag()));
+        result.getList().forEach(dto->{
+            if(dto.getShiftProject()||dto.getStatus().equals(EventConstant.EVENT_STATUS_CLOSED_CASE)){
+                // 立项和办结了不能回复哈。
+                dto.setReplyButtonFlag("false");
+            }else{
+                dto.setReplyButtonFlag("true");
+            }
+        });
         return result.getList();
     }
 

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml

@@ -78,4 +78,11 @@
                 </if>
                 AND DEL_FLAG = '0'
     </update>
+
+    <select id="selectUser" parameterType="map" resultType="com.epmet.entity.ResiEventMentionEntity">
+        select rem.* from resi_event_mention rem
+        where rem.del_flag='0'
+        and rem.RESI_EVENT_ID=#{eventId}
+        and rem.user_id=#{userId}
+    </select>
 </mapper>