From badb24bad173d03941aef128d3ec74188a4e4467 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Tue, 02 Feb 2021 14:37:47 +0800
Subject: [PATCH] 实验室导出
---
src/main/java/com/nanometer/smartlab/service/OpeUseFlowService.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/OpeUseFlowService.java b/src/main/java/com/nanometer/smartlab/service/OpeUseFlowService.java
index 8c8242d..952b16d 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeUseFlowService.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeUseFlowService.java
@@ -3,7 +3,7 @@
import com.nanometer.smartlab.entity.OpeApplyReserve;
import com.nanometer.smartlab.entity.OpeUseFlow;
import com.nanometer.smartlab.entity.OpeWarehouseReserve;
-import com.nanometer.smartlab.entity.SysReagent;
+import com.nanometer.smartlab.entity.dto.PersonUseDetail;
import java.text.ParseException;
import java.util.Date;
@@ -23,10 +23,10 @@
int getOpeUseFlowTotalCount(String reagentId, String reagentCode, Integer status, String userId);
- List<OpeUseFlow> getOpeUseFlowListByName(String houseName,String reagentId, String reagentCode, Integer status, String userId, Date startDate,Date endDate,
+ List<OpeUseFlow> getOpeUseFlowListByName(String houseName,String reagentId, String reagentCode,String containerCode, Integer status, String userId, Date startDate,Date endDate,
Integer first, Integer pageSize);
- int getOpeUseFlowTotalCountByName(String houseName, String reagentId, String reagentCode, 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);
boolean update(OpeUseFlow opeUseFlow);
@@ -47,4 +47,13 @@
Map<String,String> getApplyUserByReagentCode(String reagentCode);
void updateReceiptNumberByCode2(List<OpeWarehouseReserve> codeTmp, String receiptNumber);
+
+ int getPersonalUseInfoCount(String reagentCode,String userId, Date startTime, Date endTime, String receiptNumber, String department, String project,String applyPerson,String reagentName);
+
+ List<OpeUseFlow> getPersonalUseInfoList(String reagentCode,String userId, Date startTime, Date endTime, String receiptNumber, String department, String project,String applyPerson,String reagentName, int first, int pageSize);
+
+ List<PersonUseDetail> getApplyInfo(String receiptNumber);
+
+ int getApplyInfoSize(String receiptNumber);
+
}
--
Gitblit v1.9.2