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/PersonalUseInfoController.java | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/nanometer/smartlab/controller/PersonalUseInfoController.java b/src/main/java/com/nanometer/smartlab/controller/PersonalUseInfoController.java index bd1da35..72494d8 100644 --- a/src/main/java/com/nanometer/smartlab/controller/PersonalUseInfoController.java +++ b/src/main/java/com/nanometer/smartlab/controller/PersonalUseInfoController.java @@ -54,6 +54,7 @@ */ private LazyDataModel<OpeReagentStatus> dataModel; private String reagentId; + private String reagentName; private String reagentCode; private String applyPerson; private Date startTime; @@ -244,11 +245,11 @@ Map<String, Object> filters) { List<OpeUseFlow> list = null; try { - int count = opeUseFlowService.getPersonalUseInfoCount(reagentCode, getUserId(),startTime,endTime,receiptNumber,department,project); + int count = opeUseFlowService.getPersonalUseInfoCount(reagentCode, getUserId(),startTime,endTime,receiptNumber,department,project,applyPerson,reagentName); this.setRowCount(count); if (count > 0) { list = opeUseFlowService.getPersonalUseInfoList - (reagentCode, getUserId(),startTime,endTime ,receiptNumber,department,project,first,pageSize); + (reagentCode, getUserId(),startTime,endTime ,receiptNumber,department,project,applyPerson,reagentName,first,pageSize); } } catch (Exception e) { logger.error(e); @@ -365,4 +366,12 @@ public void setPrintTable(Hashtable printTable) { this.printTable = printTable; } + + public String getReagentName() { + return reagentName; + } + + public void setReagentName(String reagentName) { + this.reagentName = reagentName; + } } -- Gitblit v1.9.2