From 7022c4f73fcd1954f518d9b3e3cb6e1752bb1305 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 7 Jun 2022 10:04:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E6=9C=89=E4=BA=86?=
 =?UTF-8?q?=E6=96=B0=E5=9B=9E=E5=A4=8D=EF=BC=8C=E5=B7=A5=E4=BD=9C=E7=AB=AF?=
 =?UTF-8?q?=E7=BA=A2=E7=82=B9=E7=BD=AE=E4=B8=BA=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/screen/ScreenPartyUserRankDataDao.xml   | 1 +
 .../src/main/java/com/epmet/dto/IcEventDTO.java              | 5 +++--
 .../src/main/java/com/epmet/entity/IcEventEntity.java        | 5 +++++
 .../main/java/com/epmet/service/impl/IcEventServiceImpl.java | 3 +++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
index add7341a75..d4bdb13bb2 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml
@@ -203,6 +203,7 @@
                       <when test="orgType == 'department'">
                         INNER JOIN screen_customer_dept org ON org.CUSTOMER_ID = u.CUSTOMER_ID AND org.DEPT_ID = u.ORG_ID AND org.DEL_FLAG = '0'
                     </when>
+
                 </choose>
             </if>
             WHERE
diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/IcEventDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/IcEventDTO.java
index fb86222967..9d5d6c2f0c 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/IcEventDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/IcEventDTO.java
@@ -1,8 +1,9 @@
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -182,7 +183,7 @@ approved：人工审核通过）
 	private String createdBy;
 
     /**
-     * 展示红点：visible；隐藏：invisible；人大回复、工作人员回复/立项更新为visible; 插入数据默认不展示
+     * 创建时间
      */
 	private Date createdTime;
 
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/IcEventEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/IcEventEntity.java
index db3fc54536..98677eaf19 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/IcEventEntity.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/IcEventEntity.java
@@ -121,6 +121,11 @@ public class IcEventEntity extends BaseEpmetEntity {
      */
 	private Integer redDot;
 
+	/**
+	 * 工作端的红点:展示1；不展示：0；【居民报事、回复更新为1】
+	 */
+	private Integer govRedDot;
+
     /**
      * 最近一次操作时间（回复、立项、转需求、办结更新此列）
      */
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
index 5d1c2f9fbd..53b4b2f8e0 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
@@ -1426,7 +1426,10 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
         //1.查询事件数据 判断是否允许回复
         IcEventEntity entity=checkReply(formDTO.getIcEventId());
         entity.setLatestOperatedTime(new Date());
+        //居民端的红点置为不显示
         entity.setRedDot(NumConstant.ZERO);
+        //居民有了新回复，工作端的红点置为展示
+        entity.setGovRedDot(NumConstant.ONE);
         baseDao.updateById(entity);
 
         //2.新增回复数据