From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001 From: zyx <zyx123456> Date: 星期一, 25 十二月 2023 10:23:08 +0800 Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1 --- src/main/resources/mapper/ViewStayTimeMapper.xml | 74 +++++++++++++++++++++++++++++++++++++ 1 files changed, 74 insertions(+), 0 deletions(-) diff --git a/src/main/resources/mapper/ViewStayTimeMapper.xml b/src/main/resources/mapper/ViewStayTimeMapper.xml index 2b01a4f..7a0e299 100644 --- a/src/main/resources/mapper/ViewStayTimeMapper.xml +++ b/src/main/resources/mapper/ViewStayTimeMapper.xml @@ -8,6 +8,9 @@ <if test="loc_no!=null and loc_no!='' "> and asr_loc_mast.loc_no like '%' + #{loc_no} + '%' </if> + <if test="specs!=null and specs!='' "> + and specs like '%' + #{specs} + '%' + </if> <if test="matnr!=null and matnr!='' "> and matnr like '%' + #{matnr} + '%' </if> @@ -58,6 +61,11 @@ where 1=1 <include refid="viewStayTimeConditionSql"></include> ) t + left join (select matnr as c ,store_max_date,store_max,store_min from man_mat) b + on t.matnr = b.c + left join (select matnr as f,sum(asr_loc_detl.anfme) as sum_qty from asr_loc_detl group by asr_loc_detl.matnr ) as z + on z.f= b.c + ) a where a.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize}) </select> @@ -82,6 +90,51 @@ ) a </select> +<!-- 鍒嗛〉鏌ヨAGV鍜屽洓椤瑰簱鎵�鏈変俊鎭� --> +<select id="queryAllViewStayTimeList" parameterType="com.zy.asrs.entity.ViewStayTimeBean" resultType="com.zy.asrs.entity.ViewStayTimeBean"> + select + * + from ( + select + ROW_NUMBER() over (order by stay_time desc) as row + , * + from + ( + SELECT + GETDATE() AS today + , CONVERT(decimal, DATEDIFF(second,all_loc_detl.appe_time, GETDATE()) / 86400.0, 9) AS stay_time + , all_loc_detl.* + FROM all_loc_detl + where 1=1 + <include refid="viewStayTimeConditionSql"></include> + ) t + left join (select matnr as c ,store_max_date,store_max,store_min from man_mat) b + on t.matnr = b.c + left join (select matnr as f,sum(asr_loc_detl.anfme) as sum_qty from asr_loc_detl group by asr_loc_detl.matnr ) as z + on z.f= b.c + + ) a where a.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize}) +</select> +<select id="getAllViewStayTimeCount" parameterType="com.zy.asrs.entity.ViewStayTimeBean" resultType="Integer"> + select + count(1) + from ( + select + ROW_NUMBER() over (order by stay_time desc) as row + , * + from + ( + SELECT + GETDATE() AS today + , CONVERT(decimal, DATEDIFF(second,all_loc_detl.appe_time, GETDATE()) / 86400.0, 9) AS stay_time + , all_loc_detl.* + FROM all_loc_detl + where 1=1 + <include refid="viewStayTimeConditionSql"></include> + ) t + ) a +</select> + <!-- 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭 --> <select id="getViewStayTimeAll" parameterType="com.zy.asrs.entity.ViewStayTimeBean" resultType="com.zy.asrs.entity.ViewStayTimeBean"> select @@ -104,4 +157,25 @@ ) a </select> +<!-- 涓嶅垎椤垫煡璇GV鍜屽洓椤瑰簱鎵�鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭 --> +<select id="getAllViewStayTimeAll" parameterType="com.zy.asrs.entity.ViewStayTimeBean" resultType="com.zy.asrs.entity.ViewStayTimeBean"> + SELECT + * + FROM + ( + SELECT + ROW_NUMBER ( ) OVER ( ORDER BY stay_time DESC ) AS row, * + FROM + ( + SELECT + GETDATE( ) AS today, + CONVERT ( DECIMAL, DATEDIFF( SECOND, all_loc_detl.appe_time, GETDATE( ) ) / 86400.0, 9 ) AS stay_time, + dbo.all_loc_detl.* + FROM + all_loc_detl + where 1=1 + <include refid="viewStayTimeConditionSql"></include> + ) t + ) a +</select> </mapper> -- Gitblit v1.9.1