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/service/OpeUseFlowService.java | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/nanometer/smartlab/service/OpeUseFlowService.java b/src/main/java/com/nanometer/smartlab/service/OpeUseFlowService.java index d88b180..2e97dae 100644 --- a/src/main/java/com/nanometer/smartlab/service/OpeUseFlowService.java +++ b/src/main/java/com/nanometer/smartlab/service/OpeUseFlowService.java @@ -24,9 +24,9 @@ int getOpeUseFlowTotalCount(String reagentId, String reagentCode, Integer status, String userId); List<OpeUseFlow> getOpeUseFlowListByName(String houseName,String reagentId, String reagentCode,String containerCode, Integer status, String userId, Date startDate,Date endDate, - Integer first, Integer pageSize); + Integer first, Integer pageSize,String operatestate); - int getOpeUseFlowTotalCountByName(String houseName, String reagentId, String reagentCode,String containerCode, Integer status, String userId, Date startDate,Date endDate); + int getOpeUseFlowTotalCountByName(String houseName, String reagentId, String reagentCode,String containerCode, Integer status, String userId, Date startDate,Date endDate,String operatestate); boolean update(OpeUseFlow opeUseFlow); @@ -63,4 +63,8 @@ OpeUseFlow selectById(String rowKey); OpeUseFlow selectByReceiptNumber(String receiptNumber,String userId); + + List<Map> selectAll(String houseName, String reagentId, String reagentCode, String containerCode, String userId, Date startDate, Date endDate); + + boolean export2Excel(List<Map> list) throws Exception; } -- Gitblit v1.9.2