From a1e90c3da21d88f994bac9c1feb91bf40e53a44d Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期三, 18 八月 2021 13:01:21 +0800
Subject: [PATCH] 耗材无供应商也显示，申购管理试剂库、申请履历、收藏不显示无效试剂和无供应商试剂 可显示无供应商的耗材
---
src/main/java/com/nanometer/smartlab/service/OpeApplyService.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/OpeApplyService.java b/src/main/java/com/nanometer/smartlab/service/OpeApplyService.java
index dad4c1d..d25e31e 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeApplyService.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeApplyService.java
@@ -5,6 +5,7 @@
import com.nanometer.smartlab.exception.BusinessException;
import org.primefaces.event.FileUploadEvent;
+import java.io.IOException;
import java.math.BigDecimal;
import java.sql.Timestamp;
import java.util.List;
@@ -16,12 +17,12 @@
public List<OpeApply> getOpeApplyList(String reagentName, Timestamp startDeadline, Timestamp endDeadline, Integer status,
String applyUserId, String approveUserId, String queryCas,
- Integer first, Integer pageSize,String applyCode,String applyUserName);
+ Integer first, Integer pageSize,String applyCode,String applyUserName,Byte isShow);
public List<OpeApply> getOpeApplyListForApproval(String applyUserName,String approvaUserName,String reagentName, Timestamp startDeadline, Timestamp endDeadline, Integer status,
String applyUserId, String approveUserId, String queryCas,
Integer first, Integer pageSize,String applyCode,String searchApproval);
public int getOpeApplyTotalCount(String reagentName, Timestamp startDeadline, Timestamp endDeadline, Integer status,
- String applyUserId, String approveUserId, String queryCas,String applyCode,String applyUserName);
+ String applyUserId, String approveUserId, String queryCas,String applyCode,String applyUserName,Byte isShow);
public int getOpeApplyTotalCountForApproval(String applyUserName,String approvaUserName,String reagentName, Timestamp startDeadline, Timestamp endDeadline, Integer status,
String applyUserId, String approveUserId, String queryCas,String applyCode,String searchApproval);
public OpeApply getOpeApply(String id);
@@ -72,5 +73,7 @@
void btUpdateApplyAndOrder(List<OpeApply> opeList);
- void importApply(FileUploadEvent event, SysUser user);
+ void importApply(FileUploadEvent event, SysUser user) throws IOException;
+
+ OpeApplyReserve getOpeApplyReserveListByNameForRowData(String rowKey);
}
--
Gitblit v1.9.2