From b0936f893a4712eebf55030bbdab159db8fe9d58 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期五, 08 十一月 2024 15:21:53 +0800
Subject: [PATCH] 功能优化（搜索条件添加，excel导出）
---
src/main/resources/mapper/ViewWorkInMapper.xml | 304 +++++++++++++++++++++++++++-----------------------
1 files changed, 162 insertions(+), 142 deletions(-)
diff --git a/src/main/resources/mapper/ViewWorkInMapper.xml b/src/main/resources/mapper/ViewWorkInMapper.xml
index d5db4e7..cc06a0e 100644
--- a/src/main/resources/mapper/ViewWorkInMapper.xml
+++ b/src/main/resources/mapper/ViewWorkInMapper.xml
@@ -1,167 +1,187 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zy.asrs.mapper.ReportQueryMapper">
-<!-- mapper涓嶆敮鎸乻ql璇彞宓屽鏃讹紝閲囩敤sql鐗囨鍖呭惈鏂瑰紡锛岃В鍐硏ml鏍囩闂 -->
-<sql id="viewWorkInConditionSql">
- <if test="loc_no!=null and loc_no!='' ">
- and loc_no like '%' + #{loc_no} + '%'
- </if>
- <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>
- <if test="begin_date!=null and begin_date!='' ">
- <![CDATA[
+ <!-- mapper涓嶆敮鎸乻ql璇彞宓屽鏃讹紝閲囩敤sql鐗囨鍖呭惈鏂瑰紡锛岃В鍐硏ml鏍囩闂 -->
+ <sql id="viewWorkInConditionSql">
+ <if test="loc_no!=null and loc_no!='' ">
+ and loc_no like '%' + #{loc_no} + '%'
+ </if>
+ <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>
+ <if test="begin_date!=null and begin_date!='' ">
+ <![CDATA[
and io_time >= #{begin_date}
]]>
- </if>
- <if test="end_date!=null and end_date!='' ">
- <![CDATA[
+ </if>
+ <if test="end_date!=null and end_date!='' ">
+ <![CDATA[
and io_time <= #{end_date}
]]>
- </if>
-</sql>
+ </if>
+ <if test="loc_type1!=null ">
+ and loc_type1 =#{loc_type1}
+ </if>
+ <if test="floor!=null">
+ and floor =#{floor}
+ </if>
+ </sql>
-<sql id="viewWorkOutConditionSql">
- <if test="loc_no!=null and loc_no!='' ">
- and loc_no like '%' + #{loc_no} + '%'
- </if>
- <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>
- <if test="begin_date!=null and begin_date!='' ">
- <![CDATA[
+ <sql id="viewWorkOutConditionSql">
+ <if test="loc_no!=null and loc_no!='' ">
+ and loc_no like '%' + #{loc_no} + '%'
+ </if>
+ <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>
+ <if test="begin_date!=null and begin_date!='' ">
+ <![CDATA[
and crn_str_time >= #{begin_date}
]]>
- </if>
- <if test="end_date!=null and end_date!='' ">
- <![CDATA[
+ </if>
+ <if test="end_date!=null and end_date!='' ">
+ <![CDATA[
and crn_str_time <= #{end_date}
]]>
- </if>
-</sql>
+ </if>
+ <if test="loc_type1!=null ">
+ and loc_type1 =#{loc_type1}
+ </if>
+ <if test="floor!=null">
+ and floor =#{floor}
+ </if>
+ </sql>
-<!-- 鍏ュ簱缁熻 -->
-<!-- 鍒嗛〉鏌ヨ鎵�鏈変俊鎭� -->
-<select id="queryViewWorkInList" parameterType="com.zy.asrs.entity.ViewWorkInBean" resultType="com.zy.asrs.entity.ViewWorkInBean">
- select
- *
- from (
- select
- ROW_NUMBER() OVER(Order by t.io_time desc) as row
- , *
- from (
- select *
- from asr_wrkin_view
- where 1=1
- <include refid="viewWorkInConditionSql"></include>
- ) t
- ) 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="queryViewWorkInList" parameterType="com.zy.asrs.entity.ViewWorkInBean"
+ resultType="com.zy.asrs.entity.ViewWorkInBean">
+ select
+ *
+ from (
+ select
+ ROW_NUMBER() OVER(Order by t.io_time desc) as row
+ , *
+ from (
+ select *
+ from asr_wrkin_view
+ where 1=1
+ <include refid="viewWorkInConditionSql"></include>
+ ) t
+ ) 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">
- select count(1)
- from asr_wrkin_view a
- where 1=1
- <include refid="viewWorkInConditionSql"></include>
-</select>
+ <select id="getViewWorkInCount" parameterType="com.zy.asrs.entity.ViewWorkInBean" resultType="Integer">
+ select count(1)
+ from asr_wrkin_view a
+ where 1=1
+ <include refid="viewWorkInConditionSql"></include>
+ </select>
-<!-- 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭 -->
-<select id="getViewWorkInAll" parameterType="com.zy.asrs.entity.ViewWorkInBean" resultType="com.zy.asrs.entity.ViewWorkInBean">
-<!-- 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>
-</select>
+ <!-- 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭 -->
+ <select id="getViewWorkInAll" parameterType="com.zy.asrs.entity.ViewWorkInBean"
+ resultType="com.zy.asrs.entity.ViewWorkInBean">
+ <!-- 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>
+ </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>
+ <!-- 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝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>
-<!-- 鍑哄簱缁熻 -->
-<!-- 鍒嗛〉鏌ヨ鎵�鏈変俊鎭� -->
-<select id="queryViewWorkOutList" parameterType="com.zy.asrs.entity.ViewWorkInBean" resultType="com.zy.asrs.entity.ViewWorkInBean">
+ <!-- 鍑哄簱缁熻 -->
+ <!-- 鍒嗛〉鏌ヨ鎵�鏈変俊鎭� -->
+ <select id="queryViewWorkOutList" parameterType="com.zy.asrs.entity.ViewWorkInBean"
+ resultType="com.zy.asrs.entity.ViewWorkInBean">
- 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
- <if test="pageNumber!=null and pageSize!=null">
- and a.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
- </if>
-</select>
+ 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
+ <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">
- select count(1)
- from asr_wrkout_view a
- where 1=1
- <include refid="viewWorkInConditionSql"></include>
-</select>
+ <select id="getViewWorkOutCount" parameterType="com.zy.asrs.entity.ViewWorkInBean" resultType="Integer">
+ 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 1=1
- <include refid="viewWorkInConditionSql"></include>
- Order by a.io_time desc
-</select>
+ <!-- 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭 -->
+ <select id="getViewWorkOutAll" parameterType="com.zy.asrs.entity.ViewWorkInBean"
+ resultType="com.zy.asrs.entity.ViewWorkInBean">
+ select *
+ from asr_wrkout_view a
+ where 1=1
+ <include refid="viewWorkInConditionSql"></include>
+ 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>
+ <!-- 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝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