From bcb19e8c93c3cabf0d8eb3ee34ed819b3c5a10ef Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期一, 25 十一月 2024 13:14:11 +0800
Subject: [PATCH] #优化地图

---
 src/main/resources/mapper/ViewWorkInMapper.xml |   92 +++++++++++++++++++++++++--------------------
 1 files changed, 51 insertions(+), 41 deletions(-)

diff --git a/src/main/resources/mapper/ViewWorkInMapper.xml b/src/main/resources/mapper/ViewWorkInMapper.xml
index 1adbe97..d5db4e7 100644
--- a/src/main/resources/mapper/ViewWorkInMapper.xml
+++ b/src/main/resources/mapper/ViewWorkInMapper.xml
@@ -87,7 +87,10 @@
 			where 1=1
 			<include refid="viewWorkInConditionSql"></include>
 		) t
-	) a where 1=1 and a.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
+	) a where 1=1
+		<if test="pageNumber!=null and pageSize!=null">
+			and a.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
+		</if>
 </select>
 
 <select id="getViewWorkInCount" parameterType="com.zy.asrs.entity.ViewWorkInBean"	resultType="Integer">
@@ -99,59 +102,66 @@
 
 <!-- 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭 -->
 <select id="getViewWorkInAll" parameterType="com.zy.asrs.entity.ViewWorkInBean" resultType="com.zy.asrs.entity.ViewWorkInBean">
-select * from asr_wrkin_view a
-<where>
-	<![CDATA[
- 		1=1
- 	]]>
+<!--	select count(1)-->
+<!--	from asr_wrkin_view a-->
+<!--	where 1=1-->
+<!--	<include refid="viewWorkInConditionSql"></include>-->
+	select * from asr_wrkin_view
+	where 1=1
 	<include refid="viewWorkInConditionSql"></include>
-	<![CDATA[
-		order by io_time desc
-	]]>
-</where>
+</select>
+
+<!-- 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝ERP璋冪敤 -->
+<select id="getViewWorkInERP" parameterType="com.zy.asrs.entity.ViewWorkInBean" resultType="com.zy.asrs.entity.ViewWorkInBean">
+	select top 100 * from asr_wrkin_view
+	where 1=1
+	Order by io_time desc
 </select>
 
 <!-- 鍑哄簱缁熻 -->
 <!-- 鍒嗛〉鏌ヨ鎵�鏈変俊鎭� -->
 <select id="queryViewWorkOutList" parameterType="com.zy.asrs.entity.ViewWorkInBean" resultType="com.zy.asrs.entity.ViewWorkInBean">
-select * from (
-select *,ROW_NUMBER() OVER(Order by io_time desc) as rowid
- from asr_wrkout_view
-<where>
-	1=1
- 	<include refid="viewWorkOutConditionSql"></include>
-</where>
- ) as a
-<where>
-	rowid between ((#{pageNumber}-1)*#{pageSize}) and (#{pageNumber}*#{pageSize})
-	<![CDATA[
-		order by io_time desc
-	]]>
-</where>
+
+
+	select
+	*
+	from (
+		select
+		ROW_NUMBER() OVER(Order by t.io_time desc) as row
+		, *
+		from (
+			select *
+			from asr_wrkout_view
+			where 1=1
+			<include refid="viewWorkInConditionSql"></include>
+		) t
+	) a where 1=1
+	<if test="pageNumber!=null and pageSize!=null">
+		and a.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
+	</if>
 </select>
 
 <select id="getViewWorkOutCount" parameterType="com.zy.asrs.entity.ViewWorkInBean"	resultType="Integer">
-select count(1) from asr_wrkout_view a
-<where>
-<![CDATA[
-	1=1
-]]>
-<include refid="viewWorkOutConditionSql"></include>
-</where>
+	select count(1)
+	from asr_wrkout_view a
+	where 1=1
+	<include refid="viewWorkInConditionSql"></include>
 </select>
 
 <!-- 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭 -->
 <select id="getViewWorkOutAll" parameterType="com.zy.asrs.entity.ViewWorkInBean" resultType="com.zy.asrs.entity.ViewWorkInBean">
-select * from asr_wrkout_view a
-<where>
-	<![CDATA[
- 		1=1
- 	]]>
-	<include refid="viewWorkOutConditionSql"></include>
-	<![CDATA[
-		order by io_time desc
-	]]>
-</where>
+	select *
+	from asr_wrkout_view a
+	where 1=1
+	<include refid="viewWorkInConditionSql"></include>
+	Order by a.io_time desc
+</select>
+
+<!-- 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝ERP璋冪敤 -->
+<select id="getViewWorkOutERP" parameterType="com.zy.asrs.entity.ViewWorkInBean" resultType="com.zy.asrs.entity.ViewWorkInBean">
+	select top 100 * from asr_wrkout_view
+	where 1=1
+	Order by io_time desc
 </select>
 
 </mapper>

--
Gitblit v1.9.1