shayu/xq-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

init

Browse Source
This commit is contained in:
77
2024-04-23 02:11:20 +08:00
parent 7434564e3e
commit 9aa9ffc0b9
5 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserController.java
View File

@@ -12,14 +12,18 @@ import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.BeanConvertUtil;
import com.ruoyi.xq.domain.User;
import com.ruoyi.xq.domain.UserInfo;
import com.ruoyi.xq.dto.admin.user.FullUserVo;
import com.ruoyi.xq.dto.admin.user.UserAdminUpdateVo;
import com.ruoyi.xq.dto.admin.user.UserAdminVo;
import com.ruoyi.xq.dto.admin.user.req.AddUserReq;
import com.ruoyi.xq.dto.admin.user.req.ResetPasswordAdminReq;
import com.ruoyi.xq.dto.admin.user.req.UpdateMobileAdminReq;
import com.ruoyi.xq.dto.admin.user.req.UpdateUserReq;
import com.ruoyi.xq.dto.app.common.IdReq;
import com.ruoyi.xq.service.UserInfoService;
import com.ruoyi.xq.service.UserInviteService;
import com.ruoyi.xq.service.UserService;
import lombok.RequiredArgsConstructor;
@@ -47,6 +51,8 @@ public class UserController extends BaseController {
private final UserService userService;
private final UserInviteService userInviteService;
private final UserInfoService userInfoService;
/**
* 查询用户管理列表
@@ -159,9 +165,13 @@ public class UserController extends BaseController {
*/
@SaCheckPermission("xq:user:query")
@GetMapping("/{id}")
public R<User> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
return R.ok(userService.getById(id));
public R<UserAdminUpdateVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
User user = userService.getById(id);
UserInfo userInfo = userInfoService.getByUserId(user.getId());
UserAdminUpdateVo res = BeanConvertUtil.convertTo(user, UserAdminUpdateVo::new);
res.setCarStatus(userInfo.getCarStatus());
res.setHousingStatus(userInfo.getHousingStatus());
return R.ok(res);
}
/**

10
ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/user/UserAdminUpdateVo.java Normal file
View File

@@ -0,0 +1,10 @@
package com.ruoyi.xq.dto.admin.user;
import com.ruoyi.xq.domain.User;
import lombok.Data;
@Data
public class UserAdminUpdateVo extends User {
private Integer carStatus;
private Integer housingStatus;
}

2
ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/user/req/AddUserReq.java
View File

@@ -23,4 +23,6 @@ public class AddUserReq {
private Integer annualIncome;
private Integer forPersonals;
private String pictures;
private Integer carStatus;
private Integer housingStatus;
}

2
ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/user/req/UpdateUserReq.java
View File

@@ -21,4 +21,6 @@ public class UpdateUserReq {
private String profession;
private Integer forPersonals;
private Integer annualIncome;
private Integer carStatus;
private Integer housingStatus;
}

6
ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserServiceImpl.java
View File

@@ -395,6 +395,12 @@ public class UserServiceImpl extends ServiceImpl<UserMapper,User> implements Use
updateUser.setProfession(updateUserReq.getProfession());
updateUser.setAnnualIncome(updateUserReq.getAnnualIncome());
this.updateById(updateUser);
if(updateUserReq.getCarStatus() != null || updateUserReq.getHousingStatus() != null){
userInfoService.update(Wrappers.lambdaUpdate(UserInfo.class)
.eq(UserInfo::getUserId, user.getId())
.set(updateUserReq.getCarStatus() != null,UserInfo::getCarStatus, updateUserReq.getCarStatus())
.set(updateUserReq.getHousingStatus() != null,UserInfo::getHousingStatus, updateUserReq.getHousingStatus()));
}
this.checkFinishStatus(user.getId());
}