From 3ef5a9d0aba195d77aa22591b55a9ce9e43372ca Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期四, 22 四月 2021 14:02:00 +0800
Subject: [PATCH] 实验室库存 新增查询条件:实验室名称
---
src/main/java/com/nanometer/smartlab/controller/LaboratoryStockMngController.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/LaboratoryStockMngController.java b/src/main/java/com/nanometer/smartlab/controller/LaboratoryStockMngController.java
index f0cd689..cf861c5 100644
--- a/src/main/java/com/nanometer/smartlab/controller/LaboratoryStockMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/LaboratoryStockMngController.java
@@ -59,6 +59,7 @@
private List<SysLaboratoryContainer> laboratoryContainers;
private String reagentCode;
+ private String labName;
/**
* 数据模型
@@ -93,11 +94,11 @@
System.out.println(reagentId);
try {
int count = opeReagentStatusService.getOpeReagentStatusTotalCountForLab(reagentId, null,
- ArrivalStatus.LABORATORY.getKey(), reagentCode, getUserId());
+ ArrivalStatus.LABORATORY.getKey(), reagentCode, getUserId(),labName);
this.setRowCount(count);
if (count > 0) {
list = opeReagentStatusService.getOpeReagentStatusListForLab(reagentId, null,
- ArrivalStatus.LABORATORY.getKey(), reagentCode, getUserId(), first, pageSize);
+ ArrivalStatus.LABORATORY.getKey(), reagentCode, getUserId(),labName, first, pageSize);
}
} catch (Exception e) {
logger.error(e);
@@ -169,7 +170,7 @@
public void exportLabStock() {
try {
List<Map> list = opeReagentStatusService.selectExportList(reagentId, null,
- ArrivalStatus.LABORATORY.getKey(), reagentCode, getUserId());
+ ArrivalStatus.LABORATORY.getKey(), reagentCode, getUserId(),labName);
opeReagentStatusService.exportLabStock2Excel(list);
FacesUtils.info("导出成功");
}catch (Exception e){
@@ -283,4 +284,11 @@
this.laboratoryContainers = laboratoryContainers;
}
+ public String getLabName() {
+ return labName;
+ }
+
+ public void setLabName(String labName) {
+ this.labName = labName;
+ }
}
--
Gitblit v1.9.2