From 4ece73cc6328bd328811261bf83b7e0faaa1b201 Mon Sep 17 00:00:00 2001
From: syruan <321359594@qq.com>
Date: Thu, 13 Feb 2025 18:24:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E8=B5=84=E7=B1=BB=E5=9E=8B=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bonus/material/ma/domain/MaTypeHistory.java   | 2 ++
 .../src/main/resources/mapper/material/ma/TypeMapper.xml   | 7 ++++---
 2 files changed, 6 insertions(+), 3 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 6029d653..d9b5988b 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
@@ -1,5 +1,6 @@
 package com.bonus.material.ma.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -33,6 +34,7 @@ public class MaTypeHistory {
 
     private BigDecimal afterPrice;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime createTime;
 
     private String createBy;
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 2e137803..0c6046ed 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
@@ -842,14 +842,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and mth.type_id = #{typeId}
             </if>
             <if test="maModel != null and maModel != ''">
-                and mt4.type_name like concat('%',#{keyword},'%')
+                and mt4.type_name like concat('%',#{maModel},'%')
             </if>
             <if test="maName != null and maName != ''">
-                and mt3.type_name like concat('%',#{keyword},'%')
+                and mt3.type_name like concat('%',#{maName},'%')
             </if>
             <if test="maType != null and maType != ''">
-                and mt2.type_name like concat('%',#{keyword},'%')
+                and mt2.type_name like concat('%',#{maType},'%')
             </if>
+
         </where>
     </select>