From 10d7b3239e4baec952b9ee8a3e948399916d336c Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 20 十月 2025 08:23:58 +0800
Subject: [PATCH] 13

---
 src/main/resources/mapper/ViewStayTimeMapper.xml |   36 ++++++++++++++++++++++--------------
 1 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/main/resources/mapper/ViewStayTimeMapper.xml b/src/main/resources/mapper/ViewStayTimeMapper.xml
index 7ce92fe..2b01a4f 100644
--- a/src/main/resources/mapper/ViewStayTimeMapper.xml
+++ b/src/main/resources/mapper/ViewStayTimeMapper.xml
@@ -6,7 +6,7 @@
 <!-- mapper涓嶆敮鎸乻ql璇彞宓屽鏃讹紝閲囩敤sql鐗囨鍖呭惈鏂瑰紡锛岃В鍐硏ml鏍囩闂 -->
 <sql id="viewStayTimeConditionSql">
 		<if test="loc_no!=null and loc_no!='' ">
-			and loc_no like '%' + #{loc_no} + '%'
+			and asr_loc_mast.loc_no like '%' + #{loc_no} + '%'
 		</if>
 		<if test="matnr!=null and matnr!='' ">
 			and matnr like '%' + #{matnr} + '%'
@@ -40,7 +40,7 @@
 </sql>
 
 <!-- 鍒嗛〉鏌ヨ鎵�鏈変俊鎭� -->
-<select id="queryViewStayTimeList" resultType="com.zy.asrs.entity.ViewStayTimeBean">
+<select id="queryViewStayTimeList" parameterType="com.zy.asrs.entity.ViewStayTimeBean" resultType="com.zy.asrs.entity.ViewStayTimeBean">
 	select
 	*
 	from (
@@ -52,7 +52,7 @@
 			SELECT
 			GETDATE() AS today
 			, CONVERT(decimal, DATEDIFF(second,asr_loc_detl.appe_time, GETDATE()) / 86400.0, 9) AS stay_time
-			, dbo.asr_loc_detl.*
+			, asr_loc_detl.*
 			FROM asr_loc_detl
 			INNER JOIN asr_loc_mast ON asr_loc_detl.loc_no = asr_loc_mast.loc_no
 			where 1=1
@@ -61,7 +61,7 @@
 	) a where a.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
 </select>
 
-<select id="getViewStayTimeCount" parameterType="com.zy.asrs.entity.ViewStayTimeBean"	resultType="Integer">
+<select id="getViewStayTimeCount" parameterType="com.zy.asrs.entity.ViewStayTimeBean" resultType="Integer">
 	select
 	count(1)
 	from (
@@ -84,16 +84,24 @@
 
 <!-- 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭 -->
 <select id="getViewStayTimeAll" parameterType="com.zy.asrs.entity.ViewStayTimeBean" resultType="com.zy.asrs.entity.ViewStayTimeBean">
-select * from asr_stk_staytime_view a
-<where>
-	<![CDATA[
- 		1=1
- 	]]>
-	<include refid="viewStayTimeConditionSql"></include>
-	<![CDATA[
-		order by appe_time asc
-	]]>
-</where>
+	select
+	*
+	from (
+		select
+		ROW_NUMBER() over (order by stay_time desc) as row
+		, *
+		from
+		(
+			SELECT
+			GETDATE() AS today
+			, CONVERT(decimal, DATEDIFF(second,asr_loc_detl.appe_time, GETDATE()) / 86400.0, 9) AS stay_time
+			, dbo.asr_loc_detl.*
+			FROM asr_loc_detl
+			INNER JOIN asr_loc_mast ON asr_loc_detl.loc_no = asr_loc_mast.loc_no
+			where 1=1
+			<include refid="viewStayTimeConditionSql"></include>
+		) t
+	) a
 </select>
 
 </mapper>

--
Gitblit v1.9.1