From d376586560f8886e47a3223415f922f05744d002 Mon Sep 17 00:00:00 2001 From: liuchuang Date: Wed, 18 Dec 2019 09:32:37 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/group/service/impl/GroupServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java index 22cbca72e..384973a74 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java @@ -196,8 +196,9 @@ public class GroupServiceImpl extends BaseServiceImpl imp for (GroupUserListResultDTO usersDTO: userListResultDTOS) { if (!usersDTO.getUserId().equals(dto.getUserId())) { - informationFormDTO.setUserId(usersDTO.getUserId()); - newsTask.insertUserInformation(informationFormDTO); + EpdcInformationFormDTO notice = ConvertUtils.sourceToTarget(informationFormDTO, EpdcInformationFormDTO.class); + notice.setUserId(usersDTO.getUserId()); + newsTask.insertUserInformation(notice); } } } From 5280304f55b729886363695588a6aa038b6f8f61 Mon Sep 17 00:00:00 2001 From: liuchuang Date: Wed, 18 Dec 2019 10:49:06 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/group/GroupDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml index 17aed5e4d..361818296 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml @@ -74,7 +74,7 @@ '网格长会尽快审核您创建的社群，请耐心等待' WHEN gp.STATE = 5 THEN gp.PROCESSING_OPINIONS - WHEN ( gp.STATE = 10 AND COUNT( DISTINCT ugp1.ID ) 1 AND gp.GROUP_CATEGORY = '1' ) THEN + WHEN ( gp.STATE = 10 AND COUNT( DISTINCT ugp1.ID ) 1 AND gp.GROUP_CATEGORY = '1' AND COUNT(DISTINCT tp.ID) = 0 ) THEN '您的社群审核已通过，快加好友进来吧' ELSE '' END AS description FROM From 5a34198ce4f351c55b04bc725df93fc1012ec8c3 Mon Sep 17 00:00:00 2001 From: liuchuang Date: Wed, 18 Dec 2019 17:37:19 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/constant/EventsNoticeConstant.java | 6 +++--- .../service/impl/EventCommentUserAttitudeServiceImpl.java | 4 ++-- .../issue/service/impl/EventUserAttitudeServiceImpl.java | 4 ++-- .../dto/constant/GroupNoticeConstant.java | 2 +- .../dto/constant/TopicNoticeConstant.java | 2 +- .../service/impl/TopicCommentUserAttitudeServiceImpl.java | 2 +- .../modules/topic/service/impl/TopicServiceImpl.java | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/EventsNoticeConstant.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/EventsNoticeConstant.java index bf83bead5..9655eb4aa 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/EventsNoticeConstant.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/EventsNoticeConstant.java @@ -50,7 +50,7 @@ public interface EventsNoticeConstant { /** * 议题反对 */ - String NOTICE_ISSUE_OPPOSE = "你的议题【有新的反对】"; + String NOTICE_ISSUE_OPPOSE = "你的议题【有新的不支持】"; /** * 项目支持 */ @@ -58,7 +58,7 @@ public interface EventsNoticeConstant { /** * 项目反对 */ - String NOTICE_ITEM_OPPOSE = "你的项目【有新的反对】"; + String NOTICE_ITEM_OPPOSE = "你的项目【有新的不支持】"; /** * 评论支持 */ @@ -66,7 +66,7 @@ public interface EventsNoticeConstant { /** * 评论反对 */ - String NOTICE_COMMENT_OPPOSE = "你的评论【有新的反对】"; + String NOTICE_COMMENT_OPPOSE = "你的评论【有新的不支持】"; /** * 项目被评论 */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentUserAttitudeServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentUserAttitudeServiceImpl.java index 7f6c31374..dffdcf12e 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentUserAttitudeServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentUserAttitudeServiceImpl.java @@ -205,7 +205,7 @@ public class EventCommentUserAttitudeServiceImpl extends BaseServiceImpl imp // 获取群主信息 UserGroupDTO userGroupDto = userGroupService.getLordInfoByGroupId(resultDto.getGroupId()); - if (formDto.getUserId().equals(userGroupDto.getUserId())) { + if (null != userGroupDto && formDto.getUserId().equals(userGroupDto.getUserId())) { resultDto.setLordFlag(NumConstant.ONE_STR); } else { resultDto.setLordFlag(NumConstant.ZERO_STR); From 7ddff2bd0c0e7c7f5ad0336bba83de8a465f25a8 Mon Sep 17 00:00:00 2001 From: liuchuang Date: Wed, 18 Dec 2019 17:57:36 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/modules/issue/service/impl/IssueServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java index 061c28c54..5f3a3c252 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java @@ -186,7 +186,7 @@ public class IssueServiceImpl extends BaseServiceImpl imp informationFormDTO.setUserId(entity.getUserId()); informationFormDTO.setContent(dto.getAdvice()); informationFormDTO.setType(EventsNoticeConstant.NOTICE_TYPE_PROGRESS_NOTICE); - informationFormDTO.setBusinessType(EventsNoticeConstant.NOTICE_BUSINESS_TYPE_ITEM); + informationFormDTO.setBusinessType(EventsNoticeConstant.NOTICE_BUSINESS_TYPE_ISSUE); informationFormDTO.setBusinessId(entity.getId()); informationFormDTO.setRelBusinessContent("议题：" + entity.getIssueContent()); @@ -207,6 +207,7 @@ public class IssueServiceImpl extends BaseServiceImpl imp // 转项目 if (EventIssueItemState.ISSUE_CHANGE_TO_ITEM == dto.getState()) { informationFormDTO.setTitle(EventsNoticeConstant.NOTICE_ISSUE_CHANGE_TO_ITEM); + informationFormDTO.setBusinessType(EventsNoticeConstant.NOTICE_BUSINESS_TYPE_ITEM); // 插入项目表 ItemEntity itemEntity = initItemEntity(entity); itemService.insert(itemEntity); From 51e4caf38bb4d8e32b56a8ed0ad2631db6a68c5d Mon Sep 17 00:00:00 2001 From: liuchuang Date: Thu, 19 Dec 2019 10:13:13 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/service/impl/AppUserServiceImpl.java | 2 +- .../group/controller/AppGroupController.java | 14 ++++++++++++++ .../modules/group/service/GroupService.java | 12 ++++++++++++ .../group/service/impl/GroupServiceImpl.java | 18 ++++++++++++++++++ 4 files changed, 45 insertions(+), 1 deletion(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java index 7d7380f38..897748f80 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java @@ -821,7 +821,7 @@ public class AppUserServiceImpl implements AppUserService { tokenDto.setNickname(user.getNickname()); tokenDto.setMobile(user.getMobile()); tokenDto.setPartyFlag(user.getPartyFlag()); - EpdcAppAuthorizationDTO authorizationDto = this.packageEpdcAppAuthorization(tokenDto, userGrid.getGrid(), userDto.getState()); + EpdcAppAuthorizationDTO authorizationDto = this.packageEpdcAppAuthorization(tokenDto, userGrid.getGrid(), user.getState()); // 更新社群用户党员标识并加入关联的所有网格党员群 if (NumConstant.ONE_STR.equals(user.getPartyFlag())) { diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/controller/AppGroupController.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/controller/AppGroupController.java index ea00c2839..d7200690c 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/controller/AppGroupController.java +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/controller/AppGroupController.java @@ -69,6 +69,20 @@ public class AppGroupController { return groupService.saveGroup(groupCreateFormDto); } + /** + * + * 批量创建网格党员群 + * + * @params [depts] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/12/19 9:42 + */ + @PostMapping("createPartys") + public Result createPartyGroups(@RequestBody List depts) { + return groupService.savePartyGroups(depts); + } + /** * * 解散社群 diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/GroupService.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/GroupService.java index 89873f07d..dd6e29831 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/GroupService.java +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/GroupService.java @@ -20,6 +20,7 @@ package com.elink.esua.epdc.modules.group.service; import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.CompleteDeptDTO; import com.elink.esua.epdc.dto.group.*; import com.elink.esua.epdc.dto.group.form.*; import com.elink.esua.epdc.dto.group.result.*; @@ -272,4 +273,15 @@ public interface GroupService extends BaseService { */ Result joinGridPartyGroup(GroupUserFormDTO formDto); + /** + * + * 批量生成网格党员群 + * + * @params [deptList] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author liuchuang + * @since 2019/12/19 9:34 + */ + Result savePartyGroups(List deptList); + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java index 384973a74..f3f8cae58 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java @@ -25,6 +25,8 @@ import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.CompleteDeptDTO; +import com.elink.esua.epdc.dto.constant.GroupConstant; import com.elink.esua.epdc.dto.constant.GroupNoticeConstant; import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO; import com.elink.esua.epdc.dto.group.*; @@ -375,4 +377,20 @@ public class GroupServiceImpl extends BaseServiceImpl imp return new Result(); } + + @Override + public Result savePartyGroups(List deptList) { + for (CompleteDeptDTO dept: + deptList) { + GroupCreateFormDTO groupCreateFormDto = ConvertUtils.sourceToTarget(dept, GroupCreateFormDTO.class); + groupCreateFormDto.setGroupName(dept.getCommunity().concat(dept.getGrid()).concat(GroupConstant.PARTY_GROUP_NAME_SUFFIX)); + groupCreateFormDto.setGroupAvatar(GroupConstant.PARTY_GROUP_AVATAR); + groupCreateFormDto.setGroupIntroduction(dept.getStreet().concat(dept.getCommunity()).concat(dept.getGrid())); + groupCreateFormDto.setGroupCategory(NumConstant.ZERO_STR); + groupCreateFormDto.setState(GroupStateEnum.GROUP_STATE_EXAMINATION_PASSED.getValue()); + this.saveGroup(groupCreateFormDto); + } + + return new Result(); + } } \ No newline at end of file