From e1c7f150792a5085dd64e86e6af82820ab34dc05 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 03 九月 2024 08:06:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs-2' into tzskasrs-2

---
 src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
index a816b9c..678ebb3 100644
--- a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
@@ -12,10 +12,18 @@
 @Repository
 public interface ReportQueryMapper {
 	
-	//鍒嗛〉鏌ヨ搴撲綅浣跨敤鐜�
+	//鍒嗛〉鏌ヨ鍥涢」搴撳簱浣嶄娇鐢ㄧ巼
 	List<ViewStockUseBean> queryViewStockUseList(ViewStockUseBean viewStockUse);
 	int getViewStockUseCount(ViewStockUseBean viewStockUse);
 	List<ViewStockUseBean> getViewStockUseAll(ViewStockUseBean viewStockUse);
+	//鍒嗛〉鏌ヨagv1妤煎簱浣嶄娇鐢ㄧ巼
+	List<ViewStockUseBean> queryViewStockUse1List(ViewStockUseBean viewStockUse);
+	int getViewStockUse1Count(ViewStockUseBean viewStockUse);
+	List<ViewStockUseBean> getViewStockUse1All(ViewStockUseBean viewStockUse);
+	//鍒嗛〉鏌ヨagv3妤煎簱浣嶄娇鐢ㄧ巼
+	List<ViewStockUseBean> queryViewStockUse3List(ViewStockUseBean viewStockUse);
+	int getViewStockUse3Count(ViewStockUseBean viewStockUse);
+	List<ViewStockUseBean> getViewStockUse3All(ViewStockUseBean viewStockUse);
 
 	//鍒嗛〉鏌ヨ搴撳瓨婊炵暀鏃堕棿
 	public List<ViewStayTimeBean> queryViewStayTimeList(ViewStayTimeBean viewStayTime);
@@ -23,6 +31,12 @@
 	//涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭
 	public List<ViewStayTimeBean> getViewStayTimeAll(ViewStayTimeBean viewStayTime);
 
+	//鍒嗛〉鏌ヨAGV鍜屽洓椤瑰簱搴撳瓨婊炵暀鏃堕棿
+	public List<ViewStayTimeBean> queryAllViewStayTimeList(ViewStayTimeBean viewStayTime);
+	public int getAllViewStayTimeCount(ViewStayTimeBean viewStayTime);
+	//涓嶅垎椤垫煡璇GV鍜屽洓椤瑰簱鎵�鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭
+	public List<ViewStayTimeBean> getAllViewStayTimeAll(ViewStayTimeBean viewStayTime);
+
 //	// 搴撲綅Map
 	@Select("select distinct row1 from asr_loc_mast order by row1 asc")
 	List<Integer> getViewLocRowTotal();

--
Gitblit v1.9.1