From 839cd39a9cfc49e5eaf73739549cf3f9e2725666 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 26 Oct 2021 21:56:24 +0800
Subject: [PATCH] 1.现场检查接口修改 2.车辆位置新增接口 3.成绩导出接口修改 4.公司信息接口修改，新增创建时间和创建人
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 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 6c4ee81..3dd2e6e 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -242,6 +242,14 @@
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 =
"update blade_user set account = " + "'" + user.getAccount() + "'"
+ ",name = " + "'" + user.getName() + "'"
@@ -262,6 +270,7 @@
+ ",address = " + "'" + user.getAddress() + "'"
+ ",registered = " + "'" + user.getRegistered() + "'"
+ ",rtime = " + "'" + rtime + "'"
+ + ",paper_time = " + "'" + paperTime + "'"
+ ",securitynumber = " + "'" + user.getSecuritynumber() + "'"
+ ",hold = " + "'" + user.getHold() + "'"
+ ",jurisdiction = " + "'" + user.getJurisdiction() + "'"
@@ -627,10 +636,17 @@
//用户新增
boolean status = userService.save(user);
String rtime;
+ String paperTime;
if (user.getRtime() == null) {
rtime = null;
} else {
rtime = new SimpleDateFormat("yyyy-MM-dd").format(user.getRtime());
+ }
+ //发证日期处理
+ if (user.getPaperTime() == null) {
+ paperTime = null;
+ } else {
+ paperTime = new SimpleDateFormat("yyyy-MM-dd").format(user.getPaperTime());
}
//头像
if (null!=user.getAvatar() && !user.getAvatar().equals("")) {
@@ -643,7 +659,7 @@
}
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) " +
+ "politicaloutlook,healstats,height,address,registered,paper_time,rtime,securitynumber,hold,jurisdiction,examination_type,status,is_deleted,dispatch) " +
"values(" + "'" + user.getId() + "'" +
"," + "'" + user.getTenantId() + "'" +
"," + "'" + user.getAccount() + "'" +
@@ -666,6 +682,7 @@
+ "," + "'" + user.getHeight() + "'" +
"," + "'" + user.getAddress() + "'" +
"," + "'" + user.getRegistered() + "'" + "," +
+ "'" + paperTime + "'" +
"'" + rtime + "'" +
"," + "'" + user.getSecuritynumber() + "'" +
"," + "'" + user.getHold() + "'" +
--
Gitblit v1.9.3