From f675672004af0ff9071d21546a0eee0a0c8f3092 Mon Sep 17 00:00:00 2001 From: gdg <764716047@qq.com> Date: 星期五, 29 一月 2021 08:13:30 +0800 Subject: [PATCH] 增加部分搜索 --- src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java index 2a931b7..96f81ab 100644 --- a/src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java +++ b/src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java @@ -136,7 +136,7 @@ } @Transactional(propagation = Propagation.REQUIRED) - public List<OpeUseFlow> getOpeUseFlowListByName(String houseName,String reagentId, String reagentCode, Integer status, String userId, + public List<OpeUseFlow> getOpeUseFlowListByName(String houseName,String reagentId, String reagentCode,String containerCode, Integer status, String userId, Date startDate,Date endDate,Integer first, Integer pageSize) { try { Map<String, Object> params = new HashMap<String, Object>(); @@ -176,6 +176,7 @@ params.put("status", status); params.put("houseName", houseName); + params.put("containerCode", containerCode); addParamByUserId(userId, params); params.put("first", first); @@ -189,7 +190,7 @@ } @Transactional(propagation = Propagation.REQUIRED) - public int getOpeUseFlowTotalCountByName(String houseName,String reagentId, String reagentCode, Integer status, String userId,Date startDate,Date endDate) { + public int getOpeUseFlowTotalCountByName(String houseName,String reagentId, String reagentCode,String containerCode, Integer status, String userId,Date startDate,Date endDate) { try { Map<String, Object> params = new HashMap<String, Object>(); params.put("reagentName", reagentId); @@ -227,6 +228,7 @@ } params.put("houseName", houseName); + params.put("containerCode", containerCode); addParamByUserId(userId, params); params.put("status", status); -- Gitblit v1.9.2