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

微调

Browse Source
This commit is contained in:
caozehui
2025-04-08 16:10:37 +08:00
parent c7a45b5500
commit 64bdba9fa2
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
detection/src/main/java/com/njcn/gather/device/service/impl/PqDevServiceImpl.java
View File

@@ -487,12 +487,10 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
// 只有检测完成的设备才可以进行归档 // 只有检测完成的设备才可以进行归档
PqDev pqDev = this.getById(id); PqDev pqDev = this.getById(id);
if (ObjectUtil.isNotNull(pqDev)) { if (ObjectUtil.isNotNull(pqDev)) {
if (!pqDev.getCheckState().equals(CheckStateEnum.CHECKED.getValue())) { // 只有检测完成、且已生成报告的设备才可以进行归档
if (!pqDev.getCheckState().equals(CheckStateEnum.CHECKED.getValue()) || !pqDev.getReportState().equals(DevReportStateEnum.GENERATED.getValue())) {
throw new BusinessException(DetectionResponseEnum.DEV_UN_CHECKED); throw new BusinessException(DetectionResponseEnum.DEV_UN_CHECKED);
} }
if (!pqDev.getReportState().equals(DevReportStateEnum.GENERATED.getValue())) {
throw new BusinessException(DetectionResponseEnum.DEV_UN_REPORT);
}
boolean update = this.lambdaUpdate() boolean update = this.lambdaUpdate()
.set(PqDev::getCheckState, CheckStateEnum.DOCUMENTED.getValue()) .set(PqDev::getCheckState, CheckStateEnum.DOCUMENTED.getValue())
.eq(PqDev::getId, id) .eq(PqDev::getId, id)
@@ -510,8 +508,6 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
this.baseMapper.finishPlan(pqDev.getPlanId()); this.baseMapper.finishPlan(pqDev.getPlanId());
} }
} }
} else {
throw new BusinessException(DetectionResponseEnum.DEV_UN_CHECKED);
} }
} }
} }