实验室库存 新增查询条件:实验室名称

lyfO_o

2021-04-22 3ef5a9d0aba195d77aa22591b55a9ce9e43372ca

 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,6 +282,7 @@
      map.put("infoCode", "临时存储库状态码");
      map.put("structure", "临时存储库结构");
      map.put("name", "临时存储库名称");
      map.put("project", "课题组");
      ExcelUtils.export2Excel(list,"实验室临时存储库管理",map);

   }