Merge branch 'dev_group_point' into dev_temp

# Conflicts:
#	epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java

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", "组织");
 
 	/**
 	 * 类型

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", "志愿者");
 
 	/**

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<PointAdjustme
         userPointActionEntity.setCustomerId(param.getCustomerId());
         userPointActionEntity.setActionFlag(param.getAdjustmentType());
         userPointActionEntity.setPoint(point);
+        userPointActionEntity.setBizType("agency");
+        userPointActionEntity.setObjectId(agencyId);
+        userPointActionEntity.setSourceType("manual ");
+        userPointActionEntity.setSourceId(param.getUserId());
         userPointActionEntity.setEventStatement(param.getReason());
         userPointActionEntity.setEventName(ModuleConstant.EVENT_NAME_ADJUSTMENT);
         userPointActionEntity.setOperatorAgencyId(agencyId);

epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.10__updateRule.sql

@@ -0,0 +1,3 @@
+UPDATE point_rule_default SET RULE_NAME = '组长转话题为议题' WHERE EVENT_CODE = 'shift_topic_to_issue';
+UPDATE point_rule SET RULE_NAME = '组长转话题为议题' WHERE EVENT_CODE = 'shift_topic_to_issue';
+INSERT INTO `epmet_point`.`point_rule_default`(`ID`, `RULE_NAME`, `RULE_DESC`, `EVENT_CODE`, `FUNCTION_ID`, `OPERATE_TYPE`, `UP_LIMIT`, `UP_LIMIT_DESC`, `UP_LIMIT_PREFIX`, `RULE_PERIOD`, `POINT`, `POINT_UNIT`, `ENABLED_FLAG`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('10', '组长解决话题', '组长解决组内话题', 'leader_resolve_topic', '1', 'plus', 0, '无上限', NULL, 'day', 2, 'time', '0', '0', 0, 'APP_USER', '2021-04-19 15:55:18', 'APP_USER', '2021-04-19 15:55:18');

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/result/AchievementResultDTO.java

@@ -13,5 +13,6 @@ import java.util.List;
 @Data
 public class AchievementResultDTO implements Serializable {
 	private static final long serialVersionUID = 8079550501852632061L;
-	private List<String> achievement;
+	private String groupId;
+	private String achievementDesc;
 }

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;
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java

@@ -573,8 +573,8 @@ public class ResiGroupController {
      * @return com.epmet.commons.tools.utils.Result<com.epmet.resi.group.dto.member.result.AchievementResultDTO>
      */
     @PostMapping("achievement")
-    public Result<AchievementResultDTO> achievement(@LoginUser TokenDto tokenDto) {
+    public Result<List<AchievementResultDTO>> achievement(@LoginUser TokenDto tokenDto, @RequestBody GroupFormDTO formDTO) {
-        return new Result<AchievementResultDTO>().ok(resiGroupService.achievement(tokenDto));
+        return new Result<List<AchievementResultDTO>>().ok(resiGroupService.achievement(tokenDto, formDTO));
     }
 
    /**

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

@@ -307,7 +307,7 @@ public interface ResiGroupDao extends BaseDao<ResiGroupEntity> {
 	 * @param userId
 	 * @return java.util.List<com.epmet.resi.group.dto.member.result.GroupAchievementDTO>
 	 */
-	List<GroupAchievementDTO> selectRecentGroupAchievements(@Param("userId") String userId);
+	List<GroupAchievementDTO> selectRecentGroupAchievements(@Param("userId") String userId, @Param("gridId") String gridId);
 
 	/**
 	 * @Description  根据IDs查询 topic，act，notice信息

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

@@ -416,7 +416,7 @@ public interface ResiGroupService extends BaseService<ResiGroupEntity> {
 	 * @param tokenDto
 	 * @return com.epmet.resi.group.dto.member.result.AchievementResultDTO
 	 */
-	AchievementResultDTO achievement(TokenDto tokenDto);
+	List<AchievementResultDTO> achievement(TokenDto tokenDto, GroupFormDTO formDTO);
 
 	/**
 	 * 获取小组信息及小组成员

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

@@ -1332,14 +1332,20 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 	 * @date 2021/4/22 9:27
 	 */
 	@Override
-	public AchievementResultDTO achievement(TokenDto tokenDto) {
+	public List<AchievementResultDTO> achievement(TokenDto tokenDto, GroupFormDTO formDTO) {
-		AchievementResultDTO result = new AchievementResultDTO();
+		List<AchievementResultDTO> result = new ArrayList<>();
-		List<String> achievements = new ArrayList<>();
+
-		List<GroupAchievementDTO> list = baseDao.selectRecentGroupAchievements(tokenDto.getUserId());
+		List<GroupAchievementDTO> 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;
 	}
 

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

@@ -771,18 +771,20 @@
 
     <select id="selectRecentGroupAchievements" resultType="com.epmet.resi.group.dto.member.result.GroupAchievementDTO">
         SELECT
+            rgas.GROUP_ID,
             rg.GROUP_NAME,
             rgas.ACHIEVEMENT_NAME
         FROM
             resi_group_achievement_stats rgas
-                INNER JOIN resi_group rg ON rgas.GROUP_ID = rg.ID
+                INNER JOIN resi_group rg ON rgas.GROUP_ID = rg.ID AND rg.GRID_ID = #{gridId}
                 INNER JOIN resi_group_member rgm ON rgas.GROUP_ID = rgm.RESI_GROUP_ID
-                AND rgm.CUSTOMER_USER_ID = #{userId}
+                AND rgm.CUSTOMER_USER_ID = #{userId} AND rgm.DEL_FLAG = '0'
+
         WHERE
             rgas.IS_ARRIVE = 1
+            AND DATE_SUB(CURDATE(), INTERVAL 3 DAY) &lt;= date(rgas.CREATED_TIME)
         ORDER BY
             rgas.ARRIVE_TIME DESC
-        LIMIT 10
     </select>
     <!-- 根据IDs查询 topic，act，notice信息 -->
     <select id="getPastTopicListV2ByIds" resultType="com.epmet.resi.group.dto.topic.result.GetPastTopicListV2ResultDTO">