From 3a76d1b047de005151724889a29e162430daca8e Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 21 Apr 2021 11:53:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=88=86=E4=BA=AB=E9=93=BE?=
 =?UTF-8?q?=E6=8E=A5=EF=BC=8C=E6=9F=A5=E7=9C=8B=E6=B4=BB=E5=8A=A8=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resi/group/dto/act/result/ActDetailResultDTO.java  | 10 ++++++++++
 .../act/service/impl/GroupActInfoServiceImpl.java      |  2 ++
 2 files changed, 12 insertions(+)

diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/ActDetailResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/ActDetailResultDTO.java
index f75226e850..86b4e9ed07 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/ActDetailResultDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/ActDetailResultDTO.java
@@ -150,4 +150,14 @@ public class ActDetailResultDTO implements Serializable {
      * 已签到人数（有人签到自动+1）
      */
     private Integer signedInNum;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * 客户id
+     */
+    private String customerId;
 }
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 27f57f5cc7..6b8c29a263 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
@@ -698,7 +698,9 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
         ActDetailFormDTO actDetailFormDTO = new ActDetailFormDTO();
         actDetailFormDTO.setUserId(formDTO.getUserId());
         actDetailFormDTO.setGroupActId(invitationRecordDTO.getSourceId());
+        //调用查看活动详情接口
         ActDetailResultDTO actDetailResultDTO = queryActDetail(actDetailFormDTO);
+
         ActDetailByLinkResultDTO resultDTO = ConvertUtils.sourceToTarget(actDetailResultDTO, ActDetailByLinkResultDTO.class);
         resultDTO.setInvitationRecordId(formDTO.getInvitationRecordId());
         return resultDTO;