From d2be6e4afe1dba009b56f8555792f2823f9e4535 Mon Sep 17 00:00:00 2001 From: gdg <764716047@qq.com> Date: 星期一, 22 二月 2021 10:34:59 +0800 Subject: [PATCH] 订单入库备货领取的返回 和修改 试剂直接入库和试剂管理 的搜索排序 --- src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerServiceImpl.java | 27 ++++++++++++++++++++------- 1 files changed, 20 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerServiceImpl.java index ab07a2d..5a5a6f6 100644 --- a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerServiceImpl.java +++ b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerServiceImpl.java @@ -38,7 +38,7 @@ @Transactional(propagation = Propagation.REQUIRED) public List<SysLaboratoryContainer> getSysLaboratoryContainerList(String laboratoryType, String laboratoryName, - String laboratoryId, Integer first, Integer pageSize) { + String laboratoryId,String project,String controllerName, Integer first, Integer pageSize) { try { Map<String, Object> params = new HashMap<String, Object>(); if (StringUtils.isNotBlank(laboratoryType)) { @@ -50,6 +50,8 @@ if (StringUtils.isNotBlank(laboratoryId)) { params.put("laboratoryId", laboratoryId); } + params.put("project", project); + params.put("controllerName", controllerName); params.put("first", first); params.put("pageSize", pageSize); return this.sysLaboratoryContainerDao.getSysLaboratoryContainerList(params); @@ -63,11 +65,11 @@ @Transactional(propagation = Propagation.REQUIRED) public List<SysLaboratoryContainer> getSysLaboratoryContainerList( String laboratoryId) { - return getSysLaboratoryContainerList(null,null,laboratoryId,null,null); + return getSysLaboratoryContainerList(null,null,laboratoryId,null,null,null,null); } @Transactional(propagation = Propagation.REQUIRED) - public int getSysLaboratoryContainerTotalCount(String laboratoryType, String laboratoryName, String laboratoryId) { + public int getSysLaboratoryContainerTotalCount(String laboratoryType, String laboratoryName, String laboratoryId,String project,String controllerName) { try { Map<String, Object> params = new HashMap<String, Object>(); if (StringUtils.isNotBlank(laboratoryType)) { @@ -79,6 +81,8 @@ if (StringUtils.isNotBlank(laboratoryId)) { params.put("laboratoryId", laboratoryId); } + params.put("project", project); + params.put("controllerName", controllerName); return this.sysLaboratoryContainerDao.getSysLaboratoryContainerTotalCount(params); } catch (DataAccessException e) { logger.error(e.getMessage(), e); @@ -258,10 +262,12 @@ } @Override - public List<Map> exportExcelList(String laboratoryType, String laboratoryName) { + public List<Map> exportExcelList(String laboratoryType, String laboratoryName,String project,String controllerName) { Map<String, String> params = new HashMap<>(); params.put("type", laboratoryType); params.put("name", laboratoryName); + params.put("project", project); + params.put("controllerName", controllerName); return sysLaboratoryContainerDao.exportExcelList(params); } @@ -276,15 +282,22 @@ map.put("infoCode", "临时存储库状态码"); map.put("structure", "临时存储库结构"); map.put("name", "临时存储库名称"); + map.put("project", "课题组"); ExcelUtils.export2Excel(list,"实验室临时存储库管理",map); } @Override public List<String> selectProjectsByContainerCode(String containerCode) { - String projects = sysLaboratoryContainerDao.selectProjectsByContainerCode(containerCode); - if (projects != null){ - return Arrays.asList(projects.split(",")); + List<String> projects = sysLaboratoryContainerDao.selectProjectsByContainerCode(containerCode); + if (projects.size() > 0){ + List<String> projectList = new ArrayList<>(); + for (String project : projects){ + if (StringUtils.isNotBlank(project)){ + projectList.addAll(Arrays.asList(project.split(","))); + } + } + return projectList; } return null; } -- Gitblit v1.9.2