From a19961839a91f4fa9b0f7c903e03c8699701fbc3 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 6 May 2021 14:17:25 +0800 Subject: [PATCH] exit group --- .../epmet/commons/tools/exception/EpmetErrorCode.java | 2 ++ .../group/service/impl/ExitGroupServiceImpl.java | 10 +++------- .../epmet/modules/member/dao/ResiGroupMemberDao.java | 2 ++ .../resources/mapper/member/ResiGroupMemberDao.xml | 10 ++++++++++ 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index 7e37bb458e..b7b70c5159 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -173,6 +173,8 @@ public enum EpmetErrorCode { NOT_IN_GROUP_CAN_NOT_VIEW(8907,"当前内容仅允许组内成员查看"), PARTY_MEMBER_JOIN_BRANCH_GROUP(8908,"您不是党员，不能加入支部小组"), GROUP_ACT_CAN_NOT_CANCEL(8909,"当前活动已关闭或已取消"), + CHANGE_LEADER(8910,"请先转移组长身份在退组"), + //8910的msg动态赋值 GROUP_ACT_CAN_NOT_COMMENT(8910,"当前活动,不能评论"), SIGN_IN_TIME_NOT_START(8911,"未到签到时间,不允许签到"), diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ExitGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ExitGroupServiceImpl.java index 7e3b2a7533..71034fa047 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ExitGroupServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ExitGroupServiceImpl.java @@ -1,6 +1,7 @@ package com.epmet.modules.group.service.impl; import com.epmet.commons.tools.constant.*; +import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.UserRoleFormDTO; @@ -39,7 +40,6 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import java.util.ArrayList; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -228,7 +228,7 @@ public class ExitGroupServiceImpl implements ExitGroupService { //2、组长不允许退群，提示：请先转移组长身份后再退组 if(ModuleConstant.GROUP_LEADER.equals(resiGroupMemberDTO.getGroupLeaderFlag())){ //改成错误码 - throw new RenException("请先转移组长身份后再退组"); + throw new RenException(EpmetErrorCode.CHANGE_LEADER.getCode(),EpmetErrorCode.CHANGE_LEADER.getMsg()); } //3.修改组成员出入群记录表数据状态、删除组成员关系表数据、新增退群记录表数据 //3.1.修改组成员出入群记录表数据状态 group_memeber_operation @@ -244,11 +244,7 @@ public class ExitGroupServiceImpl implements ExitGroupService { groupMemeberOperationService.save(operationDTO); //3.2.删除组成员关系表数据并修改状态 resi_group_member - resiGroupMemberDTO.setStatus("exit"); - resiGroupMemberDTO.setUpdatedBy(formDTO.getUserId()); - resiGroupMemberDTO.setDelFlag(NumConstant.ONE_STR); - resiGroupMemberDTO.setUpdatedTime(new Date()); - resiGroupMemberService.update(resiGroupMemberDTO); + resiGroupMemberDao.exitGroupById(resiGroupMemberDTO.getId(),formDTO.getUserId()); //3.3.新增退群记录表数据 exit_group_record ExitGroupRecordEntity entity = new ExitGroupRecordEntity(); diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java index 4205eb483d..0f9ed73ce4 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java @@ -168,4 +168,6 @@ public interface ResiGroupMemberDao extends BaseDao { * @date 2021/4/20 下午4:03 */ String selectUserRole(@Param("groupId")String groupId, @Param("userId")String userId); + + int exitGroupById(@Param("id") String id, @Param("updatedBy") String updatedBy); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml index 7cf0ffb00a..a8e89256f9 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml @@ -226,4 +226,14 @@ AND CUSTOMER_USER_ID = #{userId} AND RESI_GROUP_ID = #{groupId} + + + UPDATE resi_group_member + SET DEL_FLAG = '1', + `STATUS` = 'exit', + UPDATED_TIME = NOW(), + UPDATED_BY = #{updatedBy} + WHERE + id = #{id} +