From a445f592f22bc3f1bb7fe18ef80352c9f49f408c Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 08 Nov 2021 13:50:12 +0800
Subject: [PATCH] 派遣人员查询接口新增修改
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 63 +++++++++++++++++--------------
1 files changed, 35 insertions(+), 28 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 1888ff1..0ed7ffc 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -282,6 +282,29 @@
return R.success("修改成功");
}
+
+ /**
+ * 修改发证时间
+ */
+ @PostMapping("/updatePaperTime")
+ public R updatePaperTime(@RequestBody User user) {
+ user.setPaperTime(new Date());
+ userService.updateById(user);
+ String paperTime = null;
+ //发证日期处理
+ if (user.getPaperTime() == null) {
+ paperTime = null;
+ } else {
+ paperTime = new SimpleDateFormat("yyyy-MM-dd").format(user.getPaperTime());
+ }
+ String s1 =
+ "update blade_user set paper_time = " + "'" + paperTime + "'"
+ + ",user_type = " + "'" + user.getUserType() + "'"
+ + " " + "where id = " + "'" + user.getId() + "'";
+ FtpUtil.sqlFileUpload(s1);
+ return R.success("修改成功");
+ }
+
/**
* 删除
*/
@@ -415,33 +438,6 @@
// ExcelUtil.export(response, "用户数据" + DateUtil.time(), "用户数据表", list, UserExcel.class);
// }
- /**
- * 导出保安员证信息
- */
- @GetMapping("export-security-paper")
- public void exportSecurityPaper(UserVO user, HttpServletResponse response) throws IOException {
- //按条件查询成绩数据
- List<ExportSecurityPaperExcel> excels = userService.exportSecurityPaperList(user);
- String fileName = null;
- try {
- response.setContentType("application/vnd.ms-excel");
- response.setCharacterEncoding(org.apache.commons.codec.Charsets.UTF_8.name());
- fileName = URLEncoder.encode("保安员证数据", Charsets.UTF_8.name());
- response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
- //修改单元格格式为文本格式
- EasyExcel.write(response.getOutputStream(), ExportSecurityPaperExcel.class)
- .sheet("保安员证数据表")
- //自定义行高
-// .registerWriteHandler(new CustomCellWriteHeightConfig())
- //自定义宽度
-// .registerWriteHandler(new CustomCellWriteWeightConfig())
- //写入
- .doWrite(excels);
- } catch (Throwable var6) {
- throw var6;
- }
-// ExcelUtil.export(response, "保安员证数据" + DateUtil.time(), "保安员证数据表", excels, ExportSecurityPaperExcel.class);
- }
/**
* 导出模板
@@ -606,6 +602,15 @@
}
/**
+ * 保安员列表树，帅选无保安证,下拉tree
+ */
+ @GetMapping("/security-dispatcher-tree")
+ public R<List<TreeNode>> getSecurityDispatcherTree(UserVO user) {
+ List<TreeNode> tree = userService.getSecurityDispatcherTree(user);
+ return R.data(tree);
+ }
+
+ /**
* 自定义用户列表(只有保安员)
*/
@GetMapping("/selectInr")
@@ -615,12 +620,14 @@
}
@GetMapping("/zc")
- public R zc(String username, String password) {
+ public R zc(String username, String password,String phone) {
User user = new User();
user.setTenantId("000000");
user.setAccount(username);
user.setPassword(DigestUtil.encrypt(password));
+ user.setDeptId("1426355050199945218");
user.setRoleId("1428177141018771458");
+ user.setPhone(phone);
userService.saveOrUpdate(user);
return R.success("注册成功");
}
--
Gitblit v1.9.3