From c61be765fe40fce1a57471a8fc8b93932c0a970c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期六, 02 四月 2022 15:37:50 +0800
Subject: [PATCH] Merge branch 'jkasrs' of http://47.97.1.152:5880/r/zy-asrs into jkasrs

---
 src/main/resources/mapper/ViewStayTimeMapper.xml |   28 ++++++++++++++++++----------
 1 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/main/resources/mapper/ViewStayTimeMapper.xml b/src/main/resources/mapper/ViewStayTimeMapper.xml
index 7ce92fe..bb44371 100644
--- a/src/main/resources/mapper/ViewStayTimeMapper.xml
+++ b/src/main/resources/mapper/ViewStayTimeMapper.xml
@@ -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