From 247abfbc0b322a04f8dc5fcf01fe7989b25fd7e9 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 04 Nov 2021 10:35:29 +0800
Subject: [PATCH] 保安员发证时间更新接口新增
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 98 +++++++++++++++++++++++++++++++++----------------
1 files changed, 66 insertions(+), 32 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 b34520c..7c0f4c9 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -33,6 +33,8 @@
import org.springblade.common.cache.DictCache;
import org.springblade.common.config.FtpConfig;
import org.springblade.common.enums.DictEnum;
+import org.springblade.common.excel.CustomCellWriteHeightConfig;
+import org.springblade.common.excel.CustomCellWriteWeightConfig;
import org.springblade.common.excel.RowWriteHandler;
import org.springblade.common.utils.arg;
import org.springblade.core.cache.utils.CacheUtil;
@@ -50,6 +52,7 @@
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.*;
import org.springblade.modules.FTP.FtpUtil;
+import org.springblade.modules.exam.excel.ExportExamScoreExcel;
import org.springblade.modules.experience.entity.Experience;
import org.springblade.modules.experience.service.IExperienceService;
import org.springblade.modules.jurisdiction.entity.Jurisdiction;
@@ -235,19 +238,19 @@
User user1 = userService.getById(user.getId());
user.setPassword(user1.getPassword());
userService.updateById(user);
- 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").format(user.getRtime());
+ }
+
+ String paperTime;
+ //发证日期处理
+ if (user.getPaperTime() == null) {
+ paperTime = null;
+ } else {
+ paperTime = new SimpleDateFormat("yyyy-MM-dd").format(user.getPaperTime());
}
String s1 =
@@ -274,6 +277,28 @@
+ ",hold = " + "'" + user.getHold() + "'"
+ ",jurisdiction = " + "'" + user.getJurisdiction() + "'"
+ ",reason_for_leav = " + "'" + user.getReasonForLeav() + "'"
+ + " " + "where id = " + "'" + user.getId() + "'";
+ FtpUtil.sqlFileUpload(s1);
+ 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 + "'"
+ " " + "where id = " + "'" + user.getId() + "'";
FtpUtil.sqlFileUpload(s1);
return R.success("修改成功");
@@ -411,6 +436,7 @@
// List<UserExcel> list = userService.exportUser(queryWrapper);
// ExcelUtil.export(response, "用户数据" + DateUtil.time(), "用户数据表", list, UserExcel.class);
// }
+
/**
* 导出模板
@@ -602,10 +628,6 @@
public R securitySave(@Valid @RequestBody Map<String, Object> userMap) {
//获取user
User user = JSON.parseObject(JSON.toJSONString(userMap.get("user")), User.class);
- //判断是否为空
-// if (null!=user.getHold()){
- //持证
-// if (user.getHold().equals("1")){
//分配保安角色
Role role = new Role();
role.setRoleAlias("保安");
@@ -613,6 +635,7 @@
user.setRoleId(oneRole.getId().toString());
user.setDispatch("1");
user.setExaminationType("0");
+ user.setAccount(user.getCardid());
Integer userCount = userService.selectCount(user.getAccount());
if (userCount > 0 && Func.isEmpty(user.getId())) {
@@ -629,27 +652,27 @@
// }
// }
//密码加密
- if (Func.isNotEmpty(user.getPassword())) {
- user.setPassword(DigestUtil.encrypt(user.getPassword()));
+ if (Func.isNotEmpty(user.getCardid())) {
+// user.setPassword(DigestUtil.encrypt(user.getPassword()));
+ //取身份证号码后6位作为密码
+ user.setPassword(DigestUtil.encrypt(user.getCardid().substring(user.getCardid().length() - 6)));
}
user.setTenantId("000000");
//用户新增
boolean status = userService.save(user);
-
- String birthday;
String rtime;
- if (user.getBirthday() == null) {
- birthday = null;
- } else {
- birthday = new SimpleDateFormat("yyyy-MM-dd").format(user.getBirthday());
- }
-
+ String paperTime;
if (user.getRtime() == null) {
rtime = null;
} else {
rtime = new SimpleDateFormat("yyyy-MM-dd").format(user.getRtime());
}
-
+ //发证日期处理
+ 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));
@@ -660,11 +683,22 @@
user.setFingerprint(FtpConfig.ip + user.getFingerprint().substring(26));
}
- String s = "insert into blade_user(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) " +
- "values(" + "'" + user.getId() + "'" + "," + "'" + user.getTenantId() + "'" + "," + "'" + user.getAccount() + "'" + "," +
- "'" + user.getPassword() + "'" + "," + "'" + user.getName() + "'" + "," + "'" + user.getRealName() + "'" + "," + "'" + user.getAvatar() + "'" + "," +
- "'" + user.getEmail() + "'" + "," + "'" + user.getPhone() + "'" + "," + "'" + user.getSex() + "'" + "," + "'" + user.getRoleId() + "'" +
+ String s = "insert into blade_user(" +
+ "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) " +
+ "values(" + "'" + user.getId() + "'" +
+ "," + "'" + user.getTenantId() + "'" +
+ "," + "'" + user.getAccount() + "'" +
+ "," + "'" + user.getPassword() + "'" +
+ "," + "'" + user.getName() + "'" +
+ "," + "'" + user.getRealName() + "'" +
+ "," + "'" + user.getAvatar() + "'" +
+ "," + "'" + user.getEmail() + "'" +
+ "," + "'" + user.getPhone() + "'" +
+ "," + "'" + user.getSex() + "'" +
+ "," + "'" + user.getRoleId() + "'" +
"," + "'" + user.getDeptId() + "'" +
"," + "'" + user.getCardid() + "'" +
"," + "'" + user.getNativeplace() + "'" +
@@ -672,11 +706,11 @@
"," + "'" + user.getFingerprint() + "'" +
"," + "'" + user.getEducation() + "'" +
"," + "'" + user.getPoliticaloutlook() + "'" +
- "," + "'" + user.getHealstats() + "'"
- + "," + "'" + user.getHeight() + "'" +
+ "," + "'" + user.getHealstats() + "'"+
+ "," + "'" + user.getHeight() + "'" +
"," + "'" + user.getAddress() + "'" +
- "," + "'" + user.getRegistered() + "'" + "," +
- "'" + rtime + "'" +
+ "," + "'" + user.getRegistered() + "'" +
+ "," +"'" + rtime + "'" +
"," + "'" + user.getSecuritynumber() + "'" +
"," + "'" + user.getHold() + "'" +
"," + "'" + user.getJurisdiction() + "'" +
--
Gitblit v1.9.3