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/SgProgressReportServiceImpl.java | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java
index f88644e..4b80433 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java
@@ -175,7 +175,7 @@
}
QueryWrapper<SgProgressReportDO> wrappers = new QueryWrapper<>();
- wrappers.eq("profram_id", sgProgressReportDO.getProframId()).ne("status", 4).eq("gx_step_name", "施工准备");
+ wrappers.eq("profram_id", sgProgressReportDO.getProframId()).ne("status", 4).eq("gx_step_name", "测量定位");
List<SgProgressReportDO> sgProgressReportDOS1 = sgProgressReportMapper.selectList(wrappers);
if(sgProgressReportDO.getGxDeviceId()==998){
@@ -194,15 +194,15 @@
}
-// if (sgProgressReportDOS1!= null && sgProgressReportDOS1.size() > 0) {
-// for (SgProgressReportDO sgProgressReportDO1 : sgProgressReportDOS1) {
-// if (sgProgressReportDO1.getStatus()!= 2 && sgProgressReportDO1.getStatus()!= 3) {
-// throw new ServiceException("请先完成施工准备的审批!");
-// }
-// }
-// } else if (sgProgressReportDOS1 == null || (!sgProgressReportDO.getGxStepName().equals("施工准备"))) {
-// throw new ServiceException("请先发起施工准备的审批!");
-// }
+ if (sgProgressReportDOS1!= null && sgProgressReportDOS1.size() > 0) {
+ for (SgProgressReportDO sgProgressReportDO1 : sgProgressReportDOS1) {
+ if (sgProgressReportDO1.getStatus()!= 2 && sgProgressReportDO1.getStatus()!= 3) {
+ throw new ServiceException("请先完成测量定位的审批!");
+ }
+ }
+ } else if (sgProgressReportDOS1 == null || (!sgProgressReportDO.getGxStepName().equals("测量定位"))) {
+ throw new ServiceException("请先发起测量定位的审批!");
+ }
Long gxDeviceId = sgProgressReportDO.getGxDeviceId();
Long gxStepId = sgProgressReportDO.getGxStepId();
SgGxStepDO sgGxStepDO = sgGxStepMapper.selectById(gxStepId);
@@ -246,10 +246,10 @@
sgProgressReportMapper.insert(sgProgressReportDO);
String deviceType ="";
SgDeviceDO sgDeviceDO = new SgDeviceDO();
-// if (gxDeviceId == 999){
-// deviceType = "sgzb";
-// //sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).roleId(Long.parseLong("1811657352658042882")).approvalStatus(0).approvalOrder(1).build());
-// }else
+ if (gxDeviceId == 999){
+ deviceType = "cldw";
+ //sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).roleId(Long.parseLong("1811657352658042882")).approvalStatus(0).approvalOrder(1).build());
+ }else
if(gxDeviceId == 998){
deviceType = "sgys";
//sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).roleId(Long.parseLong("1811657352658042882")).approvalStatus(0).approvalOrder(1).build());
@@ -285,7 +285,7 @@
}
//加个项目及设备的状态判断 方便统计计算
- if(//gxStepId != 25 &&
+ if(gxStepId != 32 &&
gxStepId != 26 ) {
if (sgDeviceDO != null && sgDeviceDO.getStatus() == 0) {
sgDeviceDO.setStatus(1);
--
Gitblit v1.9.3