From 5bc667038d080d4719741c76f2ed5271d43c1feb Mon Sep 17 00:00:00 2001
From: haozq <1611483981@qq.com>
Date: Fri, 15 Nov 2024 18:23:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E9=94=AE=E5=AD=97=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gzgqj/business/app/entity/MachinesVo.java |  4 ++
 .../mappers/app/PartApplyAppMapper.xml        | 40 +++++++++----------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/bonus/gzgqj/business/app/entity/MachinesVo.java b/src/main/java/com/bonus/gzgqj/business/app/entity/MachinesVo.java
index 856d341..efaeb92 100644
--- a/src/main/java/com/bonus/gzgqj/business/app/entity/MachinesVo.java
+++ b/src/main/java/com/bonus/gzgqj/business/app/entity/MachinesVo.java
@@ -49,6 +49,10 @@ public class MachinesVo {
      * 创建人
      */
     private String creater;
+    /**
+     * 关键字
+     */
+    private String keyWord;
 
 
 
diff --git a/src/main/resources/mappers/app/PartApplyAppMapper.xml b/src/main/resources/mappers/app/PartApplyAppMapper.xml
index 1985b86..468ac54 100644
--- a/src/main/resources/mappers/app/PartApplyAppMapper.xml
+++ b/src/main/resources/mappers/app/PartApplyAppMapper.xml
@@ -28,16 +28,14 @@
                  left join mm_type mt2 on mt.PARENT_ID=mt2.id
                  left join mm_type mt3 on mt2.PARENT_ID=mt3.id
         where mm.BATCH_STATUS=7
+                <if test="keyWord!=null and keyWord!=''">
+                    and (
+                    mt2.NAME  like concat('%',#{name},'%') or
+                    mt3.NAME  like concat('%',#{type},'%') or
+                    mt.NAME  like concat('%',#{model},'%')
+                    )
+                </if>
 
-                <if test="name!=null and name!=''">
-                    and mt2.NAME  like concat('%',#{name},'%')
-                </if>
-                <if test="type!=null and type!=''">
-                    and mt3.NAME  like concat('%',#{type},'%')
-                </if>
-                <if test="model!=null and model!=''">
-                    and mt.NAME  like concat('%',#{model},'%')
-                </if>
     </select>
     <select id="getWfRecordList"  resultType="com.bonus.gzgqj.business.app.entity.MachinesVo">
         select wir.sup_id ,wat.AGREEMENT_ID,
@@ -61,15 +59,13 @@
                  left join   pa_type pt1 on pt.parent_id=pt1.id  and pt1.`level`=2 and pt1.is_active=1
                  left join   pa_type pt2 on pt1.parent_id=pt2.id  and pt2.`level`=1 and pt2.is_active=1
         WHERE pt.is_active=1     and pt.`level`=3
-                <if test="type!=null and type !=''">
-                    and   pt2.name like concat('%',#{type},'%')
-                </if>
-                <if test="name!=null and name !=''">
-                    and   pt1.name like concat('%',#{name},'%')
-                </if>
-                <if test="model!=null and model !=''">
-                    and   pt.name like concat('%',#{model},'%')
-                </if>
+        <if test="keyWord!=null and keyWord!=''">
+            and (
+            pt2.name like concat('%',#{type},'%') or
+            pt1.name like concat('%',#{name},'%') or
+            pt.name like concat('%',#{model},'%')
+            )
+        </if>
     </select>
     <select id="getSqList" resultType="java.lang.Integer">
         select  count(1)
@@ -90,10 +86,10 @@
         <where>
             <if test="keyWord!=null and keyWord!=''">
                 and (
-                tpa.code like('%',#{keyWord},'%') or
-                tpa.user_name like('%',#{keyWord},'%') or
-                tpa.remark like('%',#{keyWord},'%') or
-                tpa.pro_name like('%',#{keyWord},'%')
+                    tpa.code like('%',#{keyWord},'%') or
+                    tpa.user_name like('%',#{keyWord},'%') or
+                    tpa.remark like('%',#{keyWord},'%') or
+                    tpa.pro_name like('%',#{keyWord},'%')
                 )
             </if>
         </where>