From c20bd338ddf092a3d9be15d68652d20b9645437d Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 22 十月 2024 15:08:00 +0800
Subject: [PATCH] #

---
 src/main/resources/mapper/ViewWorkInMapper.xml |  111 ++++++++++++++++++++++++++++---------------------------
 1 files changed, 57 insertions(+), 54 deletions(-)

diff --git a/src/main/resources/mapper/ViewWorkInMapper.xml b/src/main/resources/mapper/ViewWorkInMapper.xml
index 1adbe97..0f5d0cd 100644
--- a/src/main/resources/mapper/ViewWorkInMapper.xml
+++ b/src/main/resources/mapper/ViewWorkInMapper.xml
@@ -11,21 +11,24 @@
 		<if test="matnr!=null and matnr!='' ">
 			and matnr like '%' + #{matnr} + '%'
 		</if>
-		<if test="maktx!=null and maktx!='' ">
-			and (maktx like '%' + #{maktx} + '%'
-			or matnr like '%' + #{maktx} + '%'
-			or lgnum like '%' + #{maktx} + '%'
-			or tbnum like '%' + #{maktx} + '%'
-			or tbpos like '%' + #{maktx} + '%'
-			or zmatid like '%' + #{maktx} + '%'
-			or maktx like '%' + #{maktx} + '%'
-			or werks like '%' + #{maktx} + '%'
-			or anfme like '%' + #{maktx} + '%'
-			or altme like '%' + #{maktx} + '%'
-			or zpallet like '%' + #{maktx} + '%'
-			or bname like '%' + #{maktx} + '%'
-			)
+		<if test="anfme != null and anfme != ''">
+			and anfme = #{anfme}
 		</if>
+<!--		<if test="maktx!=null and maktx!='' ">-->
+<!--			and (maktx like '%' + #{maktx} + '%'-->
+<!--			or matnr like '%' + #{maktx} + '%'-->
+<!--			or lgnum like '%' + #{maktx} + '%'-->
+<!--			or tbnum like '%' + #{maktx} + '%'-->
+<!--			or tbpos like '%' + #{maktx} + '%'-->
+<!--			or zmatid like '%' + #{maktx} + '%'-->
+<!--			or maktx like '%' + #{maktx} + '%'-->
+<!--			or werks like '%' + #{maktx} + '%'-->
+<!--			or anfme like '%' + #{maktx} + '%'-->
+<!--			or altme like '%' + #{maktx} + '%'-->
+<!--			or zpallet like '%' + #{maktx} + '%'-->
+<!--			or bname like '%' + #{maktx} + '%'-->
+<!--			)-->
+<!--		</if>-->
 		<if test="begin_date!=null and begin_date!='' ">
 			<![CDATA[
 			and io_time >= #{begin_date}
@@ -35,6 +38,15 @@
 			<![CDATA[
 			and io_time <= #{end_date}
 			]]>
+		</if>
+		<if test="batch != null and batch != ''">
+			and batch like concat('%',#{batch},'%')
+		</if>
+		<if test="zpallet != null and zpallet != ''">
+			and zpallet like concat('%',#{zpallet},'%')
+		</if>
+		<if test="specs != null and specs != ''">
+			and specs like concat('%',#{specs},'%')
 		</if>
 </sql>
 
@@ -99,59 +111,50 @@
 
 <!-- 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬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>
 
 <!-- 鍑哄簱缁熻 -->
 <!-- 鍒嗛〉鏌ヨ鎵�鏈変俊鎭� -->
 <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 and a.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
+
 </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>
 
 </mapper>

--
Gitblit v1.9.1