From 3ef5a9d0aba195d77aa22591b55a9ce9e43372ca Mon Sep 17 00:00:00 2001 From: lyfO_o <764716047@qq.com> Date: 星期四, 22 四月 2021 14:02:00 +0800 Subject: [PATCH] 实验室库存 新增查询条件:实验室名称 --- src/main/java/com/nanometer/smartlab/service/OpeReagentStatusServiceImpl.java | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusServiceImpl.java index b2245e9..73a3fd7 100644 --- a/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusServiceImpl.java +++ b/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusServiceImpl.java @@ -103,13 +103,14 @@ @Transactional(propagation = Propagation.REQUIRED) public List<OpeReagentStatus> getOpeReagentStatusListForLab(String name, String articleNumber, Integer status, - String reagentCode, String userId, Integer first, Integer pageSize) { + String reagentCode, String userId,String labName, Integer first, Integer pageSize) { try { Map<String, Object> params = new HashMap<String, Object>(); params.put("name", "%" + name + "%"); params.put("articleNumber", articleNumber); params.put("status", status); + params.put("labName", labName); // addParamByUserId(userId, params); if (StringUtils.isNotBlank(userId)) { SysUser sysUser = sysUserService.getSysUser(userId); @@ -137,7 +138,7 @@ @Transactional(propagation = Propagation.REQUIRED) public int getOpeReagentStatusTotalCountForLab(String name, String articleNumber, Integer status, String reagentCode, - String userId) { + String userId,String labName) { try { Map<String, Object> params = new HashMap<String, Object>(); params.put("name", "%" + name + "%"); @@ -159,6 +160,7 @@ params.put("reagentCode", "%" + reagentCode + "%"); } params.put("status", status); + params.put("labName", labName); return this.opeReagentStatusDao.getOpeReagentStatusTotalCountForLab(params); } catch (DataAccessException e) { logger.error(e.getMessage(), e); @@ -1090,12 +1092,13 @@ * @date 2021/4/22 10:33 */ @Override - public List<Map> selectExportList(String name, String articleNumber, Integer status, String reagentCode, String userId) { + public List<Map> selectExportList(String name, String articleNumber, Integer status, String reagentCode, String userId,String labName) { Map<String, Object> params = new HashMap<>(); params.put("name", name); params.put("articleNumber", articleNumber); params.put("status", status); + params.put("labName", labName); if (StringUtils.isNotBlank(userId)) { SysUser sysUser = sysUserService.getSysUser(userId); BaseRole baseRole = baseRoleService.getBaseRole(sysUser.getRoleId()); -- Gitblit v1.9.2