From e3f9c9350c14707277b4fbf03a4d78c75ec04174 Mon Sep 17 00:00:00 2001 From: gdg <764716047@qq.com> Date: 星期一, 01 二月 2021 10:16:04 +0800 Subject: [PATCH] 增加搜索 --- src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java b/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java index ecde8c7..008d127 100644 --- a/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java +++ b/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java @@ -166,6 +166,7 @@ private String warehouseName; private Integer editFlag; + private Integer isAllApply = 0; private StreamedContent file; @Value("${pdf.export.file.path}") private String pdfExportFilePath; @@ -1735,11 +1736,11 @@ } try { - int count = opeApplyService.getOpeApplyReserveTotalCountByNameFor(id,reagentId, userName,productSn,applyCode,status); + int count = opeApplyService.getOpeApplyReserveTotalCountByNameFor(id, reagentId, userName, productSn, applyCode, status, isAllApply); this.setRowCount(count); if (count > 0) { - list = opeApplyService.getOpeApplyReserveListByNameFor(id,reagentId, userName, first, - pageSize,productSn,applyCode,status); + list = opeApplyService.getOpeApplyReserveListByNameFor(id, reagentId, userName, first, + pageSize, productSn, applyCode, status, isAllApply); } } catch (Exception e) { logger.error(e); @@ -1844,7 +1845,7 @@ realDataList=selectedListForPerson; }else { realDataList = opeApplyService.getOpeApplyReserveListByNameFor(id,reagentId, userName, null, - null,productSn,applyCode,status); + null,productSn,applyCode,status,isAllApply); } List<String> headerList = new ArrayList<>(); headerList.add("申购编号"); @@ -3037,4 +3038,12 @@ public void setWarehouseName(String warehouseName) { this.warehouseName = warehouseName; } + + public Integer getIsAllApply() { + return isAllApply; + } + + public void setIsAllApply(Integer isAllApply) { + this.isAllApply = isAllApply; + } } -- Gitblit v1.9.2