ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
chendaofei
2025-01-16 18:17:03 +08:00
parent 6435d7135d 99052f17f8
commit bdc3df38a3
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java
View File

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