From b1d76ff75fef33e8b2307f3a8c2f4ec5e638f0cd Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Sat, 02 Nov 2024 14:45:08 +0800
Subject: [PATCH] 湖北水库：项目单位过滤
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgDeviceServiceImpl.java | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 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 6c1be4f..fa2bc41 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) {
@@ -49,24 +52,22 @@
@Override
public List<SgDeviceDO> getDeviceList(String programId) {
List<SgDeviceDO> list = new ArrayList<>();
- QueryWrapper<SgDeviceDO> queryWrapper = new QueryWrapper<>();
- 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);
- List<SgDeviceDO> sgDeviceDOS = baseMapper.selectList(queryWrapper);
+ List<SgDeviceDO> sgDeviceDOS = baseMapper.queryPageList(null,SgDeviceSearchDTO.builder().projectId(programId).build());
if (CollectionUtils.isNotEmpty(sgDeviceDOS)) {
list.addAll(sgDeviceDOS);
}
SgDeviceDO sg2 = new SgDeviceDO();
sg2.setId((long) 998);
- sg2.setDeviceName("项目验收");
- sg2.setDeviceType("xmys");
+ sg2.setDeviceName("施工验收");
+ sg2.setDeviceType("sgys");
sg2.setStatus(0);
list.add(sg2);
@@ -80,7 +81,25 @@
@Override
public List<SgGxStepDO> queryStepList(String deviceId) {
+ if(deviceId.equals("998")){
+ return sgGxStepMapper.queryStepLists("sgys");
+ }else if (deviceId.equals("999")){
+ return sgGxStepMapper.queryStepLists("cldw");
+ }
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