物资类型修改1
This commit is contained in:
parent
40fed1be0a
commit
4ece73cc63
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue