From d23bc04fb1066cc8b74cc922bed6bfb9c8836d79 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 23 Apr 2021 15:15:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E6=88=90=E5=91=98=E6=88=90?= =?UTF-8?q?=E5=B0=B1=20=E5=8F=AA=E7=BB=9F=E8=AE=A1=E5=B0=8F=E7=BB=84?= =?UTF-8?q?=E6=88=90=E5=91=98=E9=99=A4=E4=BA=86=E7=BB=84=E9=95=BF=E4=B9=8B?= =?UTF-8?q?=E5=A4=96=E7=9A=84=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/StatsAchievementServiceImpl.java | 12 ++++++------ .../epmet/modules/member/dao/ResiGroupMemberDao.java | 9 +++++++++ .../resources/mapper/member/ResiGroupMemberDao.xml | 1 + 3 files changed, 16 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 17c390d848..74ada0b770 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 @@ -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 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 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 1b48bd47b6..b80e9cacca 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 @@ -145,5 +145,14 @@ public interface ResiGroupMemberDao extends BaseDao { **/ List 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); } 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 7a48582fe4..87197c1003 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 @@ -200,6 +200,7 @@ rgm.RESI_GROUP_ID = #{groupId} AND rgm.CUSTOMER_ID = #{customerId} and rgm.STATUS = 'approved' + AND rgm.GROUP_LEADER_FLAG = 'member'