diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/CloseGroupActFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/CloseGroupActFormDTO.java
new file mode 100644
index 0000000000..17d417376c
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/CloseGroupActFormDTO.java
@@ -0,0 +1,27 @@
+package com.epmet.resi.group.dto.act.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 017、关闭活动
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/4/21 15:18
+ */
+@Data
+public class CloseGroupActFormDTO implements Serializable {
+
+    public interface AddUserInternalGroup {
+    }
+    @NotBlank(message = "groupActId不能为空", groups = ActSummaryDetailFormDTO.AddUserInternalGroup.class)
+    private String groupActId;
+
+    /**
+     * 当前用户id
+     */
+    @NotBlank(message = "tokenDto获取userId为空", groups = ActReadViewFormDTO.AddUserInternalGroup.class)
+    private String userId;
+}
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/GetPastTopicListV2FormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/GetPastTopicListV2FormDTO.java
new file mode 100644
index 0000000000..ad41e9bf81
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/GetPastTopicListV2FormDTO.java
@@ -0,0 +1,36 @@
+package com.epmet.resi.group.dto.topic.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/4/21 下午3:21
+ * @DESC
+ */
+@Data
+public class GetPastTopicListV2FormDTO implements Serializable {
+
+    private static final long serialVersionUID = 3746688354140118007L;
+
+    public interface GetPastTopicListV2Form{}
+
+    /**
+     * null默认查询讨论中、已关闭，dicussing讨论中，closed关闭
+     */
+    private String status;
+
+    @NotBlank(message = "小组ID不能为空",groups = GetPastTopicListV2Form.class)
+    private String groupId;
+
+    @NotNull(message = "pageSize不能为空",groups = GetPastTopicListV2Form.class)
+    private Integer pageSize;
+
+    @NotNull(message = "pageNo不能为空",groups = GetPastTopicListV2Form.class)
+    private Integer pageNo;
+
+    private String userId;
+}
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GetPastTopicListV2ResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GetPastTopicListV2ResultDTO.java
new file mode 100644
index 0000000000..fcc28ddec8
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GetPastTopicListV2ResultDTO.java
@@ -0,0 +1,77 @@
+package com.epmet.resi.group.dto.topic.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/4/21 下午3:15
+ * @DESC
+ */
+@Data
+public class GetPastTopicListV2ResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -8352977778269083843L;
+
+    /**
+     * 话题、通知、活动Id
+     */
+    private String id;
+
+    /**
+     * 发布者的全称（街道-姓氏先生/女士）【专项组显示真实名】
+     */
+    private String releaseUserName;
+
+    /**
+     * 发布者的头像Url
+     */
+    private String releaseUserHeadPhoto;
+
+    /**
+     * 发布时间yyyy-MM-dd
+     */
+    private String releaseTime;
+
+    /**
+     * 内容
+     */
+    private String content;
+
+    /**
+     * 话题状态（discussing进行中、closed已关闭）
+     */
+    private String status;
+
+    /**
+     * 是否本人
+     */
+    private Boolean releaseUserFlag;
+
+    /**
+     * 议题id
+     */
+    private String issueId;
+
+    /**
+     * 是否被转为议题true,false
+     */
+    private Boolean shiftIssueFlag;
+
+    /**
+     * 数据类型(topic:话题 notice:通知 act:活动)
+     */
+    private String contentType;
+
+    /**
+     * 本人已读未读状态(read已读 unread未读)
+     */
+    private String readOrUnRead;
+
+    /**
+     * 徽章Url集合
+     */
+    private List<String> badgeList;
+}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/GroupActInfoController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/GroupActInfoController.java
index e69121c2d2..d2231f005b 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/GroupActInfoController.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/GroupActInfoController.java
@@ -122,4 +122,21 @@ public class GroupActInfoController {
         ValidatorUtils.validateEntity(formDTO,ActDetailByLinkFormDTO.AddUserInternalGroup.class);
         return new Result<ActDetailByLinkResultDTO>().ok(groupActInfoService.queryActDetailByLink(formDTO));
     }
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result
+     * @param tokenDto
+     * @param formDTO
+     * @author yinzuomei
+     * @description 017、关闭活动
+     * @Date 2021/4/21 15:22
+     **/
+    @PostMapping("close")
+    public Result closeAct(@LoginUser TokenDto tokenDto,@RequestBody CloseGroupActFormDTO formDTO){
+        formDTO.setUserId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(formDTO,CloseGroupActFormDTO.AddUserInternalGroup.class);
+        groupActInfoService.closeAct(formDTO);
+        return new Result();
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActSummaryService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActSummaryService.java
index 815ebad816..b56ba655e3 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActSummaryService.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActSummaryService.java
@@ -59,4 +59,6 @@ public interface ActSummaryService extends BaseService<ActSummaryEntity> {
      * @return com.epmet.resi.group.dto.act.result.ActSummaryDetailResultDTO
      */
     ActSummaryDetailResultDTO queryActSummaryDetail(ActSummaryDetailFormDTO formDTO);
+
+    ActSummaryEntity queryUserSummary(String groupActId, String userId);
 }
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/GroupActInfoService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/GroupActInfoService.java
index d108c976e5..b815bb7358 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/GroupActInfoService.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/GroupActInfoService.java
@@ -81,4 +81,12 @@ public interface GroupActInfoService extends BaseService<GroupActInfoEntity> {
      * @return com.epmet.resi.group.dto.act.result.ActDetailByLinkResultDTO
      */
     ActDetailByLinkResultDTO queryActDetailByLink(ActDetailByLinkFormDTO formDTO);
+
+    /**
+     * 017、关闭活动
+     *
+     * @param formDTO
+     * @return
+     */
+    void closeAct(CloseGroupActFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSummaryServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSummaryServiceImpl.java
index e5537fe340..e9d2aeba9b 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSummaryServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSummaryServiceImpl.java
@@ -296,4 +296,9 @@ public class ActSummaryServiceImpl extends BaseServiceImpl<ActSummaryDao, ActSum
         resultDTO.setExtraTextList(actSummaryContentDao.selectContentList(actSummaryEntity.getId(), formDTO.getGroupActId(), GroupActConstant.TEXT));
         return resultDTO;
     }
+
+    @Override
+    public ActSummaryEntity queryUserSummary(String groupActId, String userId) {
+        return baseDao.selectUserSummary(groupActId,userId);
+    }
 }
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
index d8feb925e4..54a184983c 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
@@ -41,16 +41,11 @@ import com.epmet.dto.result.UserBaseInfoResultDTO;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.GovOrgOpenFeignClient;
-import com.epmet.modules.act.dao.ActOperationRecordDao;
-import com.epmet.modules.act.dao.ActReadRecordDao;
-import com.epmet.modules.act.dao.GroupActContentDao;
-import com.epmet.modules.act.dao.GroupActInfoDao;
-import com.epmet.modules.act.entity.ActOperationRecordEntity;
-import com.epmet.modules.act.entity.ActReadRecordEntity;
-import com.epmet.modules.act.entity.GroupActContentEntity;
-import com.epmet.modules.act.entity.GroupActInfoEntity;
+import com.epmet.modules.act.dao.*;
+import com.epmet.modules.act.entity.*;
 import com.epmet.modules.act.service.ActCategoryDictService;
 import com.epmet.modules.act.service.ActSignInRecordService;
+import com.epmet.modules.act.service.ActSummaryService;
 import com.epmet.modules.act.service.GroupActInfoService;
 import com.epmet.modules.constant.GroupActConstant;
 import com.epmet.modules.constant.UserMessageConstant;
@@ -118,7 +113,8 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
     private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
     @Autowired
     private InvitationRecordService invitationRecordService;
-
+    @Autowired
+    private ActSummaryService actSummaryService;
     /**
      * 003、发布（编辑）组织活动
      *
@@ -706,4 +702,46 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
         resultDTO.setInvitationRecordId(formDTO.getInvitationRecordId());
         return resultDTO;
     }
+
+    /**
+     * 017、关闭活动
+     *
+     * @param formDTO
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void closeAct(CloseGroupActFormDTO formDTO) {
+        GroupActInfoEntity actInfoEntity=baseDao.selectById(formDTO.getGroupActId());
+        //1、只有组长才可以关闭活动
+        ResiGroupMemberDTO groupMemberDTO = resiGroupMemberService.getLeaderMember(actInfoEntity.getGroupId());
+        if (!formDTO.getUserId().equals(groupMemberDTO.getCustomerUserId())) {
+            throw new RenException(EpmetErrorCode.GROUP_LEADER_CAN_EDIT_GROUP_INFO.getCode(), EpmetErrorCode.GROUP_LEADER_CAN_EDIT_GROUP_INFO.getMsg());
+        }
+        //2、活动已关闭，已取消,不能关闭
+        if (GroupActConstant.CLOSED.equals(actInfoEntity.getStatus())) {
+            throw new RenException(EpmetErrorCode.GROUP_ACT_CAN_NOT_CANCEL.getCode(), EpmetErrorCode.GROUP_ACT_CAN_NOT_CANCEL.getMsg());
+        } else if (GroupActConstant.CANCELED.equals(actInfoEntity.getStatus())) {
+            throw new RenException(EpmetErrorCode.GROUP_ACT_CAN_NOT_CANCEL.getCode(), EpmetErrorCode.GROUP_ACT_CAN_NOT_CANCEL.getMsg());
+        }
+        ActSummaryEntity actSummaryEntity = actSummaryService.queryUserSummary(formDTO.getGroupActId(),formDTO.getUserId());
+        //3、没有填写总结，自动提交默认总结
+        if (actInfoEntity.getSummaryFlag() == NumConstant.ZERO && null == actSummaryEntity) {
+            ActSummaryFormDTO actSummaryFormDTO=new ActSummaryFormDTO();
+            actSummaryFormDTO.setUserId(formDTO.getUserId());
+            actSummaryFormDTO.setGroupActId(formDTO.getGroupActId());
+            actSummaryService.submitActSummary(actSummaryFormDTO);
+        }
+        //4、插入操作日志
+        ActOperationRecordEntity actOperationRecordEntity = new ActOperationRecordEntity();
+        actOperationRecordEntity.setCustomerId(actInfoEntity.getCustomerId());
+        actOperationRecordEntity.setOperateUserId(formDTO.getUserId());
+        actOperationRecordEntity.setGroupActId(formDTO.getGroupActId());
+        actOperationRecordEntity.setOperationType(GroupActConstant.CLOSE);
+        actOperationRecordDao.insert(actOperationRecordEntity);
+        //5、更新关闭时间
+        actInfoEntity.setStatus(GroupActConstant.CLOSED);
+        actInfoEntity.setClosedTime(actOperationRecordEntity.getCreatedTime());
+        baseDao.updateById(actInfoEntity);
+    }
 }
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java
index 4e824c18ef..a53708526d 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java
@@ -455,4 +455,18 @@ public class ResiTopicController {
         formDTO.setUserId(tokenDto.getUserId());
         return new Result<GetLatestV2ResultDTO>().ok(topicService.getLatestV2(formDTO));
     }
+
+    /**
+     * @Description 小组历史数据查询V2
+     * @Param formDTO
+     * @Param tokenDto
+     * @author zxc
+     * @date 2021/4/21 下午4:08
+     */
+    @PostMapping("getpasttopiclistv2")
+    public Result<List<GetPastTopicListV2ResultDTO>> getPastTopicListV2(@RequestBody GetPastTopicListV2FormDTO formDTO,@LoginUser TokenDto tokenDto){
+        ValidatorUtils.validateEntity(formDTO, GetPastTopicListV2FormDTO.GetPastTopicListV2Form.class);
+        formDTO.setUserId(tokenDto.getUserId());
+        return new Result<List<GetPastTopicListV2ResultDTO>>().ok(topicService.getPastTopicListV2(formDTO));
+    }
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java
index 27f9142337..b4b6cab7ba 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java
@@ -363,4 +363,13 @@ public interface ResiTopicService extends BaseService<ResiTopicEntity> {
      * @date 2021/4/20 下午2:34
      */
     GetLatestV2ResultDTO getLatestV2(GetLatestV2FormDTO formDTO);
+
+    /**
+     * @Description 小组历史数据查询V2
+     * @Param formDTO
+     * @Param tokenDto
+     * @author zxc
+     * @date 2021/4/21 下午4:08
+     */
+    List<GetPastTopicListV2ResultDTO> getPastTopicListV2(GetPastTopicListV2FormDTO formDTO);
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
index 42c6928927..8cc9e38973 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
@@ -2266,6 +2266,18 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         return result;
     }
 
+    /**
+     * @Description 小组历史数据查询V2
+     * @Param formDTO
+     * @Param tokenDto
+     * @author zxc
+     * @date 2021/4/21 下午4:08
+     */
+    @Override
+    public List<GetPastTopicListV2ResultDTO> getPastTopicListV2(GetPastTopicListV2FormDTO formDTO) {
+        return null;
+    }
+
     /**
      * @Description  查询用户信息【头像，名字】
      * @Param groupType