小组成员成就 只统计小组成员除了组长之外的人

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/StatsAchievementServiceImpl.java

@@ -92,7 +92,7 @@ public class StatsAchievementServiceImpl extends AbstractStatsAchievementService
                         .eq(ResiTopicEntity::getGroupId,groupId)
                         .eq(ResiTopicEntity::getShiftIssue, NumConstant.ONE)
                         .eq(ResiTopicEntity::getDelFlag,NumConstant.ZERO);
-                currentValue = 210;//resiTopicDao.selectCount(queryWrapper);
+                currentValue = resiTopicDao.selectCount(queryWrapper);
                 break;
             case RESOVLE_TOPIC:
                 //查询已经关闭且为已解决的话题数
@@ -108,7 +108,7 @@ public class StatsAchievementServiceImpl extends AbstractStatsAchievementService
             default:
                 log.info("calculateAcm error");
         }
-        calculateMember(customerId, groupId, currentValue, achievementType);
+        calculateGroupAchievement(customerId, groupId, currentValue, achievementType);
         return true;
     }
 
@@ -118,7 +118,7 @@ public class StatsAchievementServiceImpl extends AbstractStatsAchievementService
      * @param customerId
      * @param groupId
      */
-    private void calculateMember(String customerId, String groupId,int currentValue, String achievementType) {
+    private void calculateGroupAchievement(String customerId, String groupId, int currentValue, String achievementType) {
 
         ResiGroupAchievementStatsEntity one = super.achievementStatsService.selectLastUnAchieved(customerId, groupId, achievementType);
 
@@ -141,7 +141,7 @@ public class StatsAchievementServiceImpl extends AbstractStatsAchievementService
             int pageSize = NumConstant.TEN;
             do {
                 List<ResiGroupAchievementConfigEntity> list = getConfigByType(achievementType,pageNum++,pageSize);
-                isContinue = buildArrivList(customerId, groupId, achievementType, currentValue, one.getTargetValue(), haveArrive, list);
+                isContinue = buildArriveList(customerId, groupId, achievementType, currentValue, one.getTargetValue(), haveArrive, list);
             }while (isContinue);
         }
 
@@ -168,14 +168,14 @@ public class StatsAchievementServiceImpl extends AbstractStatsAchievementService
                 log.error("calculateMember get config fail");
                 throw new RenException(EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getCode());
             }
-            isContinue = buildArrivList(customerId, groupId, achievementType, currentValue, null, haveArrive, list);
+            isContinue = buildArriveList(customerId, groupId, achievementType, currentValue, null, haveArrive, list);
         }while (isContinue);
         if (CollectionUtils.isEmpty(haveArrive)) {
             throw new RenException("小组达成成就失败");
         }
     }
 
-    private boolean buildArrivList(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) {

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java

@@ -145,5 +145,14 @@ public interface ResiGroupMemberDao extends BaseDao<ResiGroupMemberEntity> {
 	 **/
     List<ResiGroupMemberDTO> queryMemberRemovedRecs(@Param("groupId") String groupId, @Param("userId") String userId);
 
+    /**
+     * desc: 仅统计除组长之外的成员数
+     *
+     * @param customerId
+ 	 * @param groupId
+     * @return int
+     * @author LiuJanJun
+     * @date 2021/4/23 3:14 下午
+     */
 	int countMembers(@Param("customerId") String customerId, @Param("groupId") String groupId);
 }

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml

@@ -200,6 +200,7 @@
             rgm.RESI_GROUP_ID = #{groupId}
             AND rgm.CUSTOMER_ID = #{customerId}
             and rgm.STATUS = 'approved'
+            AND rgm.GROUP_LEADER_FLAG = 'member'
 
     </select>
 </mapper>