From b396bfe894c08b5fb6ad49fdf2d4dcd0bba6fede Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Thu, 22 Aug 2024 19:41:13 +0800
Subject: [PATCH] 湖北水库：项目审批驳回后重新上报
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java | 2 ++
1 files changed, 2 insertions(+), 0 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 4c2c838..47859b5 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
@@ -132,6 +132,7 @@
SgGxStepDO sgGxStepDO = sgGxStepMapper.selectById(gxStepId);
List<SgGxStepDO> list = sgGxStepMapper.selectByGxInfoId(sgGxStepDO.getGxInfoId());
QueryWrapper<SgProgressReportDO> wrapper = new QueryWrapper<>();
+ wrapper.in("status",Arrays.asList(0,1,2));
if(sgProgressReportDO.getGxDeviceId()==998 || sgProgressReportDO.getGxDeviceId()==999){
wrapper.eq("gx_step_id", gxStepId).eq("gx_device_id",gxDeviceId).ne("status",4).eq("profram_id",sgProgressReportDO.getProframId());
}else {
@@ -147,6 +148,7 @@
wrapper1.eq("gx_step_id", gxStepDO.getId());
wrapper1.eq("gx_device_id",gxDeviceId);
wrapper1.ne("status",4);
+ wrapper1.ne("status",3);
SgProgressReportDO one = sgProgressReportMapper.selectOne(wrapper1);
if (one == null || one.getStatus() != 2) {
throw new ServiceException("请先完成" + gxStepDO.getGxStepName() + "的审批！");
--
Gitblit v1.9.3