Merge remote-tracking branch 'remotes/origin/yufei' into master

gdg

2021-01-29 31ffbaf322685984516cfb284fa58741debf4e96

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

@@ -163,6 +163,7 @@
   private String endReagentCode;
   private String startReagentCodeForPerson;
   private String endReagentCodeForPerson;
   private String warehouseName;

   private Integer editFlag;
   private StreamedContent file;
@@ -373,7 +374,7 @@

   private void initUserSelectList() {
      logger.info("WarehouseStockMngController initUserSelectList start");
      this.setUserSelectList(this.sysUserService.getSysUserList(null, null, null, null, null));
      this.setUserSelectList(this.sysUserService.getSysUserList(null, null, null, null, null,null,null));
      /**if(sysUserService.getSysUser(userId) == null)
      {
         this.laboratory = this.sysLaboratoryService.getSysLaboratoryListByDep(this.getUserDepartment());
@@ -1658,11 +1659,11 @@
                  Map<String, Object> filters) {
               List<OpeWarehouseReserve> list = null;
               try {
                  int count = opeWarehouseReserveService.getOpeWarehouseReserveTotalCountByName(reagentId, supplierId,productSn);
                  int count = opeWarehouseReserveService.getOpeWarehouseReserveTotalCountByName(reagentId, supplierId,productSn,warehouseName);
                  this.setRowCount(count);
                  if (count > 0) {
                     list = opeWarehouseReserveService.getOpeWarehouseReserveListByName(reagentId, supplierId, first,
                           pageSize,productSn);
                           pageSize,productSn,warehouseName);
                  }
               } catch (Exception e) {
                  logger.error(e);
@@ -1934,7 +1935,7 @@
            realDataList=selectedList;
         }else {
            realDataList = opeWarehouseReserveService.getOpeWarehouseReserveListByName(reagentId, supplierId, null,
                  null,productSn);
                  null,productSn,warehouseName);
         }
            List<String> headerList = new ArrayList<>();
            headerList.add("试剂名称");
@@ -2535,7 +2536,7 @@
            list.add(sysUser);
            applyUserSelectList = list;
         } else {
            applyUserSelectList = this.sysUserService.getSysUserList(null, null, null, null, null);
            applyUserSelectList = this.sysUserService.getSysUserList(null, null, null, null, null,null,null);
         }
      }
      return applyUserSelectList;
@@ -2864,7 +2865,7 @@
   }

   public List getConsignee() {
      List<SysUser> dataList = this.sysUserService.getSysUserList(null, null, null, null, null);
      List<SysUser> dataList = this.sysUserService.getSysUserList(null, null, null, null, null,null,null);
      //将admin置于首位
      for (int i = 0; i < dataList.size(); i++) {
         if ("admin".equals(dataList.get(i).getAccount())){
@@ -3002,4 +3003,12 @@
   public void setReceiptNumber(String receiptNumber) {
      this.receiptNumber = receiptNumber;
   }

   public String getWarehouseName() {
      return warehouseName;
   }

   public void setWarehouseName(String warehouseName) {
      this.warehouseName = warehouseName;
   }
}