From 3de49b63c43c762b7b335e0fd95834b43731d8cd Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Mon, 10 May 2021 10:13:16 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=80=80=E5=87=BA=E7=BE=A4=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/group/GroupDataDao.xml   | 20 +++++++++----------
 .../service/ResiGroupMemberService.java       | 10 ++++++++++
 .../GroupMemeberOperationServiceImpl.java     | 12 +++++------
 .../impl/ResiGroupMemberServiceImpl.java      | 18 +++++++++++++++++
 .../mapper/member/ResiGroupMemberDao.xml      |  7 +++++--
 5 files changed, 49 insertions(+), 18 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml
index 9b6da626dc..4ec21cd214 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml
@@ -26,12 +26,12 @@
             COUNT(rgm.id) AS gridGroupPeopleTotal
         FROM
             resi_group rg
-            LEFT JOIN resi_group_member rgm ON rgm.resi_group_id = rg.id
+            LEFT JOIN resi_group_member rgm ON rgm.resi_group_id = rg.id AND rmg.DEL_FLAG = 0
         WHERE
             rg.DEL_FLAG = 0
             AND rg.state = #{state}
             AND rg.customer_id = #{customerId}
-            AND rgm.status != #{status}
+            AND (rgm.status = 'approved' OR rgm.status = 'silent')
             AND DATE_FORMAT(rgm.created_time,'%Y%m%d') <![CDATA[ <= ]]> #{dateId}
             GROUP BY rg.grid_id
     </select>
@@ -45,12 +45,12 @@
             COUNT( rgm.id ) AS groupCount
         FROM
             resi_group rg
-            LEFT JOIN resi_group_member rgm ON rgm.resi_group_id = rg.id
+            LEFT JOIN resi_group_member rgm ON rgm.resi_group_id = rg.id AND rmg.DEL_FLAG = 0
         WHERE
             rg.DEL_FLAG = 0
             AND rg.state = #{state}
             AND rg.customer_id = #{customerId}
-            AND rgm.STATUS != #{status}
+            AND (rgm.status = 'approved' OR rgm.status = 'silent')
             AND DATE_FORMAT(rgm.created_time,'%Y%m%d') <![CDATA[ <= ]]> #{dateId}
         GROUP BY
             rgm.resi_group_id
@@ -94,12 +94,12 @@
                 COUNT(rgm.id) AS gridGroupPeopleTotal
             FROM
                 resi_group rg
-                LEFT JOIN resi_group_member rgm ON rgm.resi_group_id = rg.id
+                LEFT JOIN resi_group_member rgm ON rgm.resi_group_id = rg.id AND rmg.DEL_FLAG = 0
             WHERE
                 rg.DEL_FLAG = 0
                 AND rg.state = 'approved'
                 AND rg.customer_id = #{customerId}
-                AND rgm.status != 'removed'
+                AND (rgm.status = 'approved' OR rgm.status = 'silent')
                 AND DATE_FORMAT(rgm.created_time,'%Y%m%d') <![CDATA[ <= ]]> #{dateId}
                 GROUP BY rg.grid_id
     </select>
@@ -112,12 +112,12 @@
                 COUNT( rgm.id ) AS groupCount
             FROM
                 resi_group rg
-                LEFT JOIN resi_group_member rgm ON rgm.resi_group_id = rg.id
+                LEFT JOIN resi_group_member rgm ON rgm.resi_group_id = rg.id AND rmg.DEL_FLAG = 0
             WHERE
                 rg.DEL_FLAG = 0
                 AND rg.state = 'approved'
                 AND rg.customer_id = #{customerId}
-                AND rgm.STATUS != 'removed'
+                AND (rgm.status = 'approved' OR rgm.status = 'silent')
                 AND DATE_FORMAT(rgm.created_time,'%Y%m%d') <![CDATA[ <= ]]> #{dateId}
             GROUP BY
                 rgm.resi_group_id
@@ -145,12 +145,12 @@
                 COUNT( rgm.id ) AS groupCount
             FROM
                 resi_group rg
-                LEFT JOIN resi_group_member rgm ON rgm.resi_group_id = rg.id
+                LEFT JOIN resi_group_member rgm ON rgm.resi_group_id = rg.id AND rmg.DEL_FLAG = 0
             WHERE
                 rg.DEL_FLAG = 0
                 AND rg.state = 'approved'
                 AND rg.grid_id = #{gridId}
-                AND rgm.STATUS != 'removed'
+                AND (rgm.status = 'approved' OR rgm.status = 'silent')
             GROUP BY
                 rgm.resi_group_id
         </foreach>
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/ResiGroupMemberService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/ResiGroupMemberService.java
index 2a0c0d9316..8027971cb6 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/ResiGroupMemberService.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/ResiGroupMemberService.java
@@ -252,4 +252,14 @@ public interface ResiGroupMemberService extends BaseService<ResiGroupMemberEntit
      * @Date 2021/4/19 19:14
      **/
     List<ResiGroupMemberDTO> getMemberList(String groupId);
+
+    /**
+     * 查询小组人员信息
+     * @author zhaoqifeng
+     * @date 2021/5/8 15:17
+     * @param groupId
+     * @param userId
+     * @return com.epmet.resi.group.dto.member.ResiGroupMemberDTO
+     */
+    ResiGroupMemberDTO getMemberInfo(String groupId, String userId);
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupMemeberOperationServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupMemeberOperationServiceImpl.java
index 343a6dbd64..90cf1e3b15 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupMemeberOperationServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupMemeberOperationServiceImpl.java
@@ -247,8 +247,8 @@ public class GroupMemeberOperationServiceImpl extends BaseServiceImpl<GroupMemeb
             throw new RenException("没有找到邀请人Id");
         }
         //查询是否在群内
-        ResiGroupMemberDTO groupMember = resiGroupMemberDao.selectGroupMemberInfo(groupId, param.getUserId());
-        if (null != groupMember && !MemberStateConstant.REMOVED.equals(groupMember.getStatus())) {
+        ResiGroupMemberDTO groupMember = memberService.getMemberInfo(groupId, param.getUserId());
+        if (null != groupMember && MemberStateConstant.APPROVED.equals(groupMember.getStatus())) {
             log.info("已经在群内，直接返回成功，但是不发送积分事件");
             result.setStatus("entered");
             return result;
@@ -341,7 +341,7 @@ public class GroupMemeberOperationServiceImpl extends BaseServiceImpl<GroupMemeb
             }
         }
 
-        if(StringUtils.isNotBlank(inviter)){
+        if(StringUtils.isNotBlank(inviter) && null == groupMember){
 
             CommonGridIdFormDTO dataFilterParam = new CommonGridIdFormDTO();
             dataFilterParam.setGridId(resiGroupDTO.getGridId());
@@ -397,15 +397,15 @@ public class GroupMemeberOperationServiceImpl extends BaseServiceImpl<GroupMemeb
         //直接加入群成员关系表
         //如果是之前被移除的，则修改resi_group_member记录
         ResiGroupMemberDTO resiGroupMemberDTO = new ResiGroupMemberDTO();
-        ResiGroupMemberDTO resiGroupMember = resiGroupMemberDao.selectGroupMemberInfo(groupId, param.getUserId());
-        if (null != resiGroupMember) {
-            resiGroupMemberDTO.setId(resiGroupMember.getId());
+        if (null != groupMember) {
+            resiGroupMemberDTO.setId(groupMember.getId());
         }
         resiGroupMemberDTO.setCustomerUserId(groupMemeberOperation.getCustomerUserId());
         resiGroupMemberDTO.setResiGroupId(groupMemeberOperation.getGroupId());
         resiGroupMemberDTO.setGroupLeaderFlag(LeaderFlagConstant.GROUP_MEMBER);
         resiGroupMemberDTO.setEnterGroupType(groupMemeberOperation.getEnterGroupType());
         resiGroupMemberDTO.setStatus(MemberStateConstant.APPROVED);
+        resiGroupMemberDTO.setDelFlag(NumConstant.ZERO_STR);
         resiGroupMemberDTO.setCreatedBy(groupMemeberOperation.getCustomerUserId());
         memberService.saveOrUpdate(resiGroupMemberDTO);
         //修改群统计值
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
index ab71d26f6d..92a5b04871 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
@@ -383,6 +383,24 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		return baseDao.getMemberList(groupId);
 	}
 
+	/**
+	 * 查询小组人员信息
+	 *
+	 * @param groupId
+	 * @param userId
+	 * @return com.epmet.resi.group.dto.member.ResiGroupMemberDTO
+	 * @author zhaoqifeng
+	 * @date 2021/5/8 15:17
+	 */
+	@Override
+	public ResiGroupMemberDTO getMemberInfo(String groupId, String userId) {
+		QueryWrapper<ResiGroupMemberEntity> wrapper = new QueryWrapper<>();
+		wrapper.eq("RESI_GROUP_ID", groupId)
+				.eq("CUSTOMER_USER_ID", userId);
+		ResiGroupMemberEntity entity = baseDao.selectOne(wrapper);
+		return ConvertUtils.sourceToTarget(entity, ResiGroupMemberDTO.class);
+	}
+
 	/**
 	 * @param groupMemberListFormDTO
 	 * @return com.epmet.commons.tools.utils.Result
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..9fcc9983e6 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
@@ -103,7 +103,8 @@
         )
         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'
+        INNER JOIN RESI_GROUP_MEMBER member ON member.RESI_GROUP_ID = groupp.ID AND member.DEL_FLAG = '0' AND (member.STATUS = 'approved' OR
+                                                                                                               member.STATUS = 'silent')
         WHERE
         groupp.DEL_FLAG = '0'
         AND
@@ -122,7 +123,8 @@
         ) as votableCount
         FROM
         RESI_GROUP groupp
-        LEFT JOIN RESI_GROUP_MEMBER member ON member.RESI_GROUP_ID = groupp.ID AND member.DEL_FLAG = '0' AND member.STATUS <![CDATA[<>]]> 'removed'
+        LEFT JOIN RESI_GROUP_MEMBER member ON member.RESI_GROUP_ID = groupp.ID AND member.DEL_FLAG = '0' AND (member.STATUS = 'approved' OR
+        member.STATUS = 'silent')
         WHERE
         groupp.DEL_FLAG = '0'
         AND
@@ -163,6 +165,7 @@
           AND CUSTOMER_USER_ID = #{userId}
           AND RESI_GROUP_ID = #{groupId}
           AND `STATUS` != 'removed'
+          AND `STATUS` != 'exit'
     </select>
 
     <!-- 修改群成员关系数据状态 -->

From f0c16c22dd0b68ba2bf414d5555841807e67f7d6 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Tue, 25 May 2021 10:33:33 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=80=80=E5=87=BA=E7=BE=A4=E7=BB=84=20?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/group/GroupDataDao.xml   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml
index 4ec21cd214..de5fc6a9b9 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml
@@ -26,7 +26,7 @@
             COUNT(rgm.id) AS gridGroupPeopleTotal
         FROM
             resi_group rg
-            LEFT JOIN resi_group_member rgm ON rgm.resi_group_id = rg.id AND rmg.DEL_FLAG = 0
+            LEFT JOIN resi_group_member rgm ON rgm.resi_group_id = rg.id AND rgm.DEL_FLAG = 0
         WHERE
             rg.DEL_FLAG = 0
             AND rg.state = #{state}
@@ -45,7 +45,7 @@
             COUNT( rgm.id ) AS groupCount
         FROM
             resi_group rg
-            LEFT JOIN resi_group_member rgm ON rgm.resi_group_id = rg.id AND rmg.DEL_FLAG = 0
+            LEFT JOIN resi_group_member rgm ON rgm.resi_group_id = rg.id AND rgm.DEL_FLAG = 0
         WHERE
             rg.DEL_FLAG = 0
             AND rg.state = #{state}
@@ -94,7 +94,7 @@
                 COUNT(rgm.id) AS gridGroupPeopleTotal
             FROM
                 resi_group rg
-                LEFT JOIN resi_group_member rgm ON rgm.resi_group_id = rg.id AND rmg.DEL_FLAG = 0
+                LEFT JOIN resi_group_member rgm ON rgm.resi_group_id = rg.id AND rgm.DEL_FLAG = 0
             WHERE
                 rg.DEL_FLAG = 0
                 AND rg.state = 'approved'
@@ -112,7 +112,7 @@
                 COUNT( rgm.id ) AS groupCount
             FROM
                 resi_group rg
-                LEFT JOIN resi_group_member rgm ON rgm.resi_group_id = rg.id AND rmg.DEL_FLAG = 0
+                LEFT JOIN resi_group_member rgm ON rgm.resi_group_id = rg.id AND rgm.DEL_FLAG = 0
             WHERE
                 rg.DEL_FLAG = 0
                 AND rg.state = 'approved'
@@ -145,7 +145,7 @@
                 COUNT( rgm.id ) AS groupCount
             FROM
                 resi_group rg
-                LEFT JOIN resi_group_member rgm ON rgm.resi_group_id = rg.id AND rmg.DEL_FLAG = 0
+                LEFT JOIN resi_group_member rgm ON rgm.resi_group_id = rg.id AND rgm.DEL_FLAG = 0
             WHERE
                 rg.DEL_FLAG = 0
                 AND rg.state = 'approved'