From e3f9c9350c14707277b4fbf03a4d78c75ec04174 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期一, 01 二月 2021 10:16:04 +0800
Subject: [PATCH] 增加搜索
---
src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java
index 96f81ab..d14da94 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java
@@ -459,7 +459,8 @@
}
@Override
- public int getPersonalUseInfoCount(String reagentCode,String userId, Date startTime, Date endTime, String receiptNumber, String department, String project) {
+ public int getPersonalUseInfoCount(String reagentCode,String userId, Date startTime, Date endTime, String receiptNumber,
+ String department, String project,String applyPerson,String reagentName) {
Map<String,Object> params = new HashMap<>();
params.put("userId", userId);
params.put("startTime", startTime);
@@ -468,6 +469,12 @@
params.put("department", department);
params.put("project", project);
params.put("reagentCode", reagentCode);
+ params.put("applyPerson", applyPerson);
+ if (StringUtils.isNotBlank(reagentName)) {
+ //根据试剂名获取单号
+
+ }
+ params.put("reagentName", reagentName);
//操作状态位仓库领取
Map<String, String> metaMap2 = new HashMap<>();
metaMap2.put("groupId", "operate_status");
@@ -480,7 +487,8 @@
}
@Override
- public List<OpeUseFlow> getPersonalUseInfoList(String reagentCode,String userId, Date startTime, Date endTime, String receiptNumber, String department, String project, int first, int pageSize) {
+ public 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) {
Map<String, Object> params = new HashMap<>();
params.put("userId", userId);
params.put("startTime", startTime);
@@ -489,6 +497,8 @@
params.put("department", department);
params.put("project", project);
params.put("reagentCode", reagentCode);
+ params.put("applyPerson", applyPerson);
+ params.put("reagentName", reagentName);
//操作状态位仓库领取
Map<String, String> metaMap2 = new HashMap<>();
metaMap2.put("groupId", "operate_status");
@@ -517,4 +527,18 @@
}
+ @Override
+ public int getApplyInfoSize(String receiptNumber) {
+ Map<String,Object> params = new HashMap<>();
+ Map<String, String> metaMap2 = new HashMap<>();
+ metaMap2.put("groupId", "operate_status");
+ metaMap2.put("metaKey", String.valueOf(OperateStatus.WAREHOUSEOUT.getKey()));
+ List<BaseMeta> baseMetas = baseMetaDao.getBaseMetaList(metaMap2);
+ params.put("operatestate", baseMetas.get(0).getId());
+ params.put("receiptNumber", receiptNumber);
+
+ return opeUseFlowDao.getApplyInfoSize(params);
+
+ }
+
}
--
Gitblit v1.9.2