From 7d86c8c3edfe2ee2ee83d468c1502ed2efe21697 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 28 四月 2025 10:39:44 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/ViewWorkInMapper.xml | 31 +++++++++++++++----------------
1 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/src/main/resources/mapper/ViewWorkInMapper.xml b/src/main/resources/mapper/ViewWorkInMapper.xml
index 703625f..d94cb62 100644
--- a/src/main/resources/mapper/ViewWorkInMapper.xml
+++ b/src/main/resources/mapper/ViewWorkInMapper.xml
@@ -11,20 +11,17 @@
<if test="matnr!=null and matnr!='' ">
and matnr like '%' + #{matnr} + '%'
</if>
+ <if test="batch!=null and batch!='' ">
+ and batch like '%' + #{batch} + '%'
+ </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} + '%'
- )
+ and maktx like '%' + #{maktx} + '%'
+ </if>
+ <if test="specs!=null and specs!='' ">
+ and specs like '%' + #{specs} + '%'
+ </if>
+ <if test="model!=null and model!='' ">
+ and model like '%' + #{model} + '%'
</if>
<if test="begin_date!=null and begin_date!='' ">
<![CDATA[
@@ -99,11 +96,13 @@
<!-- 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭 -->
<select id="getViewWorkInAll" parameterType="com.zy.asrs.entity.ViewWorkInBean" resultType="com.zy.asrs.entity.ViewWorkInBean">
- select count(1)
- from asr_wrkin_view a
+<!-- 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>
- order by io_time desc
</select>
<!-- 鍑哄簱缁熻 -->
--
Gitblit v1.9.1