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 impleme @Override public boolean updateBackTestState(String planId, List devIds) { - pqDevService.update(new LambdaUpdateWrapper() - .set(PqDev::getCheckState, CheckStateEnum.UNCHECKED.getValue()) - .in(PqDev::getId, devIds)); - + //当前如果第二次进行测试,则需要将判断之前状态是否不是非检测状态 + List devList = pqDevService.list(new LambdaQueryWrapper().in(PqDev::getId, devIds)); + if (CollUtil.isNotEmpty(devList)) { + for (PqDev pqDev : devList) { + if(!pqDev.getCheckResult().equals(CheckResultEnum.UNCHECKED.getValue())){ + pqDevService.update(new LambdaUpdateWrapper() + .set(PqDev::getCheckState, CheckStateEnum.CHECKED.getValue()) + .in(PqDev::getId, devIds)); + }else{ + pqDevService.update(new LambdaUpdateWrapper() + .set(PqDev::getCheckState, CheckStateEnum.UNCHECKED.getValue()) + .in(PqDev::getId, devIds)); + } + } + } List list = pqDevService.list(new LambdaQueryWrapper().in(PqDev::getPlanId, planId)); List collect = list.stream().filter(x -> !x.getCheckState().equals(CheckStateEnum.UNCHECKED.getValue())).collect(Collectors.toList()); if (CollUtil.isEmpty(collect)) {