From f6bce10599c0c87d2ddeeb01085673b1168dbf09 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 29 Nov 2021 15:49:01 +0800
Subject: [PATCH] 人员批量审查修改

---
 src/main/java/org/springblade/modules/investigate/Investigate.java |  103 ++++++++++++++++++++++++++-------------------------
 1 files changed, 53 insertions(+), 50 deletions(-)

diff --git a/src/main/java/org/springblade/modules/investigate/Investigate.java b/src/main/java/org/springblade/modules/investigate/Investigate.java
index 55254b2..455adc8 100644
--- a/src/main/java/org/springblade/modules/investigate/Investigate.java
+++ b/src/main/java/org/springblade/modules/investigate/Investigate.java
@@ -105,8 +105,8 @@
 		//查询用户数据,未删除的,未审核的
 		List<User> users = userService.getNotAuditAllUserList();
 		//遍历
-		users.forEach(InvestigateUtil.consumerWithIndex((user,index) ->{
-			if (null!=user.getCardid() && !user.getCardid().equals("")) {
+		users.forEach(InvestigateUtil.consumerWithIndex((user,index) -> {
+			if (null != user.getCardid() && !user.getCardid().equals("")) {
 				if (index == 1000) {
 					try {
 						Thread.sleep(1000);
@@ -114,47 +114,49 @@
 						e.printStackTrace();
 					}
 				}
+//				System.out.println("cardid = " + user.getCardid());
 				String body = InvestigateUtil.httpGetOne(user.getCardid());
-				JSONObject jsonObject = new JSONObject(body);
-				Object data = jsonObject.get("data");
-				JSONObject jsonData = new JSONObject(data.toString());
-				JSONArray res = jsonData.getJSONArray("res");
-				//设置审核时间
-				user.setAuditTime(new Date());
-				if (res.length() == 0) {
-					//没有数据正常
-					user.setExaminationType("0");
-				} else {
-					int count = 0;
-					user.setExaminationType("1");
-					for (int i = 0; i < res.length(); i++) {
-						if (res.getJSONObject(i).get("zdrylbjh").toString() != null
-							&& res.getJSONObject(i).get("zdrylbjh").toString() != ""
-							&& res.getJSONObject(i).get("zdrylbjh").toString() != "null"
-						) {
-							user.setExaminationMx(res.getJSONObject(i).get("zdrylbjh").toString());
-							//更新用户数据
-							userService.updateById(user);
-							break;
-						}
-						if (res.getJSONObject(i).get("zdryxlmc").toString() != null
-							&& res.getJSONObject(i).get("zdryxlmc").toString() != ""
-							&& res.getJSONObject(i).get("zdryxlmc").toString() != "null"
-						) {
-							user.setExaminationMx(res.getJSONObject(i).get("zdryxlmc").toString());
-							//更新用户数据
-							userService.updateById(user);
-							break;
-						}
-						if (res.getJSONObject(i).get("ztrylx").toString() != null
-							&& res.getJSONObject(i).get("ztrylx").toString() != ""
-							&& res.getJSONObject(i).get("ztrylx").toString() != "null"
-						) {
-							user.setExaminationMx(res.getJSONObject(i).get("ztrylx").toString());
-							//更新用户数据
-							userService.updateById(user);
-							break;
-						}
+				if (null != body && !body.equals("")) {
+					JSONObject jsonObject = new JSONObject(body);
+					Object data = jsonObject.get("data");
+					JSONObject jsonData = new JSONObject(data.toString());
+					JSONArray res = jsonData.getJSONArray("res");
+					//设置审核时间
+					user.setAuditTime(new Date());
+					if (res.length() == 0) {
+						//没有数据正常
+						user.setExaminationType("0");
+					} else {
+						int count = 0;
+						user.setExaminationType("1");
+						for (int i = 0; i < res.length(); i++) {
+							if (res.getJSONObject(i).get("zdrylbjh").toString() != null
+								&& res.getJSONObject(i).get("zdrylbjh").toString() != ""
+								&& res.getJSONObject(i).get("zdrylbjh").toString() != "null"
+							) {
+								user.setExaminationMx(res.getJSONObject(i).get("zdrylbjh").toString());
+								//更新用户数据
+								userService.updateById(user);
+								break;
+							}
+							if (res.getJSONObject(i).get("zdryxlmc").toString() != null
+								&& res.getJSONObject(i).get("zdryxlmc").toString() != ""
+								&& res.getJSONObject(i).get("zdryxlmc").toString() != "null"
+							) {
+								user.setExaminationMx(res.getJSONObject(i).get("zdryxlmc").toString());
+								//更新用户数据
+								userService.updateById(user);
+								break;
+							}
+							if (res.getJSONObject(i).get("ztrylx").toString() != null
+								&& res.getJSONObject(i).get("ztrylx").toString() != ""
+								&& res.getJSONObject(i).get("ztrylx").toString() != "null"
+							) {
+								user.setExaminationMx(res.getJSONObject(i).get("ztrylx").toString());
+								//更新用户数据
+								userService.updateById(user);
+								break;
+							}
 //						if (res.getJSONObject(i).get("ajlbmc").toString() != null
 //							&& res.getJSONObject(i).get("ajlbmc").toString() != "") {
 //							user.setExaminationMx(res.getJSONObject(i).get("ajlbmc").toString());
@@ -162,17 +164,18 @@
 //							userService.updateById(user);
 //							break;
 //						}
-						count++;
-						//条件中的数据都为空,则审查为正常
-						if (count==res.length()){
-							//更新用户数据,设为正常
-							user.setExaminationType("0");
-							userService.updateById(user);
+							count++;
+							//条件中的数据都为空,则审查为正常
+							if (count == res.length()) {
+								//更新用户数据,设为正常
+								user.setExaminationType("0");
+								userService.updateById(user);
+							}
 						}
 					}
+					//更新用户数据
+					userService.updateById(user);
 				}
-				//更新用户数据
-				userService.updateById(user);
 			}
 		}));
 		return R.data(users.size());

--
Gitblit v1.9.3