From d06fa8476cb7e0e44e27ed93af5239d2870a6dce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B4=BE=E5=90=8C=E5=AD=A6?= Date: Tue, 30 Sep 2025 09:51:49 +0800 Subject: [PATCH] =?UTF-8?q?UPDATE:=20=E4=BC=98=E5=8C=96=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plan/service/impl/AdPlanServiceImpl.java | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java b/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java index 99fa97f2..5001d30b 100644 --- a/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java @@ -365,7 +365,6 @@ public class AdPlanServiceImpl extends ServiceImpl impleme } this.updateBindStandardDev(param.getId(), param.getStandardDevIds()); List list = new ArrayList<>(); - AdPlan fatherPlan = this.getById(fatherPlanId); // 原始绑定被检设备 List oldDevList = pqDevService.list(new QueryWrapper().eq("Plan_Id", param.getId()).eq("State", DataStateEnum.ENABLE.getCode())); List oldDevIds = oldDevList.stream().map(PqDev::getId).collect(Collectors.toList()); @@ -392,17 +391,20 @@ public class AdPlanServiceImpl extends ServiceImpl impleme pqDevService.bind(fatherPlanId, fatherNowDevIds); } } - PqDevParam.QueryParam queryParam = new PqDevParam.QueryParam(); - queryParam.setPlanIdList(Collections.singletonList(plan1.getId())); - List pqDevVOS = pqDevService.listByPlanId(queryParam); - long checkedCount = pqDevVOS.stream().filter(pqDevVO -> pqDevVO.getCheckState().equals(CheckStateEnum.CHECKED.getValue())).count(); - plan1.setTestState(CheckStateEnum.UNCHECKED.getValue()); - if (checkedCount == pqDevVOS.size()) { - plan1.setTestState(CheckStateEnum.CHECKED.getValue()); - } else if (checkedCount > 0) { - plan1.setTestState(CheckStateEnum.CHECKING.getValue()); + // 非未检测状态 + if (!plan1.getTestState().equals(CheckStateEnum.UNCHECKED.getValue())) { + PqDevParam.QueryParam queryParam = new PqDevParam.QueryParam(); + queryParam.setPlanIdList(Collections.singletonList(plan1.getId())); + List pqDevVOS = pqDevService.listByPlanId(queryParam); + long checkedCount = pqDevVOS.stream().filter(pqDevVO -> pqDevVO.getCheckState().equals(CheckStateEnum.CHECKED.getValue())).count(); + if (checkedCount == pqDevVOS.size()) { + plan1.setTestState(CheckStateEnum.CHECKED.getValue()); + } else if (checkedCount > 0) { + plan1.setTestState(CheckStateEnum.CHECKING.getValue()); + } } + list.add(plan1); return this.updateBatchById(list); }