Merge remote-tracking branch 'origin/master'

李宇

2021-11-12 43ee95fbdcb6fe0a9d548d0935c23c232d5ffeaa

 src/main/java/com/nanometer/smartlab/controller/LaboratoryMngController.java

@@ -9,6 +9,7 @@
import com.nanometer.smartlab.entity.BaseMeta;
import com.nanometer.smartlab.entity.SysReagent;
import com.nanometer.smartlab.service.BaseMetaService;
import com.nanometer.smartlab.service.SysLaboratoryContainerService;
import com.nanometer.smartlab.service.SysProjectService;
import org.apache.log4j.Logger;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -43,6 +44,8 @@
   @Resource
   private SysLaboratoryService sysLaboratoryService;
   @Resource
   private SysLaboratoryContainerService sysLaboratoryContainerService;
   @Resource
   private BaseMetaService baseMetaService;
   @Resource
   private SysProjectService sysProjectService;
@@ -60,6 +63,7 @@
   private List<SysLaboratory> selectedList;
   private String type;
   private String name;
   private String project;

   private int action;

@@ -84,7 +88,7 @@

   public void exportLab2Excel(){
      try {
         List<Map> list = sysLaboratoryService.exportLabList(type, name);
         List<Map> list = sysLaboratoryService.exportLabList(type, name,project);
         sysLaboratoryService.exportLab2Excel(list);
         FacesUtils.info("导出成功");
      }catch (Exception e){
@@ -150,8 +154,9 @@

               }
               valuesList.add(cellInfo);


            }
            if (valuesList.size() != 8){
               break;
            }
            System.out.println("value :     "+valuesList);
            SysLaboratory laboratory=new SysLaboratory();
@@ -262,6 +267,7 @@
         }

         this.sysLaboratoryService.deleteSysLaboratory(this.selectedList);
         this.sysLaboratoryContainerService.delBySlcIds(this.selectedList);

         FacesUtils.info("删除成功。");
      } catch (Exception e) {
@@ -279,11 +285,12 @@
                  Map<String, Object> filters) {
               List<SysLaboratory> list = null;
               try {
                  int count = sysLaboratoryService.getSysLaboratoryTotalCount(type, name);
                  int count = sysLaboratoryService.getSysLaboratoryTotalCount(type, name,project);
                  this.setRowCount(count);
                  if (count > 0) {
                     list = sysLaboratoryService.getSysLaboratoryList(type, name, first, pageSize);
                     list = sysLaboratoryService.getSysLaboratoryList(type, name,project, first, pageSize);
                  }
                  selectedList = new ArrayList<> ();
               } catch (Exception e) {
                  logger.error(e);
               }
@@ -292,17 +299,17 @@

            @Override
            public SysLaboratory getRowData(String rowKey) {
               Iterator<SysLaboratory> iterator = this.iterator();
               if (iterator != null) {
                  SysLaboratory su = null;
                  while (iterator.hasNext()) {
                     su = iterator.next();
                     if (rowKey.equals(su.getId())) {
                        return su;
                     }
                  }
               }
               return null;
//               Iterator<SysLaboratory> iterator = this.iterator();
//               if (iterator != null) {
//                  SysLaboratory su = null;
//                  while (iterator.hasNext()) {
//                     su = iterator.next();
//                     if (rowKey.equals(su.getId())) {
//                        return su;
//                     }
//                  }
//               }
               return sysLaboratoryService.getSysLaboratory(rowKey);
            }
         };
      }
@@ -344,4 +351,12 @@
   public void setType(String type) {
      this.type = type;
   }

   public String getProject() {
      return project;
   }

   public void setProject(String project) {
      this.project = project;
   }
}