Merge remote-tracking branch 'remotes/origin/yufei' into master

gdg

2021-02-01 1cbac7aa20a183a9a893651bf0cef24b1909eb5c

 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);
@@ -282,9 +286,15 @@

    @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;
    }