仓库状态加日期

lyfO_o

2022-02-10 aee83e0836bfa9647b9bc3dc39644dc8ca66912f

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

@@ -170,6 +170,7 @@
      printTable.put("project", selectOne.getProject());
      SysLaboratory sysLaboratory = sysLaboratoryService.getSysLaboratory(selectOne.getHouseId());
      printTable.put("lab", sysLaboratory.getName());
      printTable.put("note",selectOne.getNote() == null?"":selectOne.getNote());
      //整理数据
      List<PersonUseDetail> applyInfo = opeUseFlowService.getApplyInfo(selectOne.getReceiptNumber());
      assert applyInfo.size() > 0;
@@ -272,6 +273,7 @@
                     list = opeUseFlowService.getPersonalUseInfoList
                           (reagentCode,  getUserId(),startTime,endTime ,receiptNumber,department,project,applyPerson,reagentName,first,pageSize);
                  }
                  selectOne = null;
               } catch (Exception e) {
                  logger.error(e);
               }
@@ -280,17 +282,17 @@

            @Override
            public OpeUseFlow getRowData(String rowKey) {
               Iterator<OpeUseFlow> iterator = this.iterator();
               if (iterator != null) {
                  OpeUseFlow su = null;
                  while (iterator.hasNext()) {
                     su = iterator.next();
                     if (rowKey.equals(su.getReceiptNumber())) {
                        return su;
                     }
                  }
               }
               return null;
//               Iterator<OpeUseFlow> iterator = this.iterator();
//               if (iterator != null) {
//                  OpeUseFlow su = null;
//                  while (iterator.hasNext()) {
//                     su = iterator.next();
//                     if (rowKey.equals(su.getReceiptNumber())) {
//                        return su;
//                     }
//                  }
//               }
               return opeUseFlowService.selectByReceiptNumber(rowKey,getUserId());
            }
         };
      }
@@ -322,16 +324,27 @@
   }

   public Date getStartTime() {
      return startTime;
      if (null == startTime){
         Date now = new Date();
         Calendar cal = Calendar.getInstance();
         cal.setTime(now);
         cal.add(Calendar.DATE, -7);
         return cal.getTime();
      }else {
         return startTime;
      }
   }

   public void setStartTime(Date startTime) {
      this.startTime = startTime;
   }


   public Date getEndTime() {
      return endTime;
      if (null == endTime){
         return new Date();
      }else {
         return endTime;
      }
   }

   public void setEndTime(Date endTime) {