From 00754b2fb8e71be738e6c312e11d62e64a4e82c3 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 10 Dec 2021 17:13:59 +0800
Subject: [PATCH] 1.二维码批量生成修改，新增图片批量下载 2.用户修改 rtime bug 修改
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 329 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 285 insertions(+), 44 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 91c62c4..2fcbd89 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -62,6 +62,8 @@
import org.springblade.modules.experience.service.IExperienceService;
import org.springblade.modules.jurisdiction.entity.Jurisdiction;
import org.springblade.modules.jurisdiction.service.JurisdictionService;
+import org.springblade.modules.signinrecords.entity.SignInRecords;
+import org.springblade.modules.signinrecords.service.SignInRecordsService;
import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.entity.Role;
import org.springblade.modules.system.entity.User;
@@ -73,6 +75,8 @@
import org.springblade.modules.system.vo.DeptVO;
import org.springblade.modules.system.vo.UserVO;
import org.springblade.modules.system.wrapper.UserWrapper;
+import org.springblade.modules.training.entity.TrainingRegistration;
+import org.springblade.modules.training.service.TrainingRegistrationService;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -115,6 +119,11 @@
private final JurisdictionService jurisdictionService;
private final IDispatcherService dispatcherService;
+
+ private final SignInRecordsService signInRecordsService;
+
+
+ private final TrainingRegistrationService trainingRegistrationService;
/**
* 查询单条
@@ -281,7 +290,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 +304,7 @@
//如果是离职
if (null!=user.getStatus()){
- if (user.getStatus()==2){
+ if (user.getStatus().equals(2)){
//修改派遣状态
user.setDispatch("1");
//同时将派遣记录中的派遣状态修改
@@ -308,6 +317,8 @@
dispatcherList.forEach(dispatcher1 -> {
dispatcher1.setStatus(1);
dispatcher1.setUpdateTime(new Date());
+ dispatcherService.updateById(dispatcher1);
+
String s1 =
"update sys_dispatcher set status = " + "'" + dispatcher1.getStatus() + "'"
+ ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(dispatcher1.getUpdateTime()) + "'"
@@ -315,6 +326,65 @@
FtpUtil.sqlFileUpload(s1);
});
}
+
+ //查询当前用户是否有从业记录，没有的话新增，有就更新
+ //根据公司名查询单位
+ Dept dept = iDeptService.getById(user.getDeptId());
+ Experience experience = new Experience();
+ experience.setCompanyname(dept.getDeptName());
+ experience.setCardid(user.getCardid());
+ //按id降序
+ List<Experience> list = experienceService.list(Condition.getQueryWrapper(experience).orderByDesc("id"));
+ if (list.size()>0){
+ //如果有多条取第一条更新
+ Experience experience1 = list.get(0);
+ //设置离职时间
+ experience1.setDeparturetime(new Date());
+ //更新从业记录信息
+ experienceService.updateById(experience1);
+ //数据同步
+ String s1 =
+ "update sys_experience set departureTime = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(experience1.getDeparturetime()) + "'"
+ + " " + "where id = " + "'" + experience1.getId() + "'";
+ FtpUtil.sqlFileUpload(s1);
+ }else {
+ //新增
+ if (null!=user.getRtime()){
+ experience.setEntrytime(user.getRtime());
+ }else {
+ experience.setEntrytime(new Date());
+ }
+ experience.setDeparturetime(new Date());
+ experience.setName(user.getRealName());
+ if (null!=user.getReasonForLeav() && !user.getReasonForLeav().equals("")){
+ experience.setLeaving(user.getReasonForLeav());
+ }
+ experience.setCardid(user.getCardid());
+ experience.setSecurityid(user.getId().toString());
+ //新增
+ experienceService.save(experience);
+
+ //内网同步
+ String s = "insert into sys_experience(id,name,entryTime,departureTime,leaving,cardId,companyname,securityId) " +
+ "values(" + "'" + experience.getId() + "'" +
+ "," + "'" + experience.getName() + "'" +
+ "," + "'" + new SimpleDateFormat("yyyy-MM-dd").format(experience.getEntrytime()) + "'" +
+ "," + "'" + new SimpleDateFormat("yyyy-MM-dd").format(experience.getDeparturetime()) + "'" +
+ "," + "'" + experience.getLeaving() + "'" +
+ "," + "'" + experience.getCardid() + "'" +
+ "," + "'" + experience.getCompanyname() + "'" +
+ "," + "'" + experience.getSecurityid() + "'"
+ + ")";
+ 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("修改成功");
}
}
@@ -327,44 +397,74 @@
}
user.setPassword(user1.getPassword());
+ user.setUpdateTime(new Date());
userService.updateById(user);
String rtime;
if (user.getRtime() == null) {
- rtime = null;
+ String s1 =
+ "update blade_user set account = " + "'" + user.getAccount() + "'"
+ + ",name = " + "'" + user.getName() + "'"
+ + ",real_name = " + "'" + user.getRealName() + "'"
+ + ",avatar = " + "'" + user.getAvatar() + "'"
+ + ",email = " + "'" + user.getEmail() + "'"
+ + ",phone = " + "'" + user.getPhone() + "'"
+ + ",sex = " + "'" + user.getSex() + "'"
+ + ",role_id = " + "'" + user.getRoleId() + "'"
+ + ",dept_id = " + "'" + user.getDeptId() + "'"
+ + ",cardid = " + "'" + user.getCardid() + "'"
+ + ",nativePlace = " + "'" + user.getNativeplace() + "'"
+ + ",nation = " + "'" + user.getNation() + "'"
+ + ",education = " + "'" + user.getEducation() + "'"
+ + ",politicaloutlook = " + "'" + user.getPoliticaloutlook() + "'"
+ + ",healstats = " + "'" + user.getHealstats() + "'"
+ + ",height = " + "'" + user.getHeight() + "'"
+ + ",fingerprint = " + "'" + url + "'"
+ + ",my_picture = " + "'" + user.getMyPicture() + "'"
+ + ",address = " + "'" + user.getAddress() + "'"
+ + ",registered = " + "'" + user.getRegistered() + "'"
+ + ",dispatch = " + "'" + user.getDispatch() + "'"
+ + ",securitynumber = " + "'" + user.getSecuritynumber() + "'"
+ + ",hold = " + "'" + user.getHold() + "'"
+ + ",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);
} else {
rtime = new SimpleDateFormat("yyyy-MM-dd").format(user.getRtime());
+ String s1 =
+ "update blade_user set account = " + "'" + user.getAccount() + "'"
+ + ",name = " + "'" + user.getName() + "'"
+ + ",real_name = " + "'" + user.getRealName() + "'"
+ + ",avatar = " + "'" + user.getAvatar() + "'"
+ + ",email = " + "'" + user.getEmail() + "'"
+ + ",phone = " + "'" + user.getPhone() + "'"
+ + ",sex = " + "'" + user.getSex() + "'"
+ + ",role_id = " + "'" + user.getRoleId() + "'"
+ + ",dept_id = " + "'" + user.getDeptId() + "'"
+ + ",cardid = " + "'" + user.getCardid() + "'"
+ + ",nativePlace = " + "'" + user.getNativeplace() + "'"
+ + ",nation = " + "'" + user.getNation() + "'"
+ + ",education = " + "'" + user.getEducation() + "'"
+ + ",politicaloutlook = " + "'" + user.getPoliticaloutlook() + "'"
+ + ",healstats = " + "'" + user.getHealstats() + "'"
+ + ",height = " + "'" + user.getHeight() + "'"
+ + ",fingerprint = " + "'" + url + "'"
+ + ",my_picture = " + "'" + user.getMyPicture() + "'"
+ + ",address = " + "'" + user.getAddress() + "'"
+ + ",registered = " + "'" + user.getRegistered() + "'"
+ + ",rtime = " + "'" + rtime + "'"
+ + ",dispatch = " + "'" + user.getDispatch() + "'"
+ + ",securitynumber = " + "'" + user.getSecuritynumber() + "'"
+ + ",hold = " + "'" + user.getHold() + "'"
+ + ",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);
}
-
- String s1 =
- "update blade_user set account = " + "'" + user.getAccount() + "'"
- + ",name = " + "'" + user.getName() + "'"
- + ",real_name = " + "'" + user.getRealName() + "'"
- + ",avatar = " + "'" + user.getAvatar() + "'"
- + ",email = " + "'" + user.getEmail() + "'"
- + ",phone = " + "'" + user.getPhone() + "'"
- + ",sex = " + "'" + user.getSex() + "'"
- + ",role_id = " + "'" + user.getRoleId() + "'"
- + ",dept_id = " + "'" + user.getDeptId() + "'"
- + ",cardid = " + "'" + user.getCardid() + "'"
- + ",nativePlace = " + "'" + user.getNativeplace() + "'"
- + ",nation = " + "'" + user.getNation() + "'"
- + ",education = " + "'" + user.getEducation() + "'"
- + ",politicaloutlook = " + "'" + user.getPoliticaloutlook() + "'"
- + ",healstats = " + "'" + user.getHealstats() + "'"
- + ",height = " + "'" + user.getHeight() + "'"
- + ",fingerprint = " + "'" + url + "'"
- + ",my_picture = " + "'" + user.getMyPicture() + "'"
- + ",address = " + "'" + user.getAddress() + "'"
- + ",registered = " + "'" + user.getRegistered() + "'"
- + ",rtime = " + "'" + rtime + "'"
- + ",dispatch = " + "'" + user.getDispatch() + "'"
- + ",securitynumber = " + "'" + user.getSecuritynumber() + "'"
- + ",hold = " + "'" + user.getHold() + "'"
- + ",jurisdiction = " + "'" + user.getJurisdiction() + "'"
- + ",reason_for_leav = " + "'" + user.getReasonForLeav() + "'"
- + ",guncode = " + "'" + user.getGuncode() + "'"
- + " " + "where id = " + "'" + user.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
return R.success("修改成功");
}
@@ -373,7 +473,7 @@
* 修改
*/
@PostMapping("/updateUserInfo")
- public R updateUserInfo(@Valid @RequestBody User user) throws Exception {
+ public R updateUserInfo(@Valid @RequestBody UserVO user) throws Exception {
String url = null;
if (null!=user.getFingerprint() && !user.getFingerprint().equals("")) {
if (user.getFingerprint().length()>100) {
@@ -385,8 +485,38 @@
url = split[1];
}
}
-
+ user.setUpdateTime(new Date());
+ //更新
userService.updateById(user);
+
+ //生成签到记录
+ if (null!=user.getCandidateNo() && !user.getCandidateNo().equals("")){
+ //查询签到记录，如果已有，则更新，没有就新增
+ SignInRecords signInRecords = new SignInRecords();
+ signInRecords.setCandidateNo(user.getCandidateNo());
+ SignInRecords inRecordsServiceOne = signInRecordsService.getOne(Condition.getQueryWrapper(signInRecords));
+ //如果为null
+ if (null==inRecordsServiceOne){
+ //查询报名信息
+ TrainingRegistration trainingRegistration = new TrainingRegistration();
+ trainingRegistration.setCandidateNo(user.getCandidateNo());
+ TrainingRegistration one = trainingRegistrationService.getOne(Condition.getQueryWrapper(trainingRegistration));
+ //新增,数据封装
+ SignInRecords sign = new SignInRecords();
+ sign.setCreateTime(new Date());
+ sign.setUpdateTime(new Date());
+ sign.setCandidateNo(user.getCandidateNo());
+ sign.setUserId(user.getId());
+ sign.setApplyId(one.getId());
+ sign.setExamId(Long.parseLong(one.getTrainExamId()));
+ //新增
+ signInRecordsService.save(sign);
+ }else {
+ //更新
+ inRecordsServiceOne.setUpdateTime(new Date());
+ signInRecordsService.updateById(inRecordsServiceOne);
+ }
+ }
//内网同步
String s1 =
@@ -401,6 +531,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() + "'";
@@ -473,6 +604,7 @@
@PostMapping("/updatePaperTime")
public R updatePaperTime(@RequestBody User user) {
user.setPaperTime(new Date());
+ user.setUpdateTime(new Date());
userService.updateById(user);
String paperTime = null;
//发证日期处理
@@ -484,6 +616,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("修改成功");
@@ -917,11 +1050,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(user2);
}else {
throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
}
@@ -934,7 +1072,7 @@
}
}
- String url = null;
+ String url = "";
if (null!=user.getFingerprint() && !user.getFingerprint().equals("")) {
if (user.getFingerprint().length()>100) {
String s = uploadBase64String(user);
@@ -959,22 +1097,38 @@
//取身份证号码后6位作为密码
user.setPassword(DigestUtil.encrypt(user.getCardid().substring(user.getCardid().length() - 6)));
}
+ user.setCreateTime(new Date());
user.setTenantId("000000");
//用户新增
boolean status = userService.save(user);
+
+ //从业记录新增
+ Experience experience = new Experience();
+
String rtime;
String paperTime;
if (user.getRtime() == null) {
rtime = null;
} else {
rtime = new SimpleDateFormat("yyyy-MM-dd").format(user.getRtime());
+ experience.setEntrytime(user.getRtime());
}
+
+ Dept dept = iDeptService.getById(user.getDeptId());
+ experience.setCardid(user.getCardid());
+ experience.setSecurityid(user.getId().toString());
+ experience.setCompanyname(dept.getDeptName());
+ experience.setName(user.getRealName());
+ experience.setPost("保安员");
+ experienceService.save(experience);
+
+
//发证日期处理
- if (user.getPaperTime() == null) {
- paperTime = "";
- } else {
- paperTime = new SimpleDateFormat("yyyy-MM-dd").format(user.getPaperTime());
- }
+// if (user.getPaperTime() == null) {
+// paperTime = "";
+// } else {
+// paperTime = new SimpleDateFormat("yyyy-MM-dd").format(user.getPaperTime());
+// }
//头像
if (null!=user.getAvatar() && !user.getAvatar().equals("")) {
user.setAvatar(FtpConfig.ip + user.getAvatar().substring(26));
@@ -984,7 +1138,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() + "'" +
@@ -1016,7 +1170,18 @@
"," + "'" + user.getIsDeleted() + "'" +
"," + "'" + user.getDispatch() + "'" +
"," + "'" + user.getGuncode() + "'" +
- "," + "'" + user.getCell() + "'" + ")";
+ "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getCreateTime()) + "'" +
+ "," + "'" + user.getCell() + "'" + ");"+
+ "insert into sys_experience(id,name,post,entryTime," +
+ "cardId,companyname,securityId) " +
+ "values(" + "'" + experience.getId() + "'" + "," +
+ "'" + experience.getName() + "'" + "," +
+ "'" + experience.getPost() + "'" + "," +
+ "," + "'" + new SimpleDateFormat("yyyy-MM-dd").format(experience.getEntrytime()) + "'" +
+ "," + "'" + experience.getCardid() + "'" +
+ "," + "'" + experience.getCompanyname() + "'" +
+ "," + "'" + experience.getSecurityid() + "'"
+ + ")";
FtpUtil.sqlFileUpload(s);
//获取从业记录
@@ -1037,6 +1202,82 @@
return R.status(status);
}
+ /**
+ * 修改派遣记录，修改从业记录
+ * @param user
+ */
+ private void updateUserDispatcherExp(User user) {
+ //修改派遣状态
+ user.setDispatch("1");
+ //同时将派遣记录中的派遣状态修改
+ //查询派遣记录(还在派遣中的)
+ Dispatcher dispatcher = new Dispatcher();
+ dispatcher.setUserIds(user.getId().toString());
+ dispatcher.setStatus(0);
+ List<Dispatcher> dispatcherList = dispatcherService.list(Condition.getQueryWrapper(dispatcher));
+ if (dispatcherList.size()>0){
+ dispatcherList.forEach(dispatcher1 -> {
+ dispatcher1.setStatus(1);
+ dispatcher1.setUpdateTime(new Date());
+ String s1 =
+ "update sys_dispatcher set status = " + "'" + dispatcher1.getStatus() + "'"
+ + ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(dispatcher1.getUpdateTime()) + "'"
+ + " " + "where id = " + "'" + dispatcher1.getId() + "'";
+ FtpUtil.sqlFileUpload(s1);
+ });
+ }
+
+ //查询当前用户是否有从业记录，没有的话新增，有就更新
+ //根据公司名查询单位
+ Dept dept = iDeptService.getById(user.getDeptId());
+ Experience experience = new Experience();
+ experience.setCompanyname(dept.getDeptName());
+ //按id降序
+ List<Experience> list = experienceService.list(Condition.getQueryWrapper(experience).orderByDesc("id"));
+ if (list.size()>0){
+ //如果有多条取第一条更新
+ Experience experience1 = list.get(0);
+ //设置离职时间
+ experience1.setDeparturetime(new Date());
+ //更新从业记录信息
+ experienceService.updateById(experience1);
+ //数据同步
+ String s1 =
+ "update sys_experience set departureTime = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(experience1.getDeparturetime()) + "'"
+ + " " + "where id = " + "'" + experience1.getId() + "'";
+ FtpUtil.sqlFileUpload(s1);
+ }else {
+ //新增
+ if (null!=user.getRtime()){
+ experience.setEntrytime(user.getRtime());
+ }else {
+ experience.setEntrytime(new Date());
+ }
+ experience.setDeparturetime(new Date());
+ experience.setName(user.getRealName());
+ if (null!=user.getReasonForLeav() && !user.getReasonForLeav().equals("")){
+ experience.setLeaving(user.getReasonForLeav());
+ }
+ experience.setCardid(user.getCardid());
+ experience.setSecurityid(user.getId().toString());
+ //新增
+ experienceService.save(experience);
+
+ //内网同步
+ String s = "insert into sys_experience(id,name,entryTime,departureTime,leaving,cardId,companyname,securityId) " +
+ "values(" + "'" + experience.getId() + "'" + "," +
+ "'" + experience.getName() + "'" + "," +
+ "," + "'" + new SimpleDateFormat("yyyy-MM-dd").format(experience.getEntrytime()) + "'" +
+ "," + "'" + new SimpleDateFormat("yyyy-MM-dd").format(experience.getDeparturetime()) + "'" +
+ "," + "'" + experience.getLeaving() + "'" +
+ "," + "'" + experience.getCardid() + "'" +
+ "," + "'" + experience.getCompanyname() + "'" +
+ "," + "'" + experience.getSecurityid() + "'"
+ + ")";
+ FtpUtil.sqlFileUpload(s);
+ }
+ }
+
/**
* 保安员信息
--
Gitblit v1.9.3