From 99052f17f85bd597679df39a52433d1737864a22 Mon Sep 17 00:00:00 2001
From: wr <1754607820@qq.com>
Date: Thu, 16 Jan 2025 16:15:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plan/service/impl/AdPlanServiceImpl.java  | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 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 6911a954..3aa5f98f 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
@@ -355,10 +355,21 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
 
     @Override
     public boolean updateBackTestState(String planId, List<String> devIds) {
-        pqDevService.update(new LambdaUpdateWrapper<PqDev>()
-                .set(PqDev::getCheckState, CheckStateEnum.UNCHECKED.getValue())
-                .in(PqDev::getId, devIds));
-
+        //当前如果第二次进行测试，则需要将判断之前状态是否不是非检测状态
+        List<PqDev> devList = pqDevService.list(new LambdaQueryWrapper<PqDev>().in(PqDev::getId, devIds));
+        if (CollUtil.isNotEmpty(devList)) {
+            for (PqDev pqDev : devList) {
+                if(!pqDev.getCheckResult().equals(CheckResultEnum.UNCHECKED.getValue())){
+                    pqDevService.update(new LambdaUpdateWrapper<PqDev>()
+                            .set(PqDev::getCheckState, CheckStateEnum.CHECKED.getValue())
+                            .in(PqDev::getId, devIds));
+                }else{
+                    pqDevService.update(new LambdaUpdateWrapper<PqDev>()
+                            .set(PqDev::getCheckState, CheckStateEnum.UNCHECKED.getValue())
+                            .in(PqDev::getId, devIds));
+                }
+            }
+        }
         List<PqDev> list = pqDevService.list(new LambdaQueryWrapper<PqDev>().in(PqDev::getPlanId, planId));
         List<PqDev> collect = list.stream().filter(x -> !x.getCheckState().equals(CheckStateEnum.UNCHECKED.getValue())).collect(Collectors.toList());
         if (CollUtil.isEmpty(collect)) {