From 5758b702aceacd76f2a1e1a63d848cd4948e99e1 Mon Sep 17 00:00:00 2001 From: 李宇 <986321569@qq.com> Date: 星期五, 02 七月 2021 10:15:52 +0800 Subject: [PATCH] 导出试剂流向,修改个人领用查询 --- src/main/java/com/nanometer/smartlab/controller/OpeUseFlowInfoController.java | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/nanometer/smartlab/controller/OpeUseFlowInfoController.java b/src/main/java/com/nanometer/smartlab/controller/OpeUseFlowInfoController.java index 2d8c5cb..03dd8aa 100644 --- a/src/main/java/com/nanometer/smartlab/controller/OpeUseFlowInfoController.java +++ b/src/main/java/com/nanometer/smartlab/controller/OpeUseFlowInfoController.java @@ -52,6 +52,8 @@ private String containerCode; + private String operatestate; + public String getHouseName() { return houseName; } @@ -105,10 +107,10 @@ Map<String, Object> filters) { List<OpeUseFlow> list = null; try { - int count = opeUseFlowService.getOpeUseFlowTotalCountByName(houseName,reagentId, reagentCode, containerCode,null, getUserId(),startDate,endDate); + int count = opeUseFlowService.getOpeUseFlowTotalCountByName(houseName,reagentId, reagentCode, containerCode,null, getUserId(),startDate,endDate,operatestate); this.setRowCount(count); if (count > 0) { - list = opeUseFlowService.getOpeUseFlowListByName(houseName,reagentId, reagentCode, containerCode,null, getUserId(),startDate,endDate, first, pageSize); + list = opeUseFlowService.getOpeUseFlowListByName(houseName,reagentId, reagentCode, containerCode,null, getUserId(),startDate,endDate, first, pageSize,operatestate); } selectedOne = null; } catch (Exception e) { @@ -138,6 +140,17 @@ } return dataModel; + } + + public void export2Excel() { + + List<Map> list = opeUseFlowService.selectAll(houseName,reagentId, reagentCode, containerCode,getUserId(),startDate,endDate); + try{ + boolean isexport = opeUseFlowService.export2Excel(list); + }catch (Exception e){ + e.printStackTrace(); + FacesUtils.warn("导出失败"); + } } public String getReagentId() { @@ -275,4 +288,12 @@ public void setSelectedOne(OpeUseFlow selectedOne) { this.selectedOne = selectedOne; } + + public void setOperatestate(String operatestate) { + this.operatestate = operatestate; + } + + public String getOperatestate(){ + return operatestate; + } } -- Gitblit v1.9.2