admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

最终验收bug修复

Browse Source
This commit is contained in:
guoshengxiong 2024-05-15 16:22:47 +08:00
parent 7d8f4d1575
commit c508987173
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzDangerousEngineeringAcceptanceServiceImpl.java
View File

@ -107,7 +107,7 @@ public class XzDangerousEngineeringAcceptanceServiceImpl extends ServiceImpl<XzD
Long engineeringId = xzDangerousEngineeringAcceptance.getEngineeringId(); Long engineeringId = xzDangerousEngineeringAcceptance.getEngineeringId();
List<DangerousEngineeringProgressRecord> dangerousEngineeringProgressRecords = dangerousEngineeringProgressRecordMapper.selectList(new LambdaQueryWrapper<DangerousEngineeringProgressRecord>() List<DangerousEngineeringProgressRecord> dangerousEngineeringProgressRecords = dangerousEngineeringProgressRecordMapper.selectList(new LambdaQueryWrapper<DangerousEngineeringProgressRecord>()
.eq(DangerousEngineeringProgressRecord::getEngineeringId, engineeringId) .eq(DangerousEngineeringProgressRecord::getEngineeringId, engineeringId)
.eq(DangerousEngineeringProgressRecord::getType, 1) .eq(DangerousEngineeringProgressRecord::getType, type)
); );
if (CollUtil.isEmpty(dangerousEngineeringProgressRecords)) { if (CollUtil.isEmpty(dangerousEngineeringProgressRecords)) {
throw new OpenAlertException("当前进度为空，无法添加验收"); throw new OpenAlertException("当前进度为空，无法添加验收");
@ -115,20 +115,20 @@ public class XzDangerousEngineeringAcceptanceServiceImpl extends ServiceImpl<XzD
List<XzSecurityQualityInspectionRecord> xzSecurityQualityInspectionRecords = xzSecurityQualityInspectionRecordMapper.selectList(new LambdaQueryWrapper<XzSecurityQualityInspectionRecord>() List<XzSecurityQualityInspectionRecord> xzSecurityQualityInspectionRecords = xzSecurityQualityInspectionRecordMapper.selectList(new LambdaQueryWrapper<XzSecurityQualityInspectionRecord>()
.eq(XzSecurityQualityInspectionRecord::getEngineeringId, engineeringId) .eq(XzSecurityQualityInspectionRecord::getEngineeringId, engineeringId)
.eq(XzSecurityQualityInspectionRecord::getType, 1) .eq(XzSecurityQualityInspectionRecord::getType, type)
); );
if (CollUtil.isEmpty(xzSecurityQualityInspectionRecords)) { if (CollUtil.isEmpty(xzSecurityQualityInspectionRecords)) {
throw new OpenAlertException("当前安全检查记录为空，无法添加验收"); throw new OpenAlertException("当前安全检查记录为空，无法添加验收");
} }
List<XzSecurityQualityInspectionRecord> notCloseList = xzSecurityQualityInspectionRecords.stream().filter(xzSecurityQualityInspectionRecord -> List<XzSecurityQualityInspectionRecord> 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)) { if (CollUtil.isNotEmpty(notCloseList)) {
throw new OpenAlertException("有安全隐患未闭合，无法添加验收"); throw new OpenAlertException("有安全隐患未闭合，无法添加验收");
} }
List<DangerousEngineeringSideStation> dangerousEngineeringSideStations = dangerousEngineeringSideStationMapper.selectList(new LambdaQueryWrapper<DangerousEngineeringSideStation>() List<DangerousEngineeringSideStation> dangerousEngineeringSideStations = dangerousEngineeringSideStationMapper.selectList(new LambdaQueryWrapper<DangerousEngineeringSideStation>()
.eq(DangerousEngineeringSideStation::getDangerousEngineeringId, engineeringId) .eq(DangerousEngineeringSideStation::getDangerousEngineeringId, engineeringId)
.eq(DangerousEngineeringSideStation::getType, 1) .eq(DangerousEngineeringSideStation::getType, type)
); );
if (CollUtil.isEmpty(dangerousEngineeringSideStations)) { if (CollUtil.isEmpty(dangerousEngineeringSideStations)) {
throw new OpenAlertException("施工旁站为空，无法添加验收"); throw new OpenAlertException("施工旁站为空，无法添加验收");