diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ShouldVoteCountFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ShouldVoteCountFormDTO.java index 3a4befde58..9102da0695 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ShouldVoteCountFormDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ShouldVoteCountFormDTO.java @@ -16,4 +16,9 @@ public class ShouldVoteCountFormDTO implements Serializable { * 网格id */ private String gridId; + + /** + * 议题创建时间 + */ + private Long issueCreatedTime; } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java index 9eb5984cc9..56d3e30f3a 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java @@ -147,6 +147,7 @@ public class IssueVoteDetailServiceImpl extends BaseServiceImpl { */ ShouldVoteCountResultDTO shouldVoteCount(ShouldVoteCountFormDTO formDTO); + /** + * @Description 获取议题创建之前,被踢出小组的人数 + * @param formDTO + * @author zxc + */ + Integer getOutGroupCount(ShouldVoteCountFormDTO formDTO); + /** * 党建园地-推荐小组 * @author zhaoqifeng 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 56722cce41..fae0b4307f 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 @@ -865,7 +865,12 @@ public class ResiGroupServiceImpl extends BaseServiceImpl + + + +