From c3729bcfad144bbb9d770573fe70a0a23a588eee Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 11 May 2021 15:50:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E7=9A=84=E5=BA=94=E8=A1=A8?=
 =?UTF-8?q?=E6=80=81=E4=BA=BA=E6=95=B0sql=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ExitGroupServiceImpl.java    |  1 -
 .../mapper/member/ResiGroupMemberDao.xml      | 22 +++++++++----------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ExitGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ExitGroupServiceImpl.java
index 71034fa047..62e10b0303 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ExitGroupServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ExitGroupServiceImpl.java
@@ -232,7 +232,6 @@ public class ExitGroupServiceImpl implements ExitGroupService {
         }
         //3.修改组成员出入群记录表数据状态、删除组成员关系表数据、新增退群记录表数据
         //3.1.修改组成员出入群记录表数据状态 group_memeber_operation
-        // TODO ???
         GroupMemeberOperationDTO lastRec=groupMemeberOperationService.selectLatestRecord(formDTO.getGroupId(),formDTO.getUserId());
         GroupMemeberOperationDTO operationDTO = new GroupMemeberOperationDTO();
         operationDTO.setCustomerId(formDTO.getCustomerId());
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml
index 243b301d19..25f4343e99 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml
@@ -97,20 +97,18 @@
 
     <select id="getMembersCountInGrid" resultType="integer">
         SELECT
-        COUNT(
-        DISTINCT
-        CUSTOMER_USER_ID
-        )
-        FROM
+        COUNT( DISTINCT member.CUSTOMER_USER_ID )
+    FROM
         RESI_GROUP groupp
-        INNER JOIN RESI_GROUP_MEMBER member ON member.RESI_GROUP_ID = groupp.ID AND member.DEL_FLAG = '0' AND member.STATUS <![CDATA[<>]]> 'removed'
-        WHERE
+        INNER JOIN RESI_GROUP_MEMBER member
+        ON (member.RESI_GROUP_ID = groupp.ID
+            AND member.DEL_FLAG = '0'
+            AND member.STATUS not in( 'removed','exit')
+        )
+    WHERE
         groupp.DEL_FLAG = '0'
-        AND
-        groupp.GRID_ID = #{gridId}
-        AND
-        groupp.STATE = 'approved'
-
+        AND groupp.GRID_ID = #{gridId}
+        AND groupp.STATE = 'approved'
     </select>
 
     <select id="getMembersCountInGrids" resultType="com.epmet.resi.group.dto.member.result.VotableCountResultDTO">