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 fd17be72..95d24f1c 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 @@ -584,16 +584,19 @@ public class PqDevServiceImpl extends ServiceImpl implements for (PqDev pqDev : list) { if (result.containsKey(pqDev.getId())) { Integer checkState; + int i; if (pqDev.getReCheckNum() >= config.getMaxTime()) { // 装置报告生成 todo... this.baseMapper.updateReportState(pqDev.getId()); // 装置归档 checkState = CheckStateEnum.DOCUMENTED.getValue(); + i = pqDev.getReCheckNum(); } else { checkState = CheckStateEnum.CHECKED.getValue(); + i = pqDev.getReCheckNum() + 1; } this.update(new LambdaUpdateWrapper() - .set(PqDev::getReCheckNum, pqDev.getReCheckNum() + 1) + .set(PqDev::getReCheckNum, i) .set(PqDev::getCheckState, checkState) .set(PqDev::getCheckResult, result.get(pqDev.getId())) .set(PqDev::getCheckTime, LocalDateTime.now())