From a1e7b27114eaf0bfd4d9768b76ba0db10e4d87bf Mon Sep 17 00:00:00 2001
From: yxm <zhp1521624>
Date: Wed, 17 Jul 2024 11:50:56 +0800
Subject: [PATCH] 项目查询进度添加区域筛选和白蚁项目管理优化
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgDeviceServiceImpl.java | 25 +++++++++++++++++++++++--
1 files changed, 23 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 6c1be4f..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
@@ -33,6 +33,9 @@
@Autowired
private SgGxStepMapper sgGxStepMapper;
+ @Autowired
+ private SgProgressReportMapper sgProgressReportMapper;
+
@Override
public IPage<SgDeviceDO> queryPageList(IPage<SgDeviceDO> page, SgDeviceSearchDTO searchDTO) {
@@ -65,8 +68,8 @@
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 +83,25 @@
@Override
public List<SgGxStepDO> queryStepList(String deviceId) {
+ if(deviceId.equals("998")){
+ return sgGxStepMapper.queryStepLists("sgys");
+ }else if (deviceId.equals("999")){
+ return sgGxStepMapper.queryStepLists("sgzb");
+ }
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