修改危废统计

李宇

2021-07-02 3da43e60cd97ad330dcc0911d76bb3c395a65b0c

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

@@ -52,6 +52,8 @@

   private String containerCode;

   private String operatestate;

   public String getHouseName() {
      return houseName;
   }
@@ -105,11 +107,12 @@
                  Map<String, Object> filters) {
               List<OpeUseFlow> list = null;
               try {
                  int count = opeUseFlowService.getOpeUseFlowTotalCountByName(houseName,reagentId, reagentCode, containerCode,null, getUserId(),startDate,endDate);
                  int count = opeUseFlowService.getOpeUseFlowTotalCountByName(houseName,reagentId, reagentCode, containerCode,null, getUserId(),startDate,endDate,operatestate);
                  this.setRowCount(count);
                  if (count > 0) {
                     list = opeUseFlowService.getOpeUseFlowListByName(houseName,reagentId, reagentCode, containerCode,null, getUserId(),startDate,endDate, first, pageSize);
                     list = opeUseFlowService.getOpeUseFlowListByName(houseName,reagentId, reagentCode, containerCode,null, getUserId(),startDate,endDate, first, pageSize,operatestate);
                  }
                  selectedOne = null;
               } catch (Exception e) {
                  logger.error(e);
               }
@@ -118,26 +121,36 @@

            @Override
            public OpeUseFlow getRowData(String rowKey) {
               Iterator<OpeUseFlow> iterator = this.iterator();
               OpeUseFlow temp = null;
               if(iterator!= null)
               {
                  while(iterator.hasNext())
                  {
                     temp=iterator.next();
                     if(rowKey.equals(temp.getId()))
                     {
                        return temp;
                     }
                  }
               }

               return temp;
//               Iterator<OpeUseFlow> iterator = this.iterator();
//               OpeUseFlow temp = null;
//               if(iterator!= null)
//               {
//                  while(iterator.hasNext())
//                  {
//                     temp=iterator.next();
//                     if(rowKey.equals(temp.getId()))
//                     {
//                        return temp;
//                     }
//                  }
//               }
               return opeUseFlowService.selectById(rowKey);
            }
         };
      }

      return dataModel;
   }

   public void export2Excel() {

      List<Map> list = opeUseFlowService.selectAll(houseName,reagentId, reagentCode, containerCode,getUserId(),startDate,endDate);
      try{
         boolean isexport = opeUseFlowService.export2Excel(list);
      }catch (Exception e){
         e.printStackTrace();
         FacesUtils.warn("导出失败");
      }
   }

   public String getReagentId() {
@@ -275,4 +288,12 @@
   public void setSelectedOne(OpeUseFlow selectedOne) {
      this.selectedOne = selectedOne;
   }

   public void setOperatestate(String operatestate) {
      this.operatestate = operatestate;
   }

   public String getOperatestate(){
      return operatestate;
   }
}