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 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 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);