From b02535c9a99324823812f6c2d08f066d8e1ba75f Mon Sep 17 00:00:00 2001 From: gdg <764716047@qq.com> Date: 星期一, 18 一月 2021 09:57:14 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master --- src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java index 1f61365..ce73ec8 100644 --- a/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java +++ b/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java @@ -519,12 +519,15 @@ } @Override - public int getOpeApplyReserveTotalCountByNameFor(String id,String reagentName, String personName) { + public int getOpeApplyReserveTotalCountByNameFor(String id,String reagentName, String personName,String productSn,String applyCode,Integer status) { try { Map<String, Object> params = new HashMap<String, Object>(); params.put("reagentName", reagentName); params.put("personName", personName); params.put("userId",id); + params.put("productSn",productSn); + params.put("applyCode",applyCode); + params.put("status",status); return this.opeApplyDao.getOpeApplyReserveTotalCountFor(params); } catch (DataAccessException e) { logger.error(e.getMessage(), e); @@ -534,7 +537,7 @@ } @Override public List<OpeApplyReserve> getOpeApplyReserveListByNameFor(String id,String reagentName, String personName, Integer first, - Integer pageSize) { + Integer pageSize,String productSn,String applyCode,Integer status) { try { Map<String, Object> params = new HashMap<String, Object>(); params.put("reagentName", reagentName); @@ -542,6 +545,9 @@ params.put("userId",id); params.put("first", first); params.put("pageSize", pageSize); + params.put("productSn",productSn); + params.put("applyCode",applyCode); + params.put("status",status); return this.opeApplyDao.getOpeApplyReserveListFor(params); } catch (DataAccessException e) { logger.error(e.getMessage(), e); -- Gitblit v1.9.2