From f2767f4dfa4a17c0a89e584047db4e3d7d91666d Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 27 Aug 2021 15:21:33 +0800
Subject: [PATCH] 派遣记录，单位修改
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 121 +++++++++++++++++++++++++++++++++++-----
1 files changed, 106 insertions(+), 15 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 5f70e52..eea5dfe 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -72,6 +72,7 @@
import javax.validation.Valid;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -226,8 +227,23 @@
public R update(@Valid @RequestBody User user) {
CacheUtil.clear(USER_CACHE);
userService.updateUser(user);
- String birthday = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getBirthday());
- String rtime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getRtime());
+ Date birthday1 = user.getBirthday();
+ String birthday;
+ String rtime;
+ if (user.getBirthday()==null){
+ birthday =null;
+ }
+ else {
+ birthday = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getBirthday());
+ }
+
+ if ( user.getRtime()==null){
+ rtime =null;
+ }
+ else {
+ rtime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getRtime());
+ }
+
String s1 =
"update blade_user set account = " + "'" + user.getAccount()+ "'"
+ ",password = " + "'" + user.getPassword()+"'"
@@ -391,6 +407,40 @@
@ApiOperation(value = "导出模板")
public void exportSecurity(HttpServletResponse response) {
List<UserExcel> list = new ArrayList<>();
+ UserExcel userExcel = new UserExcel();
+ userExcel.setDeptId("xxx保安公司");
+ userExcel.setRealName("张三");
+ userExcel.setEmail("xxx@**.com");
+ userExcel.setPhone("12345678901");
+ userExcel.setSex("男");
+ userExcel.setCardid("360XXX19XXXXXX****");
+ userExcel.setNativeplace("江西南昌");
+ userExcel.setNation("汉");
+ userExcel.setPoliticaloutlook("中共党员");
+ userExcel.setHeight(180);
+ userExcel.setAddress("江西省南昌市******");
+ userExcel.setRegistered("江西南昌");
+ userExcel.setRtime("2021-05-01");
+ userExcel.setHold("是");
+ userExcel.setSecuritynumber("赣洪202100001");
+ list.add(userExcel);
+ UserExcel userExcel1 = new UserExcel();
+ userExcel1.setDeptId("xxx保安公司");
+ userExcel1.setRealName("李四");
+ userExcel1.setEmail("xxx@**.com");
+ userExcel1.setPhone("12345678901");
+ userExcel1.setSex("女");
+ userExcel1.setCardid("360XXX19XXXXXX****");
+ userExcel1.setNativeplace("江西南昌");
+ userExcel1.setNation("汉");
+ userExcel1.setPoliticaloutlook("中共党员");
+ userExcel1.setHeight(180);
+ userExcel1.setAddress("江西省南昌市******");
+ userExcel1.setRegistered("江西南昌");
+ userExcel1.setRtime("2021-05-01");
+ userExcel1.setHold("否");
+ userExcel1.setSecuritynumber("");
+ list.add(userExcel1);
ExcelUtil.export(response, "保安员导入数据模板", "保安员数据表", list, UserExcel.class);
}
@@ -541,24 +591,65 @@
user.setTenantId("000000");
//用户新增
boolean status = userService.save(user);
- //获取从业记录
- List<Experience> experiences = (List<Experience>) userMap.get("userPractitionersInfo");
- if (experiences.size()>0){
- int count = 0;
- for (int i = 0; i < experiences.size(); i++) {
- Experience e = JSON.parseObject(JSON.toJSONString(experiences.get(i)), Experience.class);
- e.setSecurityid(user.getId().toString());
- experienceService.save(e);
- count++;
- }
- if (count < 1) {
- return R.status(false);
- }
+
+ String birthday;
+ String rtime;
+ if (user.getBirthday()==null){
+ birthday =null;
}
+ else {
+ birthday = new SimpleDateFormat("yyyy-MM-dd").format(user.getBirthday());
+ }
+
+ if ( user.getRtime()==null){
+ rtime =null;
+ }
+ else {
+ rtime = new SimpleDateFormat("yyyy-MM-dd").format(user.getRtime());
+ }
+
+
+
+ String s = "insert into blade_user(id,tenant_id,account,password,name,real_name,avatar,email,phone,birthday,sex,role_id,dept_id,cardid,nativePlace,nation,education," +
+ "politicaloutlook,healstats,height,address,registered,rtime,securitynumber,hold,jurisdiction) " +
+ "values(" + "'" + user.getId() + "'" + "," + "'" + 000000 + "'" + "," + "'" + user.getAccount() + "'" + "," +
+ "'" + user.getPassword() + "'" + "," +"'" + user.getName() + "'" + "," + "'" + user.getRealName() + "'" + "," + "'" + user.getAvatar() + "'" + "," +
+ "'" + user.getEmail() + "'" + "," + "'" + user.getPhone() + "'" + "," + "'" + birthday + "'" + "," + "'" + user.getSex() + "'" + "," + "'" + user.getRoleId() + "'" +
+ "," + "'" + user.getDeptId() + "'" + "," + "'" + user.getCardid() + "'" + "," + "'" + user.getNativeplace() + "'" + "," + "'"
+ + user.getNation() + "'" + "," + "'" + user.getEducation() + "'" + "," + "'" + user.getPoliticaloutlook() + "'" + "," + "'" + user.getHealstats() + "'"
+ + "," +"'" + user.getHeight() + "'" + "," + "'" + user.getAddress() + "'" +"," + "'" + user.getRegistered() + "'"+ "," +
+ "'" + rtime + "'"+ "," + "'" + user.getSecuritynumber() + "'"+"," + "'" + user.getHold() + "'"+"," + "'" + user.getJurisdiction() + "'"+")";
+ FtpUtil.sqlFileUpload(s);
+
+ //获取从业记录
+// List<Experience> experiences = (List<Experience>) userMap.get("userPractitionersInfo");
+// if (experiences.size()>0){
+// int count = 0;
+// for (int i = 0; i < experiences.size(); i++) {
+// Experience e = JSON.parseObject(JSON.toJSONString(experiences.get(i)), Experience.class);
+// e.setSecurityid(user.getId().toString());
+// experienceService.save(e);
+// count++;
+// }
+// if (count < 1) {
+// return R.status(false);
+// }
+// }
//判断是否持证是否为空
return R.status(status);
}
+ /**
+ * 保安员信息
+ * @param user
+ * @return
+ */
+ @GetMapping("/getUserDetails")
+ public R getUserDetails(User user) {
+ return R.data(userService.getUserDetails(user));
+ }
+
+
}
--
Gitblit v1.9.3