From af607e09de61badbaef57bc0d38002e48a44ac4c Mon Sep 17 00:00:00 2001 From: 李宇 <986321569@qq.com> Date: 星期五, 12 十一月 2021 12:48:50 +0800 Subject: [PATCH] 订单领取申领人被删除报错 --- src/main/java/com/nanometer/smartlab/service/OpeApplyService.java | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/nanometer/smartlab/service/OpeApplyService.java b/src/main/java/com/nanometer/smartlab/service/OpeApplyService.java index 6f29f7c..08ab215 100644 --- a/src/main/java/com/nanometer/smartlab/service/OpeApplyService.java +++ b/src/main/java/com/nanometer/smartlab/service/OpeApplyService.java @@ -9,20 +9,21 @@ 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); + 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); + 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); public OpeApply getOpeApply(String id); @@ -74,4 +75,10 @@ void btUpdateApplyAndOrder(List<OpeApply> opeList); void importApply(FileUploadEvent event, SysUser user) throws IOException; + + OpeApplyReserve getOpeApplyReserveListByNameForRowData(String rowKey); + + int getOpeApplySupplerRequireMngTotalCount(SysUser user,String reagentName, Timestamp startDeadline, Timestamp endDeadline, int key, byte b); + + List<OpeApply> getOpeApplySupplerRequireMngList(SysUser user,String reagentName, Timestamp startDeadline, Timestamp endDeadline, int key, int first, int pageSize, byte b); } -- Gitblit v1.9.2