From d00d1d584875b5b38c70c235963b46543a3eba28 Mon Sep 17 00:00:00 2001 From: 李宇 <986321569@qq.com> Date: 星期二, 15 六月 2021 12:30:01 +0800 Subject: [PATCH] 修改发送邮件 --- src/main/java/com/nanometer/smartlab/controller/LaboratoryStockMngController.java | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/nanometer/smartlab/controller/LaboratoryStockMngController.java b/src/main/java/com/nanometer/smartlab/controller/LaboratoryStockMngController.java index 8fd719b..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); @@ -163,6 +164,19 @@ }; } return reagentStoreDataModel; + } + + + public void exportLabStock() { + try { + List<Map> list = opeReagentStatusService.selectExportList(reagentId, null, + ArrivalStatus.LABORATORY.getKey(), reagentCode, getUserId(),labName); + opeReagentStatusService.exportLabStock2Excel(list); + FacesUtils.info("导出成功"); + }catch (Exception e){ + e.printStackTrace(); + FacesUtils.warn("导出失败"); + } } public int getAction() { @@ -270,4 +284,11 @@ this.laboratoryContainers = laboratoryContainers; } + public String getLabName() { + return labName; + } + + public void setLabName(String labName) { + this.labName = labName; + } } -- Gitblit v1.9.2