From f176b0e8e492211d34f7c3e9b3506900417de040 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Wed, 16 Oct 2024 09:36:09 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E4=BB=B6=E7=B1=BB=E5=9E=8B=E5=85=B3?=
 =?UTF-8?q?=E9=94=AE=E5=AD=97=E6=9F=A5=E8=AF=A2=E5=B8=A6=E5=87=BA=E4=B8=80?=
 =?UTF-8?q?=E4=BA=8C=E4=B8=89=E7=BA=A7=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/base/MaPartTypeMapper.xml          | 105 ++++++++++++++----
 1 file changed, 82 insertions(+), 23 deletions(-)

diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaPartTypeMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaPartTypeMapper.xml
index 120ccf9..0e11fde 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaPartTypeMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaPartTypeMapper.xml
@@ -85,30 +85,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectMaPartType" parameterType="com.bonus.sgzb.base.domain.MaPartType" resultMap="MaPartTypeResult">
-        SELECT
-        t1.pa_id,
-        t1.pa_name,
-        t1.parent_id,
-        t1.status,
-        t1.num,
-        t1.unit_id,
-        t1.buy_price,
-        t1.level,
-        t1.warn_num,
-        t1.del_flag,
-        t1.create_by,
-        t1.create_time,
-        t1.remark,
-        t1.company_id,
-        t1.year
+        SELECT DISTINCT
+            t1.pa_id,
+            t1.pa_name,
+            t1.parent_id,
+            t1.STATUS,
+            t1.num,
+            t1.unit_id,
+            t1.buy_price,
+            t1.LEVEL,
+            t1.warn_num,
+            t1.del_flag,
+            t1.create_by,
+            t1.create_time,
+            t1.remark,
+            t1.company_id,
+            t1.YEAR
         FROM
-        ma_part_type t1
-        LEFT JOIN
-        ma_part_type t2 ON t1.parent_id = t2.pa_id
-        LEFT JOIN
-        ma_part_type t3 ON t2.parent_id = t3.pa_id
+            ma_part_type t1
+                LEFT JOIN ma_part_type t2 ON t1.parent_id = t2.pa_id
+                LEFT JOIN ma_part_type t3 ON t2.parent_id = t3.pa_id
         WHERE
-        t1.del_flag = '0'
+            t1.del_flag = '0' and t1.pa_id is not null
         <if test="paName != null and paName != ''">
             AND (t1.pa_name LIKE CONCAT('%', #{paName}, '%')
             OR t2.pa_name LIKE CONCAT('%', #{paName}, '%')
@@ -117,7 +115,68 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="year != null and year != ''">
             AND t1.year = #{year}
         </if>
-
+        UNION
+        SELECT
+            t2.pa_id,
+            t2.pa_name,
+            t2.parent_id,
+            t2.STATUS,
+            t2.num,
+            t2.unit_id,
+            t2.buy_price,
+            t2.LEVEL,
+            t2.warn_num,
+            t2.del_flag,
+            t2.create_by,
+            t2.create_time,
+            t2.remark,
+            t2.company_id,
+            t2.YEAR
+        FROM
+            ma_part_type t1
+                LEFT JOIN ma_part_type t2 ON t1.parent_id = t2.pa_id
+                LEFT JOIN ma_part_type t3 ON t2.parent_id = t3.pa_id
+        WHERE
+            t2.del_flag = '0' and t2.pa_id is not null
+        <if test="paName != null and paName != ''">
+            AND (t1.pa_name LIKE CONCAT('%', #{paName}, '%')
+            OR t2.pa_name LIKE CONCAT('%', #{paName}, '%')
+            OR t3.pa_name LIKE CONCAT('%', #{paName}, '%'))
+        </if>
+        <if test="year != null and year != ''">
+            AND t2.year = #{year}
+        </if>
+         UNION
+        SELECT
+            t3.pa_id,
+            t3.pa_name,
+            t3.parent_id,
+            t3.STATUS,
+            t3.num,
+            t3.unit_id,
+            t3.buy_price,
+            t3.LEVEL,
+            t3.warn_num,
+            t3.del_flag,
+            t3.create_by,
+            t3.create_time,
+            t3.remark,
+            t3.company_id,
+            t3.YEAR
+        FROM
+            ma_part_type t1
+                LEFT JOIN ma_part_type t2 ON t1.parent_id = t2.pa_id
+                LEFT JOIN ma_part_type t3 ON t2.parent_id = t3.pa_id
+        WHERE
+            t3.del_flag = '0' and t3.pa_id is not null
+        <if test="paName != null and paName != ''">
+            AND (t1.pa_name LIKE CONCAT('%', #{paName}, '%')
+            OR t2.pa_name LIKE CONCAT('%', #{paName}, '%')
+            OR t3.pa_name LIKE CONCAT('%', #{paName}, '%'))
+        </if>
+        <if test="year != null and year != ''">
+            AND t3.year = #{year}
+        </if>
 
     </select>