修改枪领用

李宇

2021-02-07 422622d3121acde709e79ca9b92f30c47e05272c

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

@@ -2,16 +2,13 @@

import java.io.InputStream;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.*;

import javax.annotation.Resource;

import com.nanometer.smartlab.entity.BaseMeta;
import com.nanometer.smartlab.entity.SysLaboratory;
import com.nanometer.smartlab.service.SysLaboratoryService;
import com.nanometer.smartlab.service.*;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -29,9 +26,6 @@

import com.nanometer.smartlab.entity.SysController;
import com.nanometer.smartlab.entity.SysLaboratoryContainer;
import com.nanometer.smartlab.service.BaseMetaService;
import com.nanometer.smartlab.service.SysControllerService;
import com.nanometer.smartlab.service.SysLaboratoryContainerService;
import com.nanometer.smartlab.util.Constants;
import com.nanometer.smartlab.util.FacesUtils;

@@ -55,6 +49,8 @@
    private BaseMetaService baseMetaService;
   @Resource
   private SysLaboratoryService sysLaboratoryService;
   @Resource
   private SysProjectService sysProjectService;
   /**
    * 数据源
    */
@@ -72,6 +68,8 @@

   private String laboratoryType;
   private String laboratoryName;
   private String project;
   private String controllerName;

   private int action;

@@ -228,7 +226,7 @@
   public void export2Excel(){

      try {
         List<Map> list = sysLaboratoryContainerService.exportExcelList(laboratoryType, laboratoryName);
         List<Map> list = sysLaboratoryContainerService.exportExcelList(laboratoryType, laboratoryName,project,controllerName);
         sysLaboratoryContainerService.export2Excel(list);
      }catch (Exception e){
         e.printStackTrace();
@@ -295,15 +293,28 @@
            System.out.println("value :     "+valuesList);
            SysLaboratoryContainer sysLaboratoryContainer=new SysLaboratoryContainer();
            sysLaboratoryContainer.setLaboratoryId(getLabId(sysLaboratories,valuesList.get(0)));
            sysLaboratoryContainer.setControllerCode(getConCode(sysControllers,valuesList.get(1)));
            sysLaboratoryContainer.setContainerCode(valuesList.get(2));
            sysLaboratoryContainer.setType(getBaseMetaId(typeList,valuesList.get(3)));
            sysLaboratoryContainer.setInfoCode(valuesList.get(4));
            sysLaboratoryContainer.setStructure(getBaseMetaId(struList,valuesList.get(5)));
            sysLaboratoryContainer.setName(valuesList.get(6));
            if(valuesList.get(3).equals("智能柜")){
               sysLaboratoryContainer.setCharacterLeft(getBaseMetaId(charList,valuesList.get(7)));
               sysLaboratoryContainer.setCharacterRight(getBaseMetaId(charList,valuesList.get(8)));
            if (!valuesList.get(1).replace(" ","").isEmpty()){
               List<String> projects = Arrays.asList(valuesList.get(1).split(","));
               for (String project : projects) {
                  //不存再就直接推出
                  if (!sysProjectService.isExistProject(project)) {
                     throw new Exception("课题组不存在,（" + i  + "行）");
                  }
               }
               //都存在就设置
               sysLaboratoryContainer.setProject(valuesList.get(1).replace(" ",""));
            }else{
               sysLaboratoryContainer.setProject(null);
            }
            sysLaboratoryContainer.setControllerCode(getConCode(sysControllers,valuesList.get(2)));
            sysLaboratoryContainer.setContainerCode(valuesList.get(3));
            sysLaboratoryContainer.setType(getBaseMetaId(typeList,valuesList.get(4)));
            sysLaboratoryContainer.setInfoCode(valuesList.get(5));
            sysLaboratoryContainer.setStructure(getBaseMetaId(struList,valuesList.get(6)));
            sysLaboratoryContainer.setName(valuesList.get(7));
            if(valuesList.get(4).equals("智能柜")){
               sysLaboratoryContainer.setCharacterLeft(getBaseMetaId(charList,valuesList.get(8)));
               sysLaboratoryContainer.setCharacterRight(getBaseMetaId(charList,valuesList.get(9)));
            }
            sysLaboratoryContainers.add(sysLaboratoryContainer);
         }
@@ -384,11 +395,11 @@
               List<SysLaboratoryContainer> list = null;
               try {
                  int count = sysLaboratoryContainerService.getSysLaboratoryContainerTotalCount(laboratoryType,
                        laboratoryName,null);
                        laboratoryName,null,project,controllerName);
                  this.setRowCount(count);
                  if (count > 0) {
                     list = sysLaboratoryContainerService.getSysLaboratoryContainerList(laboratoryType,
                           laboratoryName,null, first, pageSize);
                           laboratoryName,null,project,controllerName, first, pageSize);
                  }
               } catch (Exception e) {
                  logger.error(e);
@@ -460,10 +471,8 @@
   }

   public List<SysController> getControllers() {
      if(controllers == null)
      {
         this.controllers = sysControllerService.getAllControllerList();
      }

      return controllers;
   }

@@ -471,4 +480,19 @@
      this.controllers = controllers;
   }

   public String getProject() {
      return project;
   }

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

   public String getControllerName() {
      return controllerName;
   }

   public void setControllerName(String controllerName) {
      this.controllerName = controllerName;
   }
}