From 7da5d7c1f81abfb5a54613e60e00389b1846e314 Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Tue, 21 Jan 2025 16:23:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=AE=BE=E5=A4=87=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=E5=AE=8C=E6=88=90=E5=90=8E=EF=BC=8C=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=9A=84=E6=A3=80=E6=B5=8B=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/gather/device/mapper/PqDevMapper.java | 2 ++ .../gather/device/mapper/mapping/PqDevMapper.xml | 4 ++++ .../device/service/impl/PqDevServiceImpl.java | 15 +++++++++++---- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/detection/src/main/java/com/njcn/gather/device/mapper/PqDevMapper.java b/detection/src/main/java/com/njcn/gather/device/mapper/PqDevMapper.java index 2284a8a4..690891f6 100644 --- a/detection/src/main/java/com/njcn/gather/device/mapper/PqDevMapper.java +++ b/detection/src/main/java/com/njcn/gather/device/mapper/PqDevMapper.java @@ -27,5 +27,7 @@ public interface PqDevMapper extends MPJBaseMapper { void updateReportState(@Param("id")String id); void updatePlanCheckResult(@Param("planId")String planId, @Param("checkResult")Integer checkResult); + + void updatePlanTestState(@Param("planId")String planId, @Param("testState")Integer testState); } diff --git a/detection/src/main/java/com/njcn/gather/device/mapper/mapping/PqDevMapper.xml b/detection/src/main/java/com/njcn/gather/device/mapper/mapping/PqDevMapper.xml index 1ec83a77..127fa0c2 100644 --- a/detection/src/main/java/com/njcn/gather/device/mapper/mapping/PqDevMapper.xml +++ b/detection/src/main/java/com/njcn/gather/device/mapper/mapping/PqDevMapper.xml @@ -61,6 +61,10 @@ update ad_plan set Result = #{checkResult} where id = #{planId} + + update ad_plan set Test_State = #{testState} where id = #{planId} + + diff --git a/detection/src/main/java/com/njcn/gather/device/service/impl/PqDevServiceImpl.java b/detection/src/main/java/com/njcn/gather/device/service/impl/PqDevServiceImpl.java index 2e22fdc8..11273823 100644 --- a/detection/src/main/java/com/njcn/gather/device/service/impl/PqDevServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/device/service/impl/PqDevServiceImpl.java @@ -593,14 +593,21 @@ public class PqDevServiceImpl extends ServiceImpl implements .eq(PqDev::getState, DataStateEnum.ENABLE.getCode()); List pqDevList = this.list(queryWrapper); if (CollUtil.isNotEmpty(pqDevList)) { - Set checkResultSet = pqDevList.stream().map(PqDev::getCheckResult).collect(Collectors.toSet()); - if (checkResultSet.contains(CheckResultEnum.UNCHECKED.getValue())) { - this.baseMapper.updatePlanCheckResult(pqDev.getPlanId(), CheckResultEnum.UNCHECKED.getValue()); - } else if (checkResultSet.contains(CheckResultEnum.NOT_ACCORD.getValue())) { + Set set = pqDevList.stream().map(PqDev::getCheckResult).collect(Collectors.toSet()); + if (set.contains(CheckResultEnum.NOT_ACCORD.getValue())) { this.baseMapper.updatePlanCheckResult(pqDev.getPlanId(), CheckResultEnum.NOT_ACCORD.getValue()); + } else if (set.contains(CheckResultEnum.UNCHECKED.getValue())) { + this.baseMapper.updatePlanCheckResult(pqDev.getPlanId(), CheckResultEnum.UNCHECKED.getValue()); } else { this.baseMapper.updatePlanCheckResult(pqDev.getPlanId(), CheckResultEnum.ACCORD.getValue()); } + +// set = pqDevList.stream().map(PqDev::getCheckState).collect(Collectors.toSet()); +// if (set.contains(CheckStateEnum.UNCHECKED.getValue())) { +// this.baseMapper.updatePlanTestState(pqDev.getPlanId(), CheckStateEnum.UNCHECKED.getValue()); +// } else { +// this.baseMapper.updatePlanTestState(pqDev.getPlanId(), CheckStateEnum.CHECKED.getValue()); +// } } } }