From 3e6202c61c182bc26150f1e30caa9c9519659cc8 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期二, 17 八月 2021 13:35:58 +0800
Subject: [PATCH] 修改个人领用查询
---
src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml | 21 +++++++---
src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java | 47 +++++++++++++++++------
2 files changed, 50 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml b/src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml
index 0a2d528..2c693b9 100644
--- a/src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml
@@ -200,7 +200,9 @@
LEFT JOIN sys_reagent sr2 on sr2.id = ouf.user_id
</if>
WHERE
- LENGTH(trim(ouf.receipt_number))>0
+ (ouf.operatestate = #{operatestate}
+ or ouf.operatestate = #{operatestate1})
+ and LENGTH(trim(ouf.receipt_number))>0
and ouf.valid_flag = 1
<if test="reagentCode !=null and reagentCode != ''">
and ouf.reagent_code like concat("%",#{reagentCode},"%")
@@ -249,7 +251,10 @@
<if test="userId !=null and userId != ''">
LEFT JOIN sys_reagent sr2 on sr2.id = ouf.user_id
</if>
- WHERE LENGTH(trim(ouf.receipt_number))>0
+ WHERE
+ (ouf.operatestate = #{operatestate}
+ or ouf.operatestate = #{operatestate1})
+ and LENGTH(trim(ouf.receipt_number))>0
and ouf.valid_flag = 1
<if test="reagentCode !=null and reagentCode != ''">
and ouf.reagent_code like concat("%",#{reagentCode},"%")
@@ -300,7 +305,9 @@
LEFT JOIN base_meta bm2 on bm2.id = sr.product_home
LEFT JOIN base_meta bm3 on bm3.id = sr.control_products
WHERE
- ouf.receipt_number = #{receiptNumber}
+ (ouf.operatestate = #{operatestate}
+ or ouf.operatestate = #{operatestate1})
+ and ouf.receipt_number = #{receiptNumber}
and ouf.valid_flag = 1
</select>
@@ -315,7 +322,8 @@
LEFT JOIN base_meta bm1 on bm1.id = sr.reagent_unit
LEFT JOIN base_meta bm2 on bm2.id = sr.product_home
LEFT JOIN base_meta bm3 on bm3.id = sr.control_products
- WHERE ouf.operatestate = #{operatestate}
+ WHERE (ouf.operatestate = #{operatestate}
+ or ouf.operatestate = #{operatestate})
and ouf.receipt_number = #{receiptNumber}
and ouf.valid_flag = 1
</select>
@@ -356,8 +364,9 @@
<if test="userId !=null and userId != ''">
LEFT JOIN sys_reagent sr2 on sr2.id = ouf.user_id
</if>
- WHERE
- LENGTH(trim(ouf.receipt_number))>0
+ WHERE (ouf.operatestate = #{operatestate}
+ or ouf.operatestate = #{operatestate1})
+ and LENGTH(trim(ouf.receipt_number))>0
and ouf.valid_flag = 1
and ouf.receipt_number = #{receiptNumber}
group by ouf.receipt_number
diff --git a/src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java
index 2047277..5092e03 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java
@@ -501,9 +501,13 @@
//操作状态位仓库领取
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());
+
+ metaMap2.put("metaKey", String.valueOf(OperateStatus.TRANSFER.getKey()));
+ List<BaseMeta> baseMetas1 = baseMetaDao.getBaseMetaList(metaMap2);
+ params.put("operatestate1", baseMetas1.get(0).getId());
addParamByUserId(userId, params);
return opeUseFlowDao.countPersonalUseInfo(params);
@@ -548,9 +552,14 @@
//操作状态位仓库领取
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());
+
+ metaMap2.put("metaKey", String.valueOf(OperateStatus.TRANSFER.getKey()));
+ List<BaseMeta> baseMetas1 = baseMetaDao.getBaseMetaList(metaMap2);
+ params.put("operatestate1", baseMetas1.get(0).getId());
+
params.put("first", first);
params.put("pageSize", pageSize);
@@ -563,9 +572,14 @@
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());
+
+ metaMap2.put("metaKey", String.valueOf(OperateStatus.TRANSFER.getKey()));
+ List<BaseMeta> baseMetas1 = baseMetaDao.getBaseMetaList(metaMap2);
+ params.put("operatestate1", baseMetas1.get(0).getId());
+
params.put("receiptNumber", receiptNumber);
return opeUseFlowDao.getApplyInfo(params);
@@ -581,6 +595,11 @@
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.TRANSFER.getKey()));
+ List<BaseMeta> baseMetas1 = baseMetaDao.getBaseMetaList(metaMap2);
+ params.put("operatestate1", baseMetas1.get(0).getId());
+
params.put("receiptNumber", receiptNumber);
return opeUseFlowDao.getApplyInfoSize(params);
@@ -643,9 +662,13 @@
//操作状态位仓库领取
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());
+
+ metaMap2.put("metaKey", String.valueOf(OperateStatus.TRANSFER.getKey()));
+ List<BaseMeta> baseMetas1 = baseMetaDao.getBaseMetaList(metaMap2);
+ params.put("operatestate1", baseMetas1.get(0).getId());
addParamByUserId(userId, params);
--
Gitblit v1.9.2