diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzDangerousEngineeringAcceptanceServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzDangerousEngineeringAcceptanceServiceImpl.java index e4e9446b1..8c48c8b92 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzDangerousEngineeringAcceptanceServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzDangerousEngineeringAcceptanceServiceImpl.java @@ -107,7 +107,7 @@ public class XzDangerousEngineeringAcceptanceServiceImpl extends ServiceImpl dangerousEngineeringProgressRecords = dangerousEngineeringProgressRecordMapper.selectList(new LambdaQueryWrapper() .eq(DangerousEngineeringProgressRecord::getEngineeringId, engineeringId) - .eq(DangerousEngineeringProgressRecord::getType, 1) + .eq(DangerousEngineeringProgressRecord::getType, type) ); if (CollUtil.isEmpty(dangerousEngineeringProgressRecords)) { throw new OpenAlertException("当前进度为空,无法添加验收"); @@ -115,20 +115,20 @@ public class XzDangerousEngineeringAcceptanceServiceImpl extends ServiceImpl xzSecurityQualityInspectionRecords = xzSecurityQualityInspectionRecordMapper.selectList(new LambdaQueryWrapper() .eq(XzSecurityQualityInspectionRecord::getEngineeringId, engineeringId) - .eq(XzSecurityQualityInspectionRecord::getType, 1) + .eq(XzSecurityQualityInspectionRecord::getType, type) ); if (CollUtil.isEmpty(xzSecurityQualityInspectionRecords)) { throw new OpenAlertException("当前安全检查记录为空,无法添加验收"); } List notCloseList = xzSecurityQualityInspectionRecords.stream().filter(xzSecurityQualityInspectionRecord -> - xzSecurityQualityInspectionRecord.getStatus() != 5 && xzSecurityQualityInspectionRecord.getStatus() != 6 && xzSecurityQualityInspectionRecord.getType() == 1).collect(Collectors.toList()); + xzSecurityQualityInspectionRecord.getStatus() != 5 && xzSecurityQualityInspectionRecord.getStatus() != 6 && xzSecurityQualityInspectionRecord.getType() == type).collect(Collectors.toList()); if (CollUtil.isNotEmpty(notCloseList)) { throw new OpenAlertException("有安全隐患未闭合,无法添加验收"); } List dangerousEngineeringSideStations = dangerousEngineeringSideStationMapper.selectList(new LambdaQueryWrapper() .eq(DangerousEngineeringSideStation::getDangerousEngineeringId, engineeringId) - .eq(DangerousEngineeringSideStation::getType, 1) + .eq(DangerousEngineeringSideStation::getType, type) ); if (CollUtil.isEmpty(dangerousEngineeringSideStations)) { throw new OpenAlertException("施工旁站为空,无法添加验收");