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} - and mt4.type_name like concat('%',#{keyword},'%') + and mt4.type_name like concat('%',#{maModel},'%') - and mt3.type_name like concat('%',#{keyword},'%') + and mt3.type_name like concat('%',#{maName},'%') - and mt2.type_name like concat('%',#{keyword},'%') + and mt2.type_name like concat('%',#{maType},'%') +