From 8961e76beef78061c475b1b5d3bb4a0cace9330a Mon Sep 17 00:00:00 2001
From: syruan <321359594@qq.com>
Date: Thu, 13 Feb 2025 18:14:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E8=B5=84=E7=B1=BB=E5=9E=8B=E5=8E=86?=
 =?UTF-8?q?=E5=8F=B2=E8=AE=B0=E5=BD=95=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/ma/domain/MaTypeHistory.java     |  8 +++++++
 .../mapper/material/ma/TypeMapper.xml         | 21 ++++++++++++-------
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/MaTypeHistory.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/MaTypeHistory.java
index 3de32cab..6029d653 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/MaTypeHistory.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/MaTypeHistory.java
@@ -23,6 +23,12 @@ public class MaTypeHistory {
 
     private String typeName;
 
+    private String maType;
+
+    private String maName;
+
+    private String maModel;
+
     private BigDecimal beforePrice;
 
     private BigDecimal afterPrice;
@@ -30,4 +36,6 @@ public class MaTypeHistory {
     private LocalDateTime createTime;
 
     private String createBy;
+
+    private String keyword;
 }
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml
index f204c80b..b403df5f 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml
@@ -829,18 +829,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getMaTypeHistoryListBy" resultType="com.bonus.material.ma.domain.MaTypeHistory">
         select
-            id, type_id, before_price, after_price, create_time, create_by
+            mth.id, mth.type_id, mth.before_price, mth.after_price, mth.create_time, mth.create_by,
+            mt4.type_name as maModel, mt3.type_name as maName, mt2.type_name as maType
         from
-            ma_type_history
+            ma_type_history mth
+        left join ma_type mt4 on mt4.type_id = mth.type_id and mt4.level = 4 and mt4.del_flag = 0
+        left join ma_type mt3 on mt3.type_id = mt4.parent_id and mt3.level = 3 and mt3.del_flag = 0
+        left join ma_type mt2 on mt2.type_id = mt3.parent_id and mt2.level = 2 and mt2.del_flag = 0
         <where>
             <if test="typeId != null">
-                and type_id = #{typeId}
+                and mth.type_id = #{typeId}
             </if>
-            <if test="createBy != null">
-                and create_by = #{createBy}
+            <if test="maModel != null and maModel != ''">
+                and mt4.type_name like concat('%',#{keyword},'%')
             </if>
-            <if test="createTime != null and createTime != ''">
-                and create_time between #{startTime} and #{endTime}
+            <if test="maName != null and maName != ''">
+                and mt3.type_name like concat('%',#{keyword},'%')
+            </if>
+            <if test="maType != null and maType != ''">
+                and mt2.type_name like concat('%',#{keyword},'%')
             </if>
         </where>
     </select>