From e4813a5bf15c620f8b635ca27f8129b9d13cfef4 Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Fri, 3 Nov 2023 16:00:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/AcceptInspectRecordServiceImpl.java        | 6 +++---
 .../safety/service/impl/InspectRecordServiceImpl.java       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/AcceptInspectRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/AcceptInspectRecordServiceImpl.java
index 7923951..868c42e 100644
--- a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/AcceptInspectRecordServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/AcceptInspectRecordServiceImpl.java
@@ -64,7 +64,7 @@ public class AcceptInspectRecordServiceImpl extends ServiceImpl<AcceptInspectRec
     private IAcceptInspectQuestionService acceptInspectQuestionService;
 
     @Autowired
-    private IAcceptInspectQuestionExamineService acceptAcceptInspectQuestionExamineService;
+    private IAcceptInspectQuestionExamineService acceptInspectQuestionExamineService;
 
     @Autowired
     private ICheckAcceptApplyService checkAcceptApplyService;
@@ -147,9 +147,9 @@ public class AcceptInspectRecordServiceImpl extends ServiceImpl<AcceptInspectRec
                 wrapper.set(AcceptInspectQuestionExamine::getSuggest, suggest);
                 wrapper.in(AcceptInspectQuestionExamine::getInspectQuestionId, questionId);
                 wrapper.eq(AcceptInspectQuestionExamine::getExamineState, 0);
-                acceptAcceptInspectQuestionExamineService.update(wrapper);
+                acceptInspectQuestionExamineService.update(wrapper);
             }
-            if (acceptInspectRecord.getState() == 5 && list.stream().filter(l -> l.getState() == 4).collect(Collectors.toList()).size() != list.size()) {
+            if (acceptInspectRecord.getState() == 5 && list.stream().filter(l -> l.getState() == 4 || l.getState() == 3).collect(Collectors.toList()).size() != list.size()) {
                 return true;
             }
             return this.updateById(acceptInspectRecord);
diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectRecordServiceImpl.java
index ce7be3a..50f0082 100644
--- a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectRecordServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectRecordServiceImpl.java
@@ -168,7 +168,7 @@ public class InspectRecordServiceImpl extends ServiceImpl<InspectRecordMapper, I
                 wrapper.eq(InspectQuestionExamine::getExamineState, 0);
                 inspectQuestionExamineService.update(wrapper);
             }
-            if (inspectRecord.getState() == 5 && list.stream().filter(l -> l.getState() == 4).collect(Collectors.toList()).size() != list.size()) {
+            if (inspectRecord.getState() == 5 && list.stream().filter(l -> l.getState() == 4 || l.getState() == 3).collect(Collectors.toList()).size() != list.size()) {
                 return true;
             }
             return this.updateById(inspectRecord);