From 0b5b7e4fe9860779dba6ce0a6cc10435ac13c87d Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 07 十一月 2024 08:41:18 +0800
Subject: [PATCH] #优化

---
 src/main/resources/mapper/ViewWorkInMapper.xml |   33 +++++++++++++++++++++++++++------
 1 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/mapper/ViewWorkInMapper.xml b/src/main/resources/mapper/ViewWorkInMapper.xml
index 703625f..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,11 +102,20 @@
 
 <!-- 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭 -->
 <select id="getViewWorkInAll" parameterType="com.zy.asrs.entity.ViewWorkInBean" resultType="com.zy.asrs.entity.ViewWorkInBean">
-	select count(1)
-	from asr_wrkin_view a
+<!--	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>
-	order by io_time desc
+</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>
 
 <!-- 鍑哄簱缁熻 -->
@@ -123,8 +135,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="getViewWorkOutCount" parameterType="com.zy.asrs.entity.ViewWorkInBean"	resultType="Integer">
@@ -143,4 +157,11 @@
 	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