【7.2.3】【group】更新分组的api接口

pull/30/MERGE
fengshuonan 2022-07-04 15:38:25 +08:00
parent 891ec117ee
commit 812a8509bb
5 changed files with 14 additions and 10 deletions

View File

@ -38,7 +38,7 @@ import java.util.List;
public interface GroupApi { public interface GroupApi {
/** /**
* id * id
* *
* @author fengshuonan * @author fengshuonan
* @date 2022/5/11 17:00 * @date 2022/5/11 17:00
@ -46,11 +46,13 @@ public interface GroupApi {
List<Long> findUserGroupDataList(SysGroupRequest sysGroupRequest); List<Long> findUserGroupDataList(SysGroupRequest sysGroupRequest);
/** /**
* *
* *
* @param sysGroupRequest groupBizCode
* @param getTotal
* @author fengshuonan * @author fengshuonan
* @date 2022/5/11 17:00 * @date 2022/5/11 17:00
*/ */
List<SysGroupDTO> findGroupList(SysGroupRequest sysGroupRequest); List<SysGroupDTO> findGroupList(SysGroupRequest sysGroupRequest, boolean getTotal);
} }

View File

@ -41,7 +41,7 @@ public class SysGroupController {
*/ */
@GetResource(name = "获取列表", path = "/sysGroup/list") @GetResource(name = "获取列表", path = "/sysGroup/list")
public ResponseData<List<SysGroupDTO>> list(@Validated(BaseRequest.list.class) SysGroupRequest sysGroupRequest) { public ResponseData<List<SysGroupDTO>> list(@Validated(BaseRequest.list.class) SysGroupRequest sysGroupRequest) {
return new SuccessResponseData<>(groupApi.findGroupList(sysGroupRequest)); return new SuccessResponseData<>(groupApi.findGroupList(sysGroupRequest, false));
} }
/** /**

View File

@ -21,6 +21,6 @@ public interface SysGroupMapper extends BaseMapper<SysGroup> {
* @author fengshuonan * @author fengshuonan
* @date 2022/5/11 16:49 * @date 2022/5/11 16:49
*/ */
List<SysGroupDTO> getUserGroupList(@Param("groupBizCode") String groupBizCode, @Param("userId") Long userId); List<SysGroupDTO> getUserGroupList(@Param("groupBizCode") String groupBizCode, @Param("userId") Long userId, @Param("getTotal") boolean getTotal);
} }

View File

@ -6,8 +6,10 @@
select group_name, group_id, group_biz_code, business_id, user_id select group_name, group_id, group_biz_code, business_id, user_id
from sys_group from sys_group
where user_id = #{userId} where user_id = #{userId}
and group_biz_code = #{groupBizCode} and group_biz_code = #{groupBizCode}
group by group_name <if test="getTotal != null and getTotal == false">
group by group_name
</if>
</select> </select>
</mapper> </mapper>

View File

@ -28,10 +28,10 @@ import java.util.stream.Collectors;
public class SysGroupServiceImpl extends ServiceImpl<SysGroupMapper, SysGroup> implements SysGroupService, GroupApi { public class SysGroupServiceImpl extends ServiceImpl<SysGroupMapper, SysGroup> implements SysGroupService, GroupApi {
@Override @Override
public List<SysGroupDTO> findGroupList(SysGroupRequest sysGroupRequest) { public List<SysGroupDTO> findGroupList(SysGroupRequest sysGroupRequest, boolean getTotal) {
String groupBizCode = sysGroupRequest.getGroupBizCode(); String groupBizCode = sysGroupRequest.getGroupBizCode();
Long userId = LoginContext.me().getLoginUser().getUserId(); Long userId = LoginContext.me().getLoginUser().getUserId();
List<SysGroupDTO> userGroupList = this.baseMapper.getUserGroupList(groupBizCode, userId); List<SysGroupDTO> userGroupList = this.baseMapper.getUserGroupList(groupBizCode, userId, getTotal);
// 增加两个固定的选中和取消选项 // 增加两个固定的选中和取消选项
addAllGroup(groupBizCode, userGroupList); addAllGroup(groupBizCode, userGroupList);
@ -43,7 +43,7 @@ public class SysGroupServiceImpl extends ServiceImpl<SysGroupMapper, SysGroup> i
public List<SysGroupDTO> addSelect(SysGroupRequest sysGroupRequest) { public List<SysGroupDTO> addSelect(SysGroupRequest sysGroupRequest) {
String groupBizCode = sysGroupRequest.getGroupBizCode(); String groupBizCode = sysGroupRequest.getGroupBizCode();
Long userId = LoginContext.me().getLoginUser().getUserId(); Long userId = LoginContext.me().getLoginUser().getUserId();
List<SysGroupDTO> userGroupList = this.baseMapper.getUserGroupList(groupBizCode, userId); List<SysGroupDTO> userGroupList = this.baseMapper.getUserGroupList(groupBizCode, userId, false);
// 增加两个固定的选中和取消选项 // 增加两个固定的选中和取消选项
addCommonGroup(groupBizCode, userGroupList); addCommonGroup(groupBizCode, userGroupList);