From 4993e03aa114e6395fd9f95a4428d204929deaf1 Mon Sep 17 00:00:00 2001
From: "Mr.Z" <709235321@qq.com>
Date: Tue, 3 Aug 2021 15:49:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9=E6=95=B4?=
 =?UTF-8?q?=E6=94=B9=EF=BC=8C=E6=A0=87=E5=87=86=E5=8F=B7/=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E5=90=8D=E7=A7=B0=E6=9F=A5=E8=AF=A2=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SarStandUnqualifiedServiceImpl.java      | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java
index 7e62b1f5..3bbc3938 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java
@@ -67,18 +67,8 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl<SarStandUnqualif
         }
 
         QueryWrapper<SarStandUnqualified> sarStandUnqualifiedQueryWrapper=new QueryWrapper<>();
-        if(sarStandUnqualifiedPage.getStandSerialNumber()!=null){
-            sarStandUnqualifiedQueryWrapper.like("stand_serial_number",sarStandUnqualifiedPage.getStandSerialNumber());
-        }
         if(sarStandUnqualifiedPage.getStandId()!=null){
             sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId());
-//            sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%");
-        }
-        if (sarStandUnqualifiedPage.getStandName()!=null){
-            sarStandUnqualifiedQueryWrapper.like("stand_number",sarStandUnqualifiedPage.getStandName());
-        }
-        if (sarStandUnqualifiedPage.getStandName()!=null){
-            sarStandUnqualifiedQueryWrapper.like("stand_name",sarStandUnqualifiedPage.getStandName());
         }
         //仅查询未关闭的
         sarStandUnqualifiedQueryWrapper.eq("close_state",1);
@@ -88,6 +78,11 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl<SarStandUnqualif
         if(sarStandUnqualifiedPage.getResponsibleUnit()!=null){
             sarStandUnqualifiedQueryWrapper.eq("responsible_unit",sarStandUnqualifiedPage.getResponsibleUnit());
         }
+        if(sarStandUnqualifiedPage.getStandSerialNumber()!=null){
+//            sarStandUnqualifiedQueryWrapper.like("stand_serial_number",sarStandUnqualifiedPage.getStandSerialNumber()).or().like("stand_name",sarStandUnqualifiedPage.getStandName());
+            sarStandUnqualifiedQueryWrapper.last(" and (stand_serial_number LIKE '%"+sarStandUnqualifiedPage.getStandSerialNumber()+"%'\n" +
+                    "\t\tOR stand_name LIKE '%"+sarStandUnqualifiedPage.getStandSerialNumber()+"%')");
+        }
         Page<SarStandUnqualified> standUnqualifiedPage=new Page<>();
         //判断前端是否提供页码和每页条数
         if(sarStandUnqualifiedPage.getCurrent()!=null