两个规定-报检一键提交修改

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PlanTaskServiceImpl.java

@@ -1939,33 +1939,32 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
         // 查询所有的
         Map<String , ESTaskDetailDto> esTaskDetailDtoMap = allESTaskDetailDtos.stream().collect(Collectors.toMap(ESTaskDetailDto::getId, Function.identity()));
         // 只更新未完成状态
-        planTaskDetails.stream().filter(p-> PlanTaskDetailStatusEnum.NOTSTARTED.getValue().equals(p.getStatus())).collect(Collectors.toList()).forEach(planTaskDetail -> {
+        planTaskDetails.stream().filter(p -> PlanTaskDetailStatusEnum.NOTSTARTED.getValue().equals(p.getStatus())).collect(Collectors.toList()).forEach(planTaskDetail -> {
             ESTaskDetailDto esTaskDetailDto = esTaskDetailDtoMap.get(Objects.toString(planTaskDetail.getId()));
             JSONObject appCheckInput = esTaskDetailDto.getAppCheckInput();
             Map<String, List<Map<String, Object>>> mapList = (Map<String, List<Map<String, Object>>>) JSON.parse(appCheckInput.toJSONString());
-            if (mapList.isEmpty()) {
-                return;
-            }
-            List<AppCheckInputRespone> appCheckInputRespones = new ArrayList<>();
-            for (Map<String, Object> map : mapList.get("items")) {
-                AppCheckInputRespone appCheckInputRespone = new AppCheckInputRespone();
-                BeanUtil.copyProperties(map, appCheckInputRespone);
-                InputItem inputItem = inputItemDao.getOne(Long.parseLong(map.get("checkInputId").toString()));
-                CheckInput checkInput = new CheckInput();
-                String itemType = String.valueOf(map.get("itemType"));
-                if (XJConstant.INPUT_ITEM_SELECT.equals(itemType)) {
-                    paraseSelect(checkInput, String.valueOf(map.get("dataJson")));
-                    appCheckInputRespone.setInputValue(checkInput.getInputValue());
-                } else if (XJConstant.INPUT_ITEM_NUMBER.equals(itemType)) {
-                    appCheckInputRespone.setInputValue(inputItem.getDefaultValue());
-                } else if (XJConstant.INPUT_ITEM_TEXT.equals(itemType)) {
-                    appCheckInputRespone.setInputValue(inputItem.getDefaultValue());
-                }
+            if (!mapList.isEmpty()) {
+                List<AppCheckInputRespone> appCheckInputRespones = new ArrayList<>();
+                for (Map<String, Object> map : mapList.get("items")) {
+                    AppCheckInputRespone appCheckInputRespone = new AppCheckInputRespone();
+                    BeanUtil.copyProperties(map, appCheckInputRespone);
+                    InputItem inputItem = inputItemDao.getOne(Long.parseLong(map.get("checkInputId").toString()));
+                    CheckInput checkInput = new CheckInput();
+                    String itemType = String.valueOf(map.get("itemType"));
+                    if (XJConstant.INPUT_ITEM_SELECT.equals(itemType)) {
+                        paraseSelect(checkInput, String.valueOf(map.get("dataJson")));
+                        appCheckInputRespone.setInputValue(checkInput.getInputValue());
+                    } else if (XJConstant.INPUT_ITEM_NUMBER.equals(itemType)) {
+                        appCheckInputRespone.setInputValue(inputItem.getDefaultValue());
+                    } else if (XJConstant.INPUT_ITEM_TEXT.equals(itemType)) {
+                        appCheckInputRespone.setInputValue(inputItem.getDefaultValue());
+                    }
 
-                appCheckInputRespone.setPointInputImgUrls(new ArrayList<>());
-                appCheckInputRespones.add(appCheckInputRespone);
+                    appCheckInputRespone.setPointInputImgUrls(new ArrayList<>());
+                    appCheckInputRespones.add(appCheckInputRespone);
+                }
+                appCheckInput.put("items", appCheckInputRespones);
             }
-            appCheckInput.put("items", appCheckInputRespones);
             esTaskDetailDto.setPointImgUrls(new ArrayList<>());
             esTaskDetailDto.setAppCheckInput(appCheckInput);
             esTaskDetailDto.setPointStatus(String.valueOf(PlanTaskDetailIsFinishEnum.FINISHED.getValue()));