From 116143f2237156ff892d6951d6943285fa304f0e Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 08 Dec 2021 17:33:23 +0800
Subject: [PATCH] 考试成绩查询，导出修改，实操成绩导入去除准考证号，保安员导入新增身份证住址校验
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 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 2caf315..e576865 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -281,7 +281,7 @@
public R update(@Valid @RequestBody User user) throws Exception {
CacheUtil.clear(USER_CACHE);
User user1 = userService.getById(user.getId());
- String url = null;
+ String url = "";
if (null!=user.getFingerprint() && !user.getFingerprint().equals("")) {
if (user.getFingerprint().length()>100) {
//指纹图片上传并返回url
@@ -295,7 +295,7 @@
//如果是离职
if (null!=user.getStatus()){
- if (user.getStatus()==2){
+ if (user.getStatus().equals(2)){
//修改派遣状态
user.setDispatch("1");
//同时将派遣记录中的派遣状态修改
@@ -368,6 +368,14 @@
+ ")";
FtpUtil.sqlFileUpload(s);
}
+
+ userService.updateById(user);
+ //内网更新
+ String s1 =
+ "update blade_user set status = " + "'" + user.getStatus() + "'"
+ + " " + "where id = " + "'" + user.getId() + "'";
+ FtpUtil.sqlFileUpload(s1);
+ return R.success("修改成功");
}
}
@@ -380,6 +388,7 @@
}
user.setPassword(user1.getPassword());
+ user.setUpdateTime(new Date());
userService.updateById(user);
String rtime;
if (user.getRtime() == null) {
@@ -416,6 +425,7 @@
+ ",jurisdiction = " + "'" + user.getJurisdiction() + "'"
+ ",reason_for_leav = " + "'" + user.getReasonForLeav() + "'"
+ ",guncode = " + "'" + user.getGuncode() + "'"
+ + ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "'"
+ " " + "where id = " + "'" + user.getId() + "'";
FtpUtil.sqlFileUpload(s1);
return R.success("修改成功");
@@ -438,7 +448,8 @@
url = split[1];
}
}
-
+ user.setUpdateTime(new Date());
+ //更新
userService.updateById(user);
//内网同步
@@ -454,6 +465,7 @@
+ ",address = " + "'" + user.getAddress() + "'"
+ ",registered = " + "'" + user.getRegistered() + "'"
+ ",securitynumber = " + "'" + user.getSecuritynumber() + "'"
+ + ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "'"
+ ",hold = " + "'" + user.getHold() + "'"
+ ",cell = " + "'" + user.getCell() + "'"
+ " " + "where id = " + "'" + user.getId() + "'";
@@ -526,6 +538,7 @@
@PostMapping("/updatePaperTime")
public R updatePaperTime(@RequestBody User user) {
user.setPaperTime(new Date());
+ user.setUpdateTime(new Date());
userService.updateById(user);
String paperTime = null;
//发证日期处理
@@ -537,6 +550,7 @@
String s1 =
"update blade_user set paper_time = " + "'" + paperTime + "'"
+ ",user_type = " + "'" + user.getUserType() + "'"
+ + ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "'"
+ " " + "where id = " + "'" + user.getId() + "'";
FtpUtil.sqlFileUpload(s1);
return R.success("修改成功");
@@ -970,14 +984,16 @@
if(!user2.getDeptId().equals(user.getDeptId())) {
user2.setStatus(2);
//先将原有人员离职 cell 1:手动录入 2：自动录入
+ user2.setUpdateTime(new Date());
userService.updateById(user2);
//内网同步
String s1 = "update blade_user set status = " + user2.getStatus() +
+ ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user2.getUpdateTime()) + "'" +
" where id = " + "'" + user2.getId() + "'";
FtpUtil.sqlFileUpload(s1);
//人员离职后修改派遣记录，修改从业记录
- updateUserDispatcherExp(user);
+ updateUserDispatcherExp(user2);
}else {
throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
}
@@ -990,7 +1006,7 @@
}
}
- String url = null;
+ String url = "";
if (null!=user.getFingerprint() && !user.getFingerprint().equals("")) {
if (user.getFingerprint().length()>100) {
String s = uploadBase64String(user);
@@ -1015,6 +1031,7 @@
//取身份证号码后6位作为密码
user.setPassword(DigestUtil.encrypt(user.getCardid().substring(user.getCardid().length() - 6)));
}
+ user.setCreateTime(new Date());
user.setTenantId("000000");
//用户新增
boolean status = userService.save(user);
@@ -1055,7 +1072,7 @@
"id,tenant_id,account,password,name,real_name,avatar,email,phone,sex," +
"role_id,dept_id,cardid,nativePlace,nation,fingerprint,education," +
"politicaloutlook,healstats,height,address,registered,rtime," +
- "securitynumber,hold,jurisdiction,examination_type,status,is_deleted,dispatch,guncode,cell) " +
+ "securitynumber,hold,jurisdiction,examination_type,status,is_deleted,dispatch,guncode,create_time,cell) " +
"values(" + "'" + user.getId() + "'" +
"," + "'" + user.getTenantId() + "'" +
"," + "'" + user.getAccount() + "'" +
@@ -1087,6 +1104,7 @@
"," + "'" + user.getIsDeleted() + "'" +
"," + "'" + user.getDispatch() + "'" +
"," + "'" + user.getGuncode() + "'" +
+ "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getCreateTime()) + "'" +
"," + "'" + user.getCell() + "'" + ");"+
"insert into sys_experience(id,name,post,entryTime," +
"cardId,companyname,securityId) " +
--
Gitblit v1.9.3