From 760e53aeef80c287ced8b6716336733867fc7565 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: Thu, 07 Mar 2024 08:30:57 +0800
Subject: [PATCH] 新增需求
---
src/main/java/com/nanometer/smartlab/controller/ApplyMngController.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/ApplyMngController.java b/src/main/java/com/nanometer/smartlab/controller/ApplyMngController.java
index b49b41a..4eece79 100644
--- a/src/main/java/com/nanometer/smartlab/controller/ApplyMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/ApplyMngController.java
@@ -426,8 +426,13 @@
this.opeApply.setApplyCode(this.sysSequenceService.getApplyCode());
this.opeApply.setApplyUserId(applyUser.getId());
- this.opeApply.setStatus(ApplyStatus.PENDING_APPROVAL);
+ //this.opeApply.setStatus(ApplyStatus.PENDING_APPROVAL);
this.opeApplyService.insertOpeApply(this.opeApply);
+ if(getActiveEnv().equalsIgnoreCase("gslab")){//姑苏实验室先进入待审批状态，然后再进入价格确认状态
+ this.opeApply.setStatus(ApplyStatus.PENDING_APPROVAL);
+ }else{
+ this.opeApply.setStatus(ApplyStatus.Price_CONFIRM);
+ }
FacesUtils.info("新建成功。");
this.menuController.backToPage();
@@ -771,7 +776,12 @@
opeApply.setId(IDUtils.uuid());
opeApply.setApplyCode(applyCode);
opeApply.setApplyUserId(applyUser.getId());
- opeApply.setStatus(ApplyStatus.Price_CONFIRM);
+ if(getActiveEnv().equalsIgnoreCase("gslab")){//姑苏实验室先进入待审批状态，然后再进入价格确认状态
+ opeApply.setStatus(ApplyStatus.PENDING_APPROVAL);
+ }else{
+ opeApply.setStatus(ApplyStatus.Price_CONFIRM);
+ }
+
}
this.opeApplyService.insertOpeApplyList(this.applyNewList);
--
Gitblit v1.9.2