From 43ee95fbdcb6fe0a9d548d0935c23c232d5ffeaa Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期五, 12 十一月 2021 12:49:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/nanometer/smartlab/service/OpeUseFlowService.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 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..aeca979 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);
@@ -38,15 +38,15 @@
OpeUseFlow getOpeUseFlowByCode(String reagentCode);
- void updateReceiptNumber(String code, String receiptNumber);
+ void updateReceiptNumber(String code, String receiptNumber,String note);
- void updateReceiptNumberByCode(List<OpeApplyReserve> codeTmp,String receiptNumber);
+ void updateReceiptNumberByCode(List<OpeApplyReserve> codeTmp,String receiptNumber,String note);
Map<String, Integer> getRegentInfoFromReceiptNumber(String receiptNumber);
Map<String,String> getApplyUserByReagentCode(String reagentCode);
- void updateReceiptNumberByCode2(List<OpeWarehouseReserve> codeTmp, String receiptNumber);
+ void updateReceiptNumberByCode2(List<OpeWarehouseReserve> codeTmp, String receiptNumber,String note);
int getPersonalUseInfoCount(String reagentCode,String userId, Date startTime, Date endTime, String receiptNumber, String department, String project,String applyPerson,String reagentName);
@@ -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