From fc1fa9447adbfb07b620480d63ee4a4c2559ab6b Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Sun, 25 Apr 2021 09:41:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E6=88=90=E5=91=98=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=B8=BA=E8=B0=83=E6=95=B4=E4=B8=BA=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E6=88=90=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../group/service/impl/StatsAchievementServiceImpl.java      | 5 +++--
 .../com/epmet/modules/member/dao/ResiGroupMemberDao.java     | 2 +-
 .../main/java/com/epmet/modules/support/GroupLevelUtils.java | 2 +-
 .../src/main/resources/mapper/member/ResiGroupMemberDao.xml  | 3 +--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/StatsAchievementServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/StatsAchievementServiceImpl.java
index ecb1c8d3f5..973fda879d 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/StatsAchievementServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/StatsAchievementServiceImpl.java
@@ -83,7 +83,7 @@ public class StatsAchievementServiceImpl extends AbstractStatsAchievementService
                 currentValue = resiTopicDao.selectCount(queryWrapper);
                 break;
             case MEMBER:
-                currentValue = resiGroupMemberDao.countMembers(customerId, groupId);
+                currentValue = resiGroupMemberDao.countAllMembers(customerId, groupId);
                 break;
             case TOISSUE:
                 //查询已经转议题的话题数
@@ -187,7 +187,8 @@ public class StatsAchievementServiceImpl extends AbstractStatsAchievementService
         }
     }
 
-    private boolean buildArriveList(String customerId, String groupId, String achievementType, int currentValue, Integer targetValue, List<ResiGroupAchievementStatsEntity> haveArrive, List<ResiGroupAchievementConfigEntity> list) {
+    private boolean buildArriveList(String customerId, String groupId, String achievementType, int currentValue, Integer targetValue,
+                                    List<ResiGroupAchievementStatsEntity> haveArrive, List<ResiGroupAchievementConfigEntity> list) {
         boolean isContinue = true;
         for (ResiGroupAchievementConfigEntity configEntity : list) {
             if (targetValue != null) {
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java
index b80e9cacca..b626c8e51b 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java
@@ -154,5 +154,5 @@ public interface ResiGroupMemberDao extends BaseDao<ResiGroupMemberEntity> {
      * @author LiuJanJun
      * @date 2021/4/23 3:14 下午
      */
-	int countMembers(@Param("customerId") String customerId, @Param("groupId") String groupId);
+	int countAllMembers(@Param("customerId") String customerId, @Param("groupId") String groupId);
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/support/GroupLevelUtils.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/support/GroupLevelUtils.java
index b6c6b12b8a..17d14fb2f6 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/support/GroupLevelUtils.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/support/GroupLevelUtils.java
@@ -9,7 +9,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
- * 小组等级积分工具类
+ * 小组等级积分工具类 0,300,700,1200,1800
  *
  * @author zhaoqifeng
  * @date 2021/4/21 10:22
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 87197c1003..25341775cb 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
@@ -191,7 +191,7 @@
         ORDER BY
             rgm.CREATED_TIME DESC
     </select>
-    <select id="countMembers" resultType="int">
+    <select id="countAllMembers" resultType="int">
         SELECT
             count(*)
         FROM
@@ -199,7 +199,6 @@
         WHERE
             rgm.RESI_GROUP_ID = #{groupId}
             AND rgm.CUSTOMER_ID = #{customerId}
-            and rgm.STATUS = 'approved'
             AND rgm.GROUP_LEADER_FLAG = 'member'
 
     </select>