From 1cbac7aa20a183a9a893651bf0cef24b1909eb5c Mon Sep 17 00:00:00 2001 From: gdg <764716047@qq.com> Date: 星期一, 01 二月 2021 10:19:43 +0800 Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master --- src/main/java/com/nanometer/smartlab/service/OpeApplyService.java | 4 ++-- 1 files changed, 2 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 7369cb2..63b4259 100644 --- a/src/main/java/com/nanometer/smartlab/service/OpeApplyService.java +++ b/src/main/java/com/nanometer/smartlab/service/OpeApplyService.java @@ -55,9 +55,9 @@ int getOpeApplyReserveTotalCountByName(String id,String reagentName, String personName); List<OpeApplyReserve> getOpeApplyReserveListByName(String id,String reagentName, String personName, Integer first, Integer pageSize); - int getOpeApplyReserveTotalCountByNameFor(String id,String reagentName, String personName,String productSn,String applyCode,Integer status); + int getOpeApplyReserveTotalCountByNameFor(String id,String reagentName, String personName,String productSn,String applyCode,Integer status,Integer isAllApply); List<OpeApplyReserve> getOpeApplyReserveListByNameFor(String id,String reagentName, String personName, Integer first, - Integer pageSize,String productSn,String applyCode,Integer status); + Integer pageSize,String productSn,String applyCode,Integer status,Integer isAllApply); public boolean updaetOpeApplyPrice(BigDecimal applyPrice,String id); public boolean updaetOpeApplyStockFlag(int stockFlag,String id); public boolean cancelApply(ApplyStatus status,String id); -- Gitblit v1.9.2