From df47c9300bfe6c641c88707aa5b54591ab4c004c Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期五, 11 六月 2021 15:18:58 +0800
Subject: [PATCH] 订单领取:过期处理(确认和过期 状态处理),增加状态过期(需要将数据库字段加长) 实验室选中问题 仓库领取的仓库不存在问题

---
 src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java
index e84cdfa..88d24c1 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java
@@ -530,7 +530,7 @@
 	}
 
     @Override
-    public int getOpeApplyReserveTotalCountByNameFor(String id,String reagentName, String personName,String productSn,String applyCode,Integer status,Integer isAllApply) {
+    public int getOpeApplyReserveTotalCountByNameFor(String id,String reagentName, String personName,String productSn,String applyCode,Integer status,Integer isAllApply,boolean isExpired) {
         try {
             Map<String, Object> params = new HashMap<String, Object>();
             params.put("reagentName", reagentName);
@@ -538,7 +538,11 @@
             params.put("userId",id);
             params.put("productSn",productSn);
             params.put("applyCode",applyCode);
-            params.put("status",status);
+            if (isExpired) {
+                params.put("status",ApplyStatus.EXPIRED);
+            }else{
+                params.put("status", status);
+            }
             params.put("isAllApply",isAllApply);
             return this.opeApplyDao.getOpeApplyReserveTotalCountFor(params);
         } catch (DataAccessException e) {
@@ -549,7 +553,7 @@
     }
     @Override
     public List<OpeApplyReserve> getOpeApplyReserveListByNameFor(String id,String reagentName, String personName, Integer first,
-                                                              Integer pageSize,String productSn,String applyCode,Integer status,Integer isAllApply) {
+                                                              Integer pageSize,String productSn,String applyCode,Integer status,Integer isAllApply,boolean isExpired) {
         try {
             Map<String, Object> params = new HashMap<String, Object>();
             params.put("reagentName", reagentName);
@@ -559,7 +563,11 @@
             params.put("pageSize", pageSize);
             params.put("productSn",productSn);
             params.put("applyCode",applyCode);
-            params.put("status",status);
+            if (isExpired) {
+                params.put("status",ApplyStatus.EXPIRED);
+            }else{
+                params.put("status", status);
+            }
             params.put("isAllApply",isAllApply);
             return this.opeApplyDao.getOpeApplyReserveListFor(params);
         } catch (DataAccessException e) {

--
Gitblit v1.9.2