From 0dfab938c5116c8fa0191cadf36a47f5bb4f2936 Mon Sep 17 00:00:00 2001 From: lyfO_o <764716047@qq.com> Date: 星期四, 16 九月 2021 15:50:52 +0800 Subject: [PATCH] 申购:管制品 搜索 --- src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java | 6 ++++-- 1 files changed, 4 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 b1aa118..23bfaf4 100644 --- a/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java +++ b/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java @@ -69,7 +69,7 @@ private SysUserService sysUserService; @Transactional(propagation = Propagation.REQUIRED) - 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) { try { @@ -81,6 +81,7 @@ params.put("endDeadline", endDeadline); params.put("status", status); params.put("isShow", isShow); + params.put("controlProduct", controlProduct); if (StringUtils.isNotBlank(applyUserId)) { SysUser sysUser = sysUserService.getSysUser(applyUserId); @@ -192,7 +193,7 @@ } @Transactional(propagation = Propagation.REQUIRED) - 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) { try { Map<String, Object> params = new HashMap<String, Object>(); @@ -203,6 +204,7 @@ params.put("endDeadline", endDeadline); params.put("status", status); params.put("isShow", isShow); + params.put("controlProduct", controlProduct); if (StringUtils.isNotBlank(applyUserId)) { SysUser sysUser = sysUserService.getSysUser(applyUserId); -- Gitblit v1.9.2