修改危废状态

李宇

2021-02-02 5eaa5ee48d6b55246ec47c1c75ba00f8ddc0fb8f

 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);