From 002f10f7d38dc6791d26a69d061e6b17f9980fd0 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期一, 24 三月 2025 19:41:36 +0800
Subject: [PATCH] 1
---
src/main/resources/mapper/ViewStayTimeMapper.xml | 53 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 44 insertions(+), 9 deletions(-)
diff --git a/src/main/resources/mapper/ViewStayTimeMapper.xml b/src/main/resources/mapper/ViewStayTimeMapper.xml
index b4fbba3..32ebd6d 100644
--- a/src/main/resources/mapper/ViewStayTimeMapper.xml
+++ b/src/main/resources/mapper/ViewStayTimeMapper.xml
@@ -42,6 +42,42 @@
</if>
</sql>
+ <sql id="viewStayTimeConditionSql2">
+ <if test="loc_no!=null and loc_no!='' ">
+ and loc_no like '%' + #{loc_no} + '%'
+ </if>
+ <if test="floor!=null and floor!='' ">
+ and floor = #{floor}
+ </if>
+ <if test="locType1!=null and locType1!='' ">
+ and loc_type1 = #{locType1}
+ </if>
+ <if test="lev1!=null and lev1!='' ">
+ and lev1 = #{lev1}
+ </if>
+ <if test="matnr!=null and matnr!='' ">
+ and matnr like '%' + #{matnr} + '%'
+ </if>
+ <if test="stay_time!=null and stay_time!='' ">
+ and stay_time > #{stay_time}
+ </if>
+ <if test="maktx!=null and maktx!='' ">
+ and (maktx like '%' + #{maktx} + '%'
+ )
+ </if>
+ <if test="begin_date!=null and begin_date!='' ">
+ <![CDATA[
+ and appe_time >= #{begin_date}
+ ]]>
+ </if>
+ <if test="end_date!=null and end_date!='' ">
+ <![CDATA[
+ and appe_time <= #{end_date}
+ ]]>
+ </if>
+ </sql>
+
+
<!-- 鍒嗛〉鏌ヨ鎵�鏈変俊鎭� -->
<select id="queryViewStayTimeList" parameterType="com.zy.asrs.entity.ViewStayTimeBean" resultType="com.zy.asrs.entity.ViewStayTimeBean">
select
@@ -106,7 +142,7 @@
, all_loc_detl.*
FROM all_loc_detl
where 1=1
- <include refid="viewStayTimeConditionSql"></include>
+ <include refid="viewStayTimeConditionSql2"></include>
) t
left join (select matnr as c ,store_max_date,store_max,store_min from man_mat) b
on t.matnr = b.c
@@ -130,7 +166,7 @@
, all_loc_detl.*
FROM all_loc_detl
where 1=1
- <include refid="viewStayTimeConditionSql"></include>
+ <include refid="viewStayTimeConditionSql2"></include>
) t
) a
</select>
@@ -147,12 +183,12 @@
(
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
+ , CONVERT(decimal, DATEDIFF(second,all_loc_detl.appe_time, GETDATE()) / 86400.0, 9) AS stay_time
+ , dbo.all_loc_detl.*
+ FROM all_loc_detl
+ INNER JOIN agv_loc_mast ON all_loc_detl.loc_no = agv_loc_mast.loc_no
where 1=1
- <include refid="viewStayTimeConditionSql"></include>
+ <include refid="viewStayTimeConditionSql2"></include>
) t
) a
</select>
@@ -174,9 +210,8 @@
FROM
all_loc_detl
where 1=1
- <include refid="viewStayTimeConditionSql"></include>
+ <include refid="viewStayTimeConditionSql2"></include>
) t
) a
</select>
-
</mapper>
--
Gitblit v1.9.1