From cadd9aeb892814728508c086021b2e9feee31a7c Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 30 Apr 2021 13:54:35 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=A7=84=E5=88=99=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/commons/tools/enums/BizTypeEnum.java | 3 ++- .../commons/tools/enums/SourceTypeEnum.java | 1 + .../impl/PointAdjustmentLogServiceImpl.java | 4 ++++ .../member/result/AchievementResultDTO.java | 3 ++- .../dto/member/result/GroupAchievementDTO.java | 1 + .../group/controller/ResiGroupController.java | 4 ++-- .../epmet/modules/group/dao/ResiGroupDao.java | 2 +- .../group/service/ResiGroupService.java | 2 +- .../service/impl/ResiGroupServiceImpl.java | 18 ++++++++++++------ .../resources/mapper/group/ResiGroupDao.xml | 3 ++- 10 files changed, 28 insertions(+), 13 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/BizTypeEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/BizTypeEnum.java index 21b1806ab0..1dec273299 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/BizTypeEnum.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/BizTypeEnum.java @@ -13,7 +13,8 @@ import lombok.Getter; public enum BizTypeEnum { //枚举类型 GROUP("group", "小组"), - ACTIVITY("activity", "活动"); + ACTIVITY("activity", "活动"), + AGENCY("agency", "组织"); /** * 类型 diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/SourceTypeEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/SourceTypeEnum.java index 7e51ad56dd..fa44ed89a8 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/SourceTypeEnum.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/SourceTypeEnum.java @@ -17,6 +17,7 @@ public enum SourceTypeEnum { ISSUE("issue", "议题"), PROJECT("project", "项目"), INVITE("invite", "邀请进组"), + MANUAL("manual", "人工调整"), VOLUNTEER("volunteer", "志愿者"); /** diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdjustmentLogServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdjustmentLogServiceImpl.java index 3d943ba887..cc5df2cd26 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdjustmentLogServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdjustmentLogServiceImpl.java @@ -206,6 +206,10 @@ public class PointAdjustmentLogServiceImpl extends BaseServiceImpl achievement; + private String groupId; + private String achievementDesc; } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/result/GroupAchievementDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/result/GroupAchievementDTO.java index 312a5759c2..f041bba578 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/result/GroupAchievementDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/result/GroupAchievementDTO.java @@ -12,6 +12,7 @@ import java.io.Serializable; @Data public class GroupAchievementDTO implements Serializable { private static final long serialVersionUID = 2195790168656351743L; + private String groupId; private String groupName; private String achievementName; } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java index 9f6ca58452..5b7da26913 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java @@ -557,8 +557,8 @@ public class ResiGroupController { * @return com.epmet.commons.tools.utils.Result */ @PostMapping("achievement") - public Result achievement(@LoginUser TokenDto tokenDto) { - return new Result().ok(resiGroupService.achievement(tokenDto)); + public Result> achievement(@LoginUser TokenDto tokenDto, @RequestBody GroupFormDTO formDTO) { + return new Result>().ok(resiGroupService.achievement(tokenDto, formDTO)); } /** diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java index e1d346eae0..24f3729e7d 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java @@ -245,5 +245,5 @@ public interface ResiGroupDao extends BaseDao { * @param userId * @return java.util.List */ - List selectRecentGroupAchievements(@Param("userId") String userId); + List selectRecentGroupAchievements(@Param("userId") String userId, @Param("gridId") String gridId); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java index d4ed1861b0..1f85bb082a 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java @@ -408,7 +408,7 @@ public interface ResiGroupService extends BaseService { * @param tokenDto * @return com.epmet.resi.group.dto.member.result.AchievementResultDTO */ - AchievementResultDTO achievement(TokenDto tokenDto); + List achievement(TokenDto tokenDto, GroupFormDTO formDTO); /** * 获取小组信息及小组成员 diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java index 334a36ec42..053d2b7054 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java @@ -1278,14 +1278,20 @@ public class ResiGroupServiceImpl extends BaseServiceImpl achievements = new ArrayList<>(); - List list = baseDao.selectRecentGroupAchievements(tokenDto.getUserId()); + public List achievement(TokenDto tokenDto, GroupFormDTO formDTO) { + List result = new ArrayList<>(); + + List list = baseDao.selectRecentGroupAchievements(tokenDto.getUserId(), formDTO.getGridId()); if (CollectionUtils.isNotEmpty(list)) { - achievements = list.stream().map(item -> item.getGroupName() + "：" + "达成“" + item.getAchievementName() + "”" + "成就").collect(Collectors.toList()); + result = + list.stream().map(item -> { + AchievementResultDTO dto = new AchievementResultDTO(); + String desc = item.getGroupName() + "：" + "达成“" + item.getAchievementName() + "”" + "成就"; + dto.setAchievementDesc(desc); + dto.setGroupId(item.getGroupId()); + return dto; + }).collect(Collectors.toList()); } - result.setAchievement(achievements); return result; } diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml index 044d36975c..b34ac4d1af 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml @@ -526,11 +526,12 @@