Merge remote-tracking branch 'origin/master'

Administrator

2021-09-18 3b1e22dc8460daafc2ecbae478ddcbe5ea21b944

 src/main/java/org/springblade/modules/investigate/Investigate.java

@@ -12,6 +12,7 @@
import org.springframework.retry.backoff.Sleeper;
import org.springframework.web.bind.annotation.*;

import java.util.Date;
import java.util.List;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
@@ -118,6 +119,8 @@
            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");
@@ -126,21 +129,27 @@
               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() != ""
                     && 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() != ""
                     && 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() != ""
                     && res.getJSONObject(i).get("ztrylx").toString() != "null"
                  ) {
                     user.setExaminationMx(res.getJSONObject(i).get("ztrylx").toString());
                     //更新用户数据
                     userService.updateById(user);