This commit is contained in:
张良(004796)
2024-03-29 17:04:02 +08:00
parent fbec1e6a56
commit b8946fb0ac
7 changed files with 53 additions and 16 deletions

View File

@@ -12,6 +12,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.xq.domain.UserStatus;
import com.ruoyi.xq.dto.admin.userstatus.UserStatusAdminVo;
import com.ruoyi.xq.service.UserStatusService;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
@@ -40,8 +41,8 @@ public class UserStatusController extends BaseController {
*/
@SaCheckPermission("xq:userStatus:list")
@GetMapping("/list")
public TableDataInfo<UserStatus> list(UserStatus bo, PageQuery pageQuery) {
Page<UserStatus> page = userStatusService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
public TableDataInfo<UserStatusAdminVo> list(UserStatusAdminVo bo, PageQuery pageQuery) {
Page<UserStatusAdminVo> page = userStatusService.pageAdmin(pageQuery, bo);
return TableDataInfo.build(page);
}

View File

@@ -0,0 +1,15 @@
package com.ruoyi.xq.dto.admin.userstatus;
import com.ruoyi.xq.domain.UserStatus;
import lombok.Data;
@Data
public class UserStatusAdminVo extends UserStatus {
/**
* 昵称
*/
private String nickname;
private String mobile;
private String avatar;
}

View File

@@ -1,7 +1,10 @@
package com.ruoyi.xq.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.xq.domain.UserStatus;
import com.ruoyi.xq.dto.admin.userstatus.UserStatusAdminVo;
import org.apache.ibatis.annotations.Param;
/**
* 用户状态Mapper接口
@@ -11,4 +14,5 @@ import com.ruoyi.xq.domain.UserStatus;
*/
public interface UserStatusMapper extends BaseMapper<UserStatus> {
Page<UserStatusAdminVo> pageAdmin(@Param("build") Page<Object> build, @Param("bo") UserStatusAdminVo bo);
}

View File

@@ -1,7 +1,10 @@
package com.ruoyi.xq.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.xq.domain.UserStatus;
import com.ruoyi.xq.dto.admin.userstatus.UserStatusAdminVo;
import com.ruoyi.xq.dto.app.userstatus.UserStatusUpdateAppReq;
/**
@@ -15,4 +18,6 @@ public interface UserStatusService extends IService<UserStatus> {
UserStatus getByUserId(Long userId);
void updateStatus(UserStatusUpdateAppReq req);
Page<UserStatusAdminVo> pageAdmin(PageQuery pageQuery, UserStatusAdminVo bo);
}

View File

@@ -1,10 +1,13 @@
package com.ruoyi.xq.service.impl;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.xq.domain.UserStatus;
import com.ruoyi.xq.domain.UserVip;
import com.ruoyi.xq.dto.admin.userstatus.UserStatusAdminVo;
import com.ruoyi.xq.dto.app.userstatus.UserStatusUpdateAppReq;
import com.ruoyi.xq.enums.ErrorEnum;
import com.ruoyi.xq.enums.userstatus.PersonalsStatusEnum;
@@ -56,4 +59,9 @@ public class UserStatusServiceImpl extends ServiceImpl<UserStatusMapper,UserStat
}
this.updateById(update);
}
@Override
public Page<UserStatusAdminVo> pageAdmin(PageQuery pageQuery, UserStatusAdminVo bo) {
return baseMapper.pageAdmin(pageQuery.build(),bo);
}
}