From a6de8b67d963383e938a6c15f5b74e47485ed52e Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 5 Aug 2021 14:03:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=8A=A5=E4=BA=8B=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E8=BF=94=E5=9B=9E=EF=BC=8C=E6=98=AF=E5=90=A6=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=9B=9E=E5=A4=8D=E6=8C=89=E9=92=AE=EF=BC=9A=E5=B7=B2?=
 =?UTF-8?q?=E5=8A=9E=E7=BB=93=E7=9A=84=E4=B8=8D=E6=98=BE=E7=A4=BA=EF=BC=8C?=
 =?UTF-8?q?=E6=9C=AA=E8=A2=AB=E4=BA=BA=E8=AF=BB=E7=9A=84=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=EF=BC=8C=E5=B7=B2=E8=A2=AB=E8=AF=BB=E7=9A=84=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/result/MyReportedResultDTO.java | 10 ++++++++++
 .../epmet/service/impl/ResiEventServiceImpl.java  | 15 +++++++++++++++
 .../src/main/resources/mapper/ResiEventDao.xml    |  4 +++-
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/MyReportedResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/MyReportedResultDTO.java
index 32209d0249..d2df7d7a66 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/MyReportedResultDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/MyReportedResultDTO.java
@@ -52,4 +52,14 @@ public class MyReportedResultDTO implements Serializable {
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date showTime;
+
+    /**
+     * true:显示回复；false：不显示回复按钮
+     */
+    private String replyButtonFlag;
+
+    /**
+     * 事件是否被阅读过;1已读；针对报事人待处理列表
+     */
+    private Boolean readFlag;
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index 4e2452c6c2..83d20152fd 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -476,6 +476,21 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
         PageInfo<MyReportedResultDTO> result = PageHelper.startPage(formDTO.getPageNo(),
                 formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.queryMyReported(formDTO.getUserId(),
                     formDTO.getStatusCondition()));
+        result.getList().forEach(resultDTO->{
+            if(EventConstant.EVENT_STATUS_CLOSED_CASE.equals(resultDTO.getStatus())){
+                // 已办结的不显示回复按钮
+                resultDTO.setReplyButtonFlag("false");
+            }else{
+                // 处理中的事件
+                if(resultDTO.getReadFlag()){
+                    // 被别人看过了就显示回复
+                    resultDTO.setReplyButtonFlag("true");
+                }else{
+                    //别人没看过
+                    resultDTO.setReplyButtonFlag("false");
+                }
+            }
+        });
         return result.getList();
     }
 
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
index 1af9c54926..617d3c795c 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
@@ -51,6 +51,7 @@
         <result property="status" column="STATUS" />
         <result property="shiftProject" column="SHIFT_PROJECT" />
         <result property="showTime" column="LATEST_OPERATED_TIME" />
+        <result property="readFlag" column="READ_FLAG" />
         <collection property="imgList" ofType="java.lang.String">
             <constructor>
                 <arg column="img_url"/>
@@ -70,7 +71,8 @@
             re.`STATUS`,
             re.SHIFT_PROJECT,
             re.LATEST_OPERATED_TIME,
-            rea.ATTACHMENT_URL as img_url
+            rea.ATTACHMENT_URL as img_url,
+            re.READ_FLAG
         from resi_event re
         left join resi_event_attachment rea
              on(re.id=rea.RESI_EVENT_ID