From 29166bc750623bea12a367ba7c527facdb582235 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: Tue, 13 Jul 2021 17:12:28 +0800
Subject: [PATCH] 修改转移试剂，生成领用单
---
src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java | 40 ++++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java
index b0a143e..2047277 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java
@@ -469,22 +469,22 @@
if (null != startDate){
try {
- params.put("startDate",sdfstart.format(startDate));
+ params.put("startTime",sdfstart.format(startDate));
}catch (Exception e){
e.printStackTrace();
}
}else {
- params.put("startDate",sdfstart.format(startTime));
+ params.put("startTime",sdfstart.format(startTime));
}
if (null != endDate){
try {
- params.put("endDate",sdfend.format(endDate));
+ params.put("endTime",sdfend.format(endDate));
}catch (Exception e){
e.printStackTrace();
}
}else {
- params.put("endDate",sdfend.format(now));
+ params.put("endTime",sdfend.format(now));
}
params.put("userId", userId);
@@ -501,9 +501,9 @@
//操作状态位仓库领取
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());
+// metaMap2.put("metaKey", String.valueOf(OperateStatus.WAREHOUSEOUT.getKey()));
+// List<BaseMeta> baseMetas = baseMetaDao.getBaseMetaList(metaMap2);
+// params.put("operatestate", baseMetas.get(0).getId());
addParamByUserId(userId, params);
return opeUseFlowDao.countPersonalUseInfo(params);
@@ -522,21 +522,21 @@
Date startTime = cal.getTime();
if (null != startDate){
try {
- params.put("startDate",sdfstart.format(startDate));
+ params.put("startTime",sdfstart.format(startDate));
}catch (Exception e){
e.printStackTrace();
}
}else {
- params.put("startDate",sdfstart.format(startTime));
+ params.put("startTime",sdfstart.format(startTime));
}
if (null != endDate){
try {
- params.put("endDate",sdfend.format(endDate));
+ params.put("endTime",sdfend.format(endDate));
}catch (Exception e){
e.printStackTrace();
}
}else {
- params.put("endDate",sdfend.format(now));
+ params.put("endTime",sdfend.format(now));
}
params.put("userId", userId);
params.put("receiptNumber", receiptNumber);
@@ -548,9 +548,9 @@
//操作状态位仓库领取
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());
+// metaMap2.put("metaKey", String.valueOf(OperateStatus.WAREHOUSEOUT.getKey()));
+// List<BaseMeta> baseMetas = baseMetaDao.getBaseMetaList(metaMap2);
+// params.put("operatestate", baseMetas.get(0).getId());
params.put("first", first);
params.put("pageSize", pageSize);
@@ -563,9 +563,9 @@
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());
+// 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.getApplyInfo(params);
@@ -643,9 +643,9 @@
//操作状态位仓库领取
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());
+// metaMap2.put("metaKey", String.valueOf(OperateStatus.WAREHOUSEOUT.getKey()));
+// List<BaseMeta> baseMetas = baseMetaDao.getBaseMetaList(metaMap2);
+// params.put("operatestate", baseMetas.get(0).getId());
addParamByUserId(userId, params);
--
Gitblit v1.9.2