From 4782396e7fa406f3920c9697cd70624b1eba399c Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Mon, 28 Oct 2024 12:31:42 +0800
Subject: [PATCH] 湖北水库：所有项目添加测量定位工序
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgDeviceServiceImpl.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 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..a6cb732 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) {
@@ -53,8 +56,8 @@
queryWrapper.eq("program_id", programId);
SgDeviceDO sg1 = new SgDeviceDO();
sg1.setId((long) 999);
- sg1.setDeviceName("施工准备");
- sg1.setDeviceType("sgzb");
+ sg1.setDeviceName("测量定位");
+ sg1.setDeviceType("cldw");
sg1.setStatus(0);
list.add(sg1);
@@ -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