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,39 +119,55 @@
            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() != ""
                     && 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);
                     break;
                  }
                  if (res.getJSONObject(i).get("ajlbmc").toString() != null
                     && res.getJSONObject(i).get("ajlbmc").toString() != "") {
                     user.setExaminationMx(res.getJSONObject(i).get("ajlbmc").toString());
                     //更新用户数据
//                  if (res.getJSONObject(i).get("ajlbmc").toString() != null
//                     && res.getJSONObject(i).get("ajlbmc").toString() != "") {
//                     user.setExaminationMx(res.getJSONObject(i).get("ajlbmc").toString());
//                     //更新用户数据
//                     userService.updateById(user);
//                     break;
//                  }
                  count++;
                  //条件中的数据都为空，则审查为正常
                  if (count==res.length()){
                     //更新用户数据,设为正常
                     user.setExaminationType("0");
                     userService.updateById(user);
                     break;
                  }
               }
            }
@@ -167,14 +184,57 @@
    * @return
    */
   @PostMapping("/investigate/testBody")
   public String testBody(@RequestBody String body){
   public R testBody(@RequestBody String body){
      JSONObject jsonObject = new JSONObject(body);
      Object data = jsonObject.get("data");
      JSONObject jsonData = new JSONObject(data.toString());
      JSONArray jsonArray = jsonData.getJSONArray("res");
      if (jsonArray.length()>0){
         String zdxsfzqkry = jsonArray.getJSONObject(0).get("zdxsfzqkry").toString();
         return zdxsfzqkry;
      JSONArray res = jsonData.getJSONArray("res");
      User user = new User();
      if (res.length()>0){
//         String zdxsfzqkry = res.getJSONObject(0).get("zdxsfzqkry").toString();
         int count = 0;
         for (int i = 0; i < res.length(); i++) {
            System.out.println("res.length() =" + res.length());
            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;
            }
            count++;
            System.out.println("count = " + count);
//            if (res.getJSONObject(i).get("ajlbmc").toString() != null
//               && res.getJSONObject(i).get("ajlbmc").toString() != ""
//               && res.getJSONObject(i).get("ajlbmc").toString() != "null"
//            ) {
//               user.setExaminationMx(res.getJSONObject(i).get("ajlbmc").toString());
//               //更新用户数据
//               userService.updateById(user);
//               break;
//            }
         }
         return R.data(user);
      }
      return null;
   }