From b5960d1968e007b91d4d33dd7cbb74f1b566f2c1 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 24 May 2024 10:20:01 +0800
Subject: [PATCH] 到期时间修改
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index 455691d..50485e6 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -56,6 +56,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -140,7 +141,7 @@
@ApiImplicitParam(name = "account", value = "账号名", paramType = "query", dataType = "string"),
@ApiImplicitParam(name = "realName", value = "姓名", paramType = "query", dataType = "string")
})
- public R<IPage<UserVO>> pages(@ApiIgnore User user, Query query) {
+ public R<IPage<UserVO>> pages(@ApiIgnore UserVO user, Query query) {
IPage<User> pages = userService.selectUserPages(Condition.getPage(query), user);
return R.data(UserWrapper.build().pageVO(pages));
}
@@ -190,6 +191,15 @@
public R update(@Valid @RequestBody User user) {
CacheUtil.clear(USER_CACHE);
return R.status(userService.updateUser(user));
+ }
+
+ /**
+ * 修改用户信息
+ */
+ @PostMapping("/updateUser")
+ public R updateUser(@Valid @RequestBody User user) {
+ user.setUpdateTime(new Date());
+ return R.status(userService.updateById(user));
}
/**
@@ -372,5 +382,15 @@
return R.success("吊销成功");
}
+ /**
+ * 查询押运人员
+ *
+ * @return
+ */
+ @GetMapping("/selectPeo")
+ public R selectPeo(@ApiIgnore UserVO user) {
+ List list = userService.selectPeo(user);
+ return R.data(list);
+ }
}
--
Gitblit v1.9.3