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 | 42 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 37 insertions(+), 5 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 9bb8712..50485e6 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -43,6 +43,7 @@
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.StringPool;
import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.excel.SecurityExcel;
import org.springblade.modules.system.excel.UserExcel;
import org.springblade.modules.system.excel.UserImporter;
import org.springblade.modules.system.service.IUserService;
@@ -55,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;
@@ -80,7 +82,7 @@
@ApiOperationSupport(order = 1)
@ApiOperation(value = "查看详情", notes = "传入id")
@GetMapping("/detail")
- @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+ //@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R<UserVO> detail(User user) {
User detail = userService.getOne(Condition.getQueryWrapper(user));
return R.data(UserWrapper.build().entityVO(detail));
@@ -139,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));
}
@@ -150,7 +152,7 @@
*/
@GetMapping("/page-security")
public R<IPage<UserVO>> pageSecurity(@ApiIgnore UserVO user, Query query) {
- user.setAccount("admin");
+ //user.setAccount("admin");
IPage<UserVO> pages = userService.selectUserPageSecurity(Condition.getPage(query), user);
return R.data(pages);
}
@@ -165,7 +167,7 @@
public R submit(@Valid @RequestBody User user) {
CacheUtil.clear(USER_CACHE);
//资格审查
- String body = InvestigateUtil.httpGet(user.getCardid());
+ String body = InvestigateUtil.httpGetOne(user.getCardid());
JSONObject jsonObject = new JSONObject(body);
String data = jsonObject.get("data").toString();
JSONObject jsonData = new JSONObject(data);
@@ -175,7 +177,7 @@
user.setExaminationType("0");
}else {
user.setExaminationType("1");
- user.setExaminationMx(res.getJSONObject(0).get("zdxsfzqkry").toString());
+ user.setExaminationMx(res.getJSONObject(0).get("zdrylbjh").toString());
}
return R.status(userService.submit(user));
}
@@ -189,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));
}
/**
@@ -293,6 +304,17 @@
}
/**
+ * 导出用户审查明细
+ */
+ @GetMapping("export-security")
+ @ApiOperationSupport(order = 13)
+ @ApiOperation(value = "导出用户", notes = "传入user")
+ public void exportSecurity(UserVO user, HttpServletResponse response) {
+ List<SecurityExcel> list = userService.exportSecurity(user);
+ ExcelUtil.export(response, "保安员审查数据" + DateUtil.time(), "保安员审查数据表", list, SecurityExcel.class);
+ }
+
+ /**
* 导出模板
*/
@GetMapping("export-template")
@@ -360,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