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/service/OpeApplyServiceImpl.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java
index a576af3..cd38618 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java
@@ -22,6 +22,7 @@
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.primefaces.event.FileUploadEvent;
import org.primefaces.model.UploadedFile;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Lazy;
import org.springframework.dao.DataAccessException;
import org.springframework.dao.DataIntegrityViolationException;
@@ -69,6 +70,9 @@
private SysUserService sysUserService;
@Resource
private BaseMetaService baseMetaService;
+
+ @Value("${activeEnv}")
+ private String activeEnv;
@Transactional(propagation = Propagation.REQUIRED)
public List<OpeApply> getOpeApplyList(String reagentName, Timestamp startDeadline, String controlProduct,Timestamp endDeadline, Integer status,
@@ -372,7 +376,11 @@
public boolean updateSelectedOpeApplyStatus(String memo, List<String> applyIds, String adminUserId, List<String> adminApplyIds,List<String> firstUserIds) {
boolean apply = false, adminApply = false;
if (!CollectionUtils.isEmpty(applyIds)) {
- apply = this.updateOpeApplyStatus(ApplyStatus.APPROVED, memo, applyIds);
+ if("gslab".equalsIgnoreCase(activeEnv)){
+ apply = this.updateOpeApplyStatus(ApplyStatus.Price_CONFIRM, memo, applyIds);
+ }else{
+ apply = this.updateOpeApplyStatus(ApplyStatus.APPROVED, memo, applyIds);
+ }
}
if (!CollectionUtils.isEmpty(adminApplyIds)) {
adminApply = this.updateOpeApplyAdminStatus2(memo, adminApplyIds, adminUserId,firstUserIds);
--
Gitblit v1.9.2