From 82b8c1133e96d7e4b9af4ddbc6ef7c6fb583aa5e Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 31 八月 2024 10:12:42 +0800
Subject: [PATCH] #

---
 src/main/resources/mapper/ViewStayTimeMapper.xml |   82 ++++++++++++++++++++++------------------
 1 files changed, 45 insertions(+), 37 deletions(-)

diff --git a/src/main/resources/mapper/ViewStayTimeMapper.xml b/src/main/resources/mapper/ViewStayTimeMapper.xml
index 7ce92fe..5038b29 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,50 @@
 </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 (
+	select
+	ROW_NUMBER() over (order by stay_time desc) as row
+	, *
+	from
+	(
+	SELECT
+	GETDATE() AS today
+	, CONVERT(decimal, DATEDIFF(second,asr_pla_detl.pakin_time, GETDATE()) / 86400.0, 9) AS stay_time
+	, asr_pla_detl.*
+	FROM asr_pla_detl
+	INNER JOIN man_node ON asr_pla_detl.loc_no = man_node.name
+	where 1=1
+	<include refid="viewStayTimeConditionSql"></include>
+	) ts
+	) 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
+	count(1)
+	from (
+	select
+	ROW_NUMBER() over (order by stay_time desc) as row
+	, *
+	from
+	(
+	SELECT
+	GETDATE() AS today
+	, CONVERT(decimal, DATEDIFF(second,asr_pla_detl.create_time, GETDATE()) / 86400.0, 9) AS stay_time
+	, asr_pla_detl.*
+	FROM asr_pla_detl
+	INNER JOIN man_node ON asr_pla_detl.loc_no = man_node.name
+	where 1=1
+	<include refid="viewStayTimeConditionSql"></include>
+	) t
+	) a
+</select>
+
+<!-- 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭 -->
+<select id="getViewStayTimeAll" parameterType="com.zy.asrs.entity.ViewStayTimeBean" resultType="com.zy.asrs.entity.ViewStayTimeBean">
 	select
 	*
 	from (
@@ -58,42 +101,7 @@
 			where 1=1
 			<include refid="viewStayTimeConditionSql"></include>
 		) t
-	) 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
-	count(1)
-	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>
-
-<!-- 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬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>
 
 </mapper>

--
Gitblit v1.9.1