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 haveArrive, List list) { + private boolean buildArriveList(String customerId, String groupId, String achievementType, int currentValue, Integer targetValue, + List haveArrive, List 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 { * @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 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'