From fb2114dcc0d16fb6ac9a1fd18bbf8e9c0998d139 Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Fri, 4 Aug 2023 09:01:36 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E7=9D=A3=E6=89=A7=E6=B3=95=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/InspectQuestionExamineServiceImpl.java      | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

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<InspectQuesti
         InspectQuestion inspectQuestion = inspectQuestionService.getById(inspectQuestionExamine.getInspectQuestionId());
         List<InspectQuestion> inspectQuestions = inspectQuestionService.list(Wrappers.<InspectQuestion>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<InspectRecord> recordWrapper = Wrappers.<InspectRecord>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);