From 4d3856e802d5c9d28d8654f35da426bdb517d7d4 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: Mon, 21 Jun 2021 10:32:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java |   34 ++++++++++++++++++++++++----------
 1 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java
index 9924439..4da1d67 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java
@@ -71,7 +71,8 @@
             if (StringUtils.isNotBlank(applyUserId)) {
     			SysUser sysUser = sysUserService.getSysUser(applyUserId);
     			// 不是管理员时，加入applyUserId
-    			if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()) {
+    			if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()
+                        && sysUser.getSeeFlag().getKey() != SeeFlag.LEADING.getKey()) {
     				 params.put("applyUserId", applyUserId);
     			}
 
@@ -112,7 +113,8 @@
             if (StringUtils.isNotBlank(approveUserId)) {
                 SysUser sysUser = sysUserService.getSysUser(approveUserId);
                 // 不是管理员时，加入applyUserId
-                if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()) {
+                if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()
+                        && sysUser.getSeeFlag().getKey() != SeeFlag.LEADING.getKey()) {
                     params.put("approveUserId", approveUserId);
                 }
             }
@@ -151,7 +153,8 @@
             if (StringUtils.isNotBlank(approveUserId)) {
                 SysUser sysUser = sysUserService.getSysUser(approveUserId);
                 // 不是管理员时，加入applyUserId
-                if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()) {
+                if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()
+                        && sysUser.getSeeFlag().getKey() != SeeFlag.LEADING.getKey()) {
                     params.put("approveUserId", approveUserId);
                 }
             }
@@ -189,7 +192,8 @@
     		if (StringUtils.isNotBlank(applyUserId)) {
     			SysUser sysUser = sysUserService.getSysUser(applyUserId);
     			// 不是管理员时，加入applyUserId
-    			if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()) {
+    			if (sysUser.getSeeFlag().getKey() != SeeFlag.MANAGE.getKey()
+                        && sysUser.getSeeFlag().getKey() != SeeFlag.LEADING.getKey()) {
     				 params.put("applyUserId", applyUserId);
     			}
 
@@ -530,7 +534,7 @@
 	}
 
     @Override
-    public int getOpeApplyReserveTotalCountByNameFor(String id,String reagentName, String personName,String productSn,String applyCode,Integer status) {
+    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 +542,12 @@
             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) {
             logger.error(e.getMessage(), e);
@@ -548,7 +557,7 @@
     }
     @Override
     public List<OpeApplyReserve> getOpeApplyReserveListByNameFor(String id,String reagentName, String personName, Integer first,
-                                                              Integer pageSize,String productSn,String applyCode,Integer status) {
+                                                              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);
@@ -558,7 +567,12 @@
             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) {
             logger.error(e.getMessage(), e);
@@ -682,12 +696,12 @@
             if (codeList == null){
                 //无条码入库 不需要增加状态和流向
                 //1.1库存表增加
-                opeWarehouseReserveService.insertOpeWarehouseReserve2(opeApplyReserve, oo);
+                opeWarehouseReserveService.insertOpeWarehouseReserve2(opeApplyReserve, oo,consigneeId);
             }else{
                 //条码入库
                 assert codeList.size() > 0;
                 //1.1入库(库存表增加)
-                opeWarehouseReserveService.insertOpeWarehouseReserve2(opeApplyReserve, oo);
+                opeWarehouseReserveService.insertOpeWarehouseReserve2(opeApplyReserve, oo,consigneeId);
                 //1.2试剂状态表增加,流向增加
                 opeReagentStatusService.orderInputWarehouseReagentStatusAndUseFlow(opeApplyReserve,consigneeId,codeList,oo);
             }

--
Gitblit v1.9.2