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

UPDATE: 优化。

Browse Source
This commit is contained in:
贾同学
2025-09-30 09:51:49 +08:00
parent 20cb78eb06
commit d06fa8476c
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -365,7 +365,6 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
} }
this.updateBindStandardDev(param.getId(), param.getStandardDevIds()); this.updateBindStandardDev(param.getId(), param.getStandardDevIds());
List<AdPlan> list = new ArrayList<>(); List<AdPlan> list = new ArrayList<>();
AdPlan fatherPlan = this.getById(fatherPlanId);
// 原始绑定被检设备 // 原始绑定被检设备
List<PqDev> oldDevList = pqDevService.list(new QueryWrapper<PqDev>().eq("Plan_Id", param.getId()).eq("State", DataStateEnum.ENABLE.getCode())); List<PqDev> oldDevList = pqDevService.list(new QueryWrapper<PqDev>().eq("Plan_Id", param.getId()).eq("State", DataStateEnum.ENABLE.getCode()));
List<String> oldDevIds = oldDevList.stream().map(PqDev::getId).collect(Collectors.toList()); List<String> oldDevIds = oldDevList.stream().map(PqDev::getId).collect(Collectors.toList());
@@ -392,17 +391,20 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
pqDevService.bind(fatherPlanId, fatherNowDevIds); pqDevService.bind(fatherPlanId, fatherNowDevIds);
} }
} }
PqDevParam.QueryParam queryParam = new PqDevParam.QueryParam(); // 非未检测状态
queryParam.setPlanIdList(Collections.singletonList(plan1.getId())); if (!plan1.getTestState().equals(CheckStateEnum.UNCHECKED.getValue())) {
List<PqDevVO> pqDevVOS = pqDevService.listByPlanId(queryParam); PqDevParam.QueryParam queryParam = new PqDevParam.QueryParam();
long checkedCount = pqDevVOS.stream().filter(pqDevVO -> pqDevVO.getCheckState().equals(CheckStateEnum.CHECKED.getValue())).count(); queryParam.setPlanIdList(Collections.singletonList(plan1.getId()));
plan1.setTestState(CheckStateEnum.UNCHECKED.getValue()); List<PqDevVO> pqDevVOS = pqDevService.listByPlanId(queryParam);
if (checkedCount == pqDevVOS.size()) { long checkedCount = pqDevVOS.stream().filter(pqDevVO -> pqDevVO.getCheckState().equals(CheckStateEnum.CHECKED.getValue())).count();
plan1.setTestState(CheckStateEnum.CHECKED.getValue()); if (checkedCount == pqDevVOS.size()) {
} else if (checkedCount > 0) { plan1.setTestState(CheckStateEnum.CHECKED.getValue());
plan1.setTestState(CheckStateEnum.CHECKING.getValue()); } else if (checkedCount > 0) {
plan1.setTestState(CheckStateEnum.CHECKING.getValue());
}
} }
list.add(plan1); list.add(plan1);
return this.updateBatchById(list); return this.updateBatchById(list);
} }