From c614a786d7449d2bc517ff20a5aff4e7ce4acee6 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期五, 25 六月 2021 16:06:35 +0800
Subject: [PATCH] 1.sap请求日志 前端优化

---
 src/main/resources/mapper/WaitPakInLogMapper.xml |   34 +++++++++++++++++++++++++---------
 1 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/src/main/resources/mapper/WaitPakInLogMapper.xml b/src/main/resources/mapper/WaitPakInLogMapper.xml
index cd4a81f..96efd25 100644
--- a/src/main/resources/mapper/WaitPakInLogMapper.xml
+++ b/src/main/resources/mapper/WaitPakInLogMapper.xml
@@ -4,7 +4,7 @@
 <mapper namespace="com.slcf.dao.WaitPakInLogDao">
 
 <!-- mapper涓嶆敮鎸乻ql璇彞宓屽鏃讹紝閲囩敤sql鐗囨鍖呭惈鏂瑰紡锛岃В鍐硏ml鏍囩闂 -->
-<sql id="WaitPakInLogConditionSql">	
+<sql id="WaitPakInLogConditionSql">
 		<if test="matnr!=null and matnr!='' ">
 			and a.matnr like '%' + #{matnr} + '%'
 		</if>
@@ -15,21 +15,21 @@
 			or zpallet like '%' + #{maktx} + '%'
 			or loc_no like '%' + #{maktx} + '%'
 			)
-		</if>	
+		</if>
 		<if test="begin_date!=null and begin_date!='' ">
 			<![CDATA[
-			and a.modi_time >= #{begin_date} 			
-			]]>			
-		</if>	
+			and a.modi_time >= #{begin_date}
+			]]>
+		</if>
 		<if test="end_date!=null and end_date!='' ">
 			<![CDATA[
-			and a.modi_time <= #{end_date} 			
-			]]>			
+			and a.modi_time <= #{end_date}
+			]]>
 		</if>
 </sql>
 
 <select id="queryWaitPakInLogList" parameterType="com.slcf.bean.WaitPakInLogCondition" resultType="com.slcf.pojo.WaitPakInLogBean">
-select * from ( 
+select * from (
 select *,ROW_NUMBER() OVER(Order by modi_time,lgnum) as rowid
  from cust_wait_pakin_log a
 <where>
@@ -54,4 +54,20 @@
 <include refid="WaitPakInLogConditionSql"></include>
 </where>
 </select>
-</mapper>
\ No newline at end of file
+
+
+<!-- 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭 -->
+<select id="getWaitPakInLogAll" parameterType="com.slcf.bean.WaitPakInLogCondition" resultType="com.slcf.pojo.WaitPakInLogBean">
+	select a.*
+	from cust_wait_pakin_log a
+	<where>
+		<![CDATA[
+1=1
+]]>
+		<include refid="WaitPakInLogConditionSql"></include>
+		<![CDATA[
+order by a.appe_time,a.matnr,a.loc_no asc
+]]>
+	</where>
+</select>
+</mapper>

--
Gitblit v1.9.1