diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActReadRecordDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActReadRecordDTO.java index 78bbec055c..b1040693b0 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActReadRecordDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActReadRecordDTO.java @@ -17,9 +17,10 @@ package com.epmet.resi.group.dto.act; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** @@ -43,6 +44,16 @@ public class ActReadRecordDTO implements Serializable { */ private String customerId; + /** + * 小组所属网格id + */ + private String gridId; + + /** + * 小组id + */ + private String groupId; + /** * group_act_info.id */ diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActReadRecordEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActReadRecordEntity.java index ad7809400d..561a3d760a 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActReadRecordEntity.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActReadRecordEntity.java @@ -40,6 +40,16 @@ public class ActReadRecordEntity extends BaseEpmetEntity { */ private String customerId; + /** + * 小组所属网格id + */ + private String gridId; + + /** + * 小组id + */ + private String groupId; + /** * group_act_info.id */ 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 ecf6f045df..a62da74ca6 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 @@ -148,7 +148,8 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl readRecordEntityList=constructReadRec(groupActInfoEntity.getId(), formDTO.getCustomerId(), formDTO.getGroupId(), - formDTO.getPublishUserId()); + formDTO.getPublishUserId(), + groupDTO.getGridId()); //2、插入活动内容 contentList.forEach(textContentEntity->{ groupActContentDao.insert(textContentEntity); @@ -167,7 +168,7 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl constructReadRec(String groupActId, String customerId, String groupId,String publishUserId) { + private List constructReadRec(String groupActId, String customerId, String groupId,String publishUserId,String gridId) { List list=new ArrayList<>(); List memberDTOList=resiGroupMemberService.getMemberList(groupId); memberDTOList.forEach(memberDTO->{ @@ -177,6 +178,8 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl