From a9ec32e3db22fa4f5f44fa2b68e92862c1f58a5d Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 25 Nov 2021 15:22:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 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 6ec56d2..56ebdec 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -54,7 +54,9 @@
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -165,18 +167,18 @@
public R submit(@Valid @RequestBody User user) {
CacheUtil.clear(USER_CACHE);
//资格审查
- String body = InvestigateUtil.httpGetOne(user.getCardid());
- JSONObject jsonObject = new JSONObject(body);
- String data = jsonObject.get("data").toString();
- JSONObject jsonData = new JSONObject(data);
- JSONArray res = jsonData.getJSONArray("res");
- if (res.length()==0){
- //没有数据正常
- user.setExaminationType("0");
- }else {
- user.setExaminationType("1");
- user.setExaminationMx(res.getJSONObject(0).get("zdrylbjh").toString());
- }
+// String body = InvestigateUtil.httpGetOne(user.getCardid());
+// JSONObject jsonObject = new JSONObject(body);
+// String data = jsonObject.get("data").toString();
+// JSONObject jsonData = new JSONObject(data);
+// JSONArray res = jsonData.getJSONArray("res");
+// if (res.length()==0){
+// //没有数据正常
+// user.setExaminationType("0");
+// }else {
+// user.setExaminationType("1");
+// user.setExaminationMx(res.getJSONObject(0).get("zdrylbjh").toString());
+// }
return R.status(userService.submit(user));
}
@@ -355,8 +357,10 @@
@GetMapping("/updateUser")
- public R updateUser(String hold,String cardid) {
- userService.updateUser(hold, cardid);
+ public R updateUser(String hold,String cardid,String holdv) {
+ SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//设置日期格式
+ String time = df.format(new Date());
+ userService.updateUser(hold, cardid,holdv,time);
return R.success("吊销成功");
}
--
Gitblit v1.9.3