From c9ef6f75ff8c951e696b643dfacfaa5bad777ad3 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期三, 20 十月 2021 13:38:47 +0800
Subject: [PATCH] 修改用户导入

---
 src/main/java/com/nanometer/smartlab/service/OpeApplyService.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/service/OpeApplyService.java b/src/main/java/com/nanometer/smartlab/service/OpeApplyService.java
index d25e31e..95dc9f1 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeApplyService.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeApplyService.java
@@ -9,19 +9,20 @@
 import java.math.BigDecimal;
 import java.sql.Timestamp;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by johnny on 17/12/12.
  */
 public interface OpeApplyService {
 
-    public List<OpeApply> getOpeApplyList(String reagentName, Timestamp startDeadline, Timestamp endDeadline, Integer status,
+    public List<OpeApply> getOpeApplyList(String reagentName, Timestamp startDeadline,String controlProduct, Timestamp endDeadline, Integer status,
                                           String applyUserId, String approveUserId, String queryCas,
                                           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,
+    public int getOpeApplyTotalCount(String reagentName, Timestamp startDeadline,String controlProduct, Timestamp endDeadline, Integer status,
                                      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);

--
Gitblit v1.9.2