From af2a7128e2c74689f3728233842bbaea69417354 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Thu, 10 Oct 2024 12:00:21 +0800
Subject: [PATCH] 湖北水库：进度上报去除施工准备
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgDeviceServiceImpl.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 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 1cb564c..a1c5c4d 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
@@ -33,6 +33,9 @@
@Autowired
private SgGxStepMapper sgGxStepMapper;
+ @Autowired
+ private SgProgressReportMapper sgProgressReportMapper;
+
@Override
public IPage<SgDeviceDO> queryPageList(IPage<SgDeviceDO> page, SgDeviceSearchDTO searchDTO) {
@@ -56,7 +59,7 @@
sg1.setDeviceName("施工准备");
sg1.setDeviceType("sgzb");
sg1.setStatus(0);
- list.add(sg1);
+// list.add(sg1);
List<SgDeviceDO> sgDeviceDOS = baseMapper.selectList(queryWrapper);
if (CollectionUtils.isNotEmpty(sgDeviceDOS)) {
@@ -88,4 +91,17 @@
List<SgGxStepDO> sgGxStepDOS = sgGxStepMapper.queryStepList(deviceId);
return sgGxStepDOS;
}
+
+ @Override
+ public boolean saveById(SgDeviceDO sgDeviceDO) {
+ QueryWrapper<SgProgressReportDO> queryWrapper = new QueryWrapper<>();
+ 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