From 32931d4ee92165dd4295ab13776a1b0d9d23094f Mon Sep 17 00:00:00 2001
From: zxc <954985706@qq.com>
Date: Fri, 22 May 2020 18:59:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E8=A1=A8=E5=86=B3=E6=95=B0=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/form/ShouldVoteCountFormDTO.java   |  5 +++++
 .../service/impl/IssueVoteDetailServiceImpl.java |  1 +
 .../dto/group/form/ShouldVoteCountFormDTO.java   |  5 +++++
 .../epmet/modules/group/dao/ResiGroupDao.java    |  7 +++++++
 .../group/service/impl/ResiGroupServiceImpl.java |  7 ++++++-
 .../main/resources/mapper/group/ResiGroupDao.xml | 16 ++++++++++++++++
 6 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ShouldVoteCountFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ShouldVoteCountFormDTO.java
index 3a4befde58..9102da0695 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ShouldVoteCountFormDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ShouldVoteCountFormDTO.java
@@ -16,4 +16,9 @@ public class ShouldVoteCountFormDTO implements Serializable {
      * 网格id
      */
     private String gridId;
+
+    /**
+     * 议题创建时间
+     */
+    private Long issueCreatedTime;
 }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java
index 9eb5984cc9..56d3e30f3a 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java
@@ -147,6 +147,7 @@ public class IssueVoteDetailServiceImpl extends BaseServiceImpl<IssueVoteDetailD
         IssueDTO issueDTO = issueService.get(formDTO.getIssueId());
         ShouldVoteCountFormDTO shouldVoteCount = new ShouldVoteCountFormDTO();
         shouldVoteCount.setGridId(issueDTO.getGridId());
+        shouldVoteCount.setIssueCreatedTime(issueDTO.getCreatedTime().getTime()/1000);
         ShouldVoteCountResultDTO data = resiGroupFeignClient.shouldVoteCount(shouldVoteCount).getData();
         redisData.setShouldVoteCount(data.getShouldVoteCount());
         issueVoteDetailRedis.set(redisData);
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ShouldVoteCountFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ShouldVoteCountFormDTO.java
index 512b4b3beb..df560832cb 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ShouldVoteCountFormDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ShouldVoteCountFormDTO.java
@@ -16,4 +16,9 @@ public class ShouldVoteCountFormDTO implements Serializable {
      * 网格id
      */
     private String gridId;
+
+    /**
+     * 议题创建时间
+     */
+    private Long issueCreatedTime;
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java
index f61092f93a..867a3d11ba 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java
@@ -164,6 +164,13 @@ public interface ResiGroupDao extends BaseDao<ResiGroupEntity> {
 	 */
 	ShouldVoteCountResultDTO shouldVoteCount(ShouldVoteCountFormDTO formDTO);
 
+	/**
+	 * @Description  获取议题创建之前，被踢出小组的人数
+	 * @param formDTO
+	 * @author zxc
+	 */
+	Integer getOutGroupCount(ShouldVoteCountFormDTO formDTO);
+
 	/**
 	 * 党建园地-推荐小组
 	 * @author zhaoqifeng
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
index 56722cce41..fae0b4307f 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
@@ -865,7 +865,12 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 	 */
 	@Override
 	public ShouldVoteCountResultDTO shouldVoteCount(ShouldVoteCountFormDTO formDTO) {
-		return baseDao.shouldVoteCount(formDTO);
+		//网格下所有加过组的人数
+		Integer shouldVoteCount = baseDao.shouldVoteCount(formDTO).getShouldVoteCount();
+		Integer outGroupCount = baseDao.getOutGroupCount(formDTO);
+		ShouldVoteCountResultDTO result = new ShouldVoteCountResultDTO();
+		result.setShouldVoteCount(shouldVoteCount-outGroupCount);
+		return result;
 	}
 
 	@Override
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
index 94ab61b439..dc13d94254 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
@@ -322,6 +322,22 @@
             AND rg.del_flag = 0
             AND rg.grid_id = #{gridId}
     </select>
+
+    <!-- 获取议题创建之前，被踢出小组的人数 -->
+    <select id="getOutGroupCount" parameterType="com.epmet.resi.group.dto.group.form.ShouldVoteCountFormDTO" resultType="integer">
+        SELECT
+            COUNT(*) AS shouldVoteCount
+        FROM
+            resi_group_member rgm
+            LEFT JOIN resi_group rg ON rgm.resi_group_id = rg.id
+        WHERE
+            rgm.del_flag = 0
+            AND rg.del_flag = 0
+            AND rgm.STATUS = 'removed'
+            AND UNIX_TIMESTAMP( rgm.updated_time ) &lt; #{issueCreatedTime}
+            AND rg.grid_id = #{gridId}
+    </select>
+
     <select id="selectListRecommendList" resultType="com.epmet.resi.group.dto.group.result.RecommendedListResultDTO"
             parameterType="com.epmet.resi.group.dto.group.form.RecommendedListFormDTO">
         SELECT