From aa3ca8b7c3dcb941a0f8686f039de24e955b298e Mon Sep 17 00:00:00 2001
From: bns_han <1604366271@qq.com>
Date: Fri, 19 Jan 2024 14:55:21 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=96=99=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/app/BackApplyMapper.xml  | 21 +++++++------------
 .../mapper/material/BackApplyMapper.xml       | 16 +++++++-------
 2 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml
index 7c5a76f1..57d26c0d 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml
@@ -410,10 +410,9 @@
     WHERE tta.agreement_id = #{agreementId}
     and tt.task_type = '29'
     and mt.`level`='4'
-
     <if test="keyWord != null  and keyWord != ''">
-      and mt.type_name like concat('%', #{keyWord}, '%') or
-      and mt2.type_name like concat('%', #{keyWord}, '%')
+      and (mt.type_name like concat('%', #{keyWord}, '%') or
+      mt2.type_name like concat('%', #{keyWord}, '%'))
     </if>
     GROUP BY mt.type_id
     ) AS subquery1
@@ -435,8 +434,8 @@
     and tt.task_type = '36'
     and mt.`level`='4'
     <if test="keyWord != null  and keyWord != ''">
-      and mt.type_name like concat('%', #{keyWord}, '%') or
-      and mt2.type_name like concat('%', #{keyWord}, '%')
+      and (mt.type_name like concat('%', #{keyWord}, '%') or
+      mt2.type_name like concat('%', #{keyWord}, '%'))
     </if>
     GROUP BY mt.type_id
     ) AS subquery2
@@ -448,18 +447,13 @@
   <select id="view" resultType="com.bonus.sgzb.app.domain.BackApplyInfo">
     SELECT
       mt.type_name typeCode,
-      CONCAT_WS('/',  IFNULL(mt3.type_name, '')) AS typeName,
-      bad.pre_num as num,
-      mm.ma_code as maCode
+      CONCAT_WS('/',  IFNULL(mt2.type_name, '')) AS typeName,
+      bad.pre_num as num
     FROM
       back_apply_details bad
         LEFT JOIN back_apply_info bai on bai.id=bad.parent_id
         LEFT JOIN ma_type mt on mt.type_id=bad.type_id
-        LEFT JOIN ma_type mt1 ON mt1.type_id=bad.type_id
-        LEFT JOIN ma_type mt2 ON mt2.type_id=mt1.parent_id
-        LEFT JOIN ma_type mt3 ON mt3.type_id=mt2.parent_id
-        LEFT JOIN ma_type mt4 ON mt4.type_id=mt3.parent_id
-        LEFT JOIN ma_machine mm on mm.type_id=bad.type_id
+        LEFT JOIN ma_type mt2 ON mt2.type_id=mt.parent_id
     WHERE
       bai.id=#{id}
   </select>
@@ -491,6 +485,7 @@
     WHERE
           bad.type_id is not null
     GROUP BY bai.id, us.user_name, bai.phone, bpl.lot_name, bui.unit_name, bagi.plan_start_time
+    ORDER BY bai.create_time desc
   </select>
   <select id="examineView" resultType="com.bonus.sgzb.app.domain.BackApplyInfo">
     SELECT
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
index 52ae5fa5..e3b472e1 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
@@ -339,9 +339,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
               1=1
         <if test="keyWord != null  and keyWord != ''">
-            and bai.`code` like concat('%', #{keyWord}, '%') or
+            and (bai.`code` like concat('%', #{keyWord}, '%') or
             bai.back_person like concat('%', #{keyWord}, '%') or
-            bai.phone like concat('%', #{keyWord}, '%')
+            bai.phone like concat('%', #{keyWord}, '%'))
         </if>
         <if test="unitId != null  and unitId != ''">
             and bui.unit_id = #{unitId}
@@ -391,8 +391,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         and mt.`level`='4'
 
         <if test="keyWord != null  and keyWord != ''">
-            and mt.type_name like concat('%', #{keyWord}, '%') or
-            mt2.type_name like concat('%', #{keyWord}, '%')
+            and (mt.type_name like concat('%', #{keyWord}, '%') or
+            mt2.type_name like concat('%', #{keyWord}, '%'))
         </if>
         GROUP BY mt.type_id
         ) AS subquery1
@@ -416,8 +416,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         and tt.task_type = '36'
         and mt.`level`='4'
         <if test="keyWord != null  and keyWord != ''">
-            and mt.type_name like concat('%', #{keyWord}, '%') or
-            mt2.type_name like concat('%', #{keyWord}, '%')
+            and (mt.type_name like concat('%', #{keyWord}, '%') or
+            mt2.type_name like concat('%', #{keyWord}, '%'))
         </if>
         GROUP BY mt.type_id
         ) AS subquery2
@@ -565,9 +565,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where
         1=1
         <if test="keyWord != null  and keyWord != ''">
-            and bai.`code` like concat('%', #{keyWord}, '%') or
+            and (bai.`code` like concat('%', #{keyWord}, '%') or
             bai.back_person like concat('%', #{keyWord}, '%') or
-            bai.phone like concat('%', #{keyWord}, '%')
+            bai.phone like concat('%', #{keyWord}, '%'))
         </if>
         <if test="unitId != null  and unitId != ''">
             and bui.unit_id = #{unitId}