diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectQuestionExamineServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectQuestionExamineServiceImpl.java index 5dfca43..fd6d75e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectQuestionExamineServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectQuestionExamineServiceImpl.java @@ -43,14 +43,22 @@ public class InspectQuestionExamineServiceImpl extends ServiceImpl inspectQuestions = inspectQuestionService.list(Wrappers.lambdaQuery().eq(InspectQuestion::getRecordId, inspectQuestion.getRecordId())); Integer state = 3; - if (inspectQuestions.stream().filter(i -> i.getState() == 3 && i.getLevel() == 2).collect(Collectors.toList()).size() == inspectQuestions.size()) { + if (inspectQuestions.stream().filter(i -> i.getState() == 3).collect(Collectors.toList()).size() == inspectQuestions.size()) { state = 4; } else if (inspectQuestions.stream().filter(i -> i.getState() < 3).collect(Collectors.toList()).size() == 0) { state = 5; } if (state != 3) { LambdaUpdateWrapper recordWrapper = Wrappers.lambdaUpdate(); - recordWrapper.set(InspectRecord::getLevel, inspectQuestionExamine.getLevel()); + if (inspectQuestions.stream().filter(i -> i.getState() == 3).collect(Collectors.toList()).size() == inspectQuestions.size()) { + if (inspectQuestions.stream().filter(i -> i.getLevel() == 2).collect(Collectors.toList()).size() == inspectQuestions.size()) { + recordWrapper.set(InspectRecord::getLevel, 2); + } else { + recordWrapper.set(InspectRecord::getLevel, 1); + } + } else { + recordWrapper.set(InspectRecord::getLevel, inspectQuestionExamine.getLevel()); + } recordWrapper.set(InspectRecord::getState, state); recordWrapper.eq(InspectRecord::getId, inspectQuestion.getRecordId()); inspectRecordService.update(recordWrapper);