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()); +// } } } }