From 2a29572ab5b4fcd6f49d258a6dedd8cf2394daed Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Wed, 11 Sep 2024 11:44:07 +0800
Subject: [PATCH] 湖北水库：项目进度排序
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgDeviceServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgDeviceServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgDeviceServiceImpl.java
index 4e1fcd6..90b0ca9 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgDeviceServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgDeviceServiceImpl.java
@@ -95,9 +95,11 @@
@Override
public boolean saveById(SgDeviceDO sgDeviceDO) {
QueryWrapper<SgProgressReportDO> queryWrapper = new QueryWrapper<>();
- SgProgressReportDO sgProgressReportDO = sgProgressReportMapper.selectOne(queryWrapper.eq("profram_id", sgDeviceDO.getId()).eq("gx_step_id",26));
- if (sgProgressReportDO.getStatus().equals(2)) {
- throw new ServiceException("施工验收完成不能增加设备");
+ SgProgressReportDO sgProgressReportDO = sgProgressReportMapper.selectOne(queryWrapper.eq("profram_id", sgDeviceDO.getProgramId()).eq("gx_step_id",26));
+ if (sgProgressReportDO != null) {
+ if(sgProgressReportDO.getStatus().equals(2)){
+ throw new ServiceException("施工验收完成不能增加设备");
+ }
}
return save(sgDeviceDO);
--
Gitblit v1.9.3