bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

物资类型修改1

This commit is contained in:
syruan 2025-02-13 18:24:11 +08:00
parent 40fed1be0a
commit 4ece73cc63
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/MaTypeHistory.java
View File

@ -1,5 +1,6 @@
package com.bonus.material.ma.domain; package com.bonus.material.ma.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
@ -33,6 +34,7 @@ public class MaTypeHistory {
private BigDecimal afterPrice; private BigDecimal afterPrice;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime; private LocalDateTime createTime;
private String createBy; private String createBy;

7
bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml
View File

@ -842,14 +842,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and mth.type_id = #{typeId} and mth.type_id = #{typeId}
</if> </if>
<if test="maModel != null and maModel != ''"> <if test="maModel != null and maModel != ''">
and mt4.type_name like concat('%',#{keyword},'%') and mt4.type_name like concat('%',#{maModel},'%')
</if> </if>
<if test="maName != null and maName != ''"> <if test="maName != null and maName != ''">
and mt3.type_name like concat('%',#{keyword},'%') and mt3.type_name like concat('%',#{maName},'%')
</if> </if>
<if test="maType != null and maType != ''"> <if test="maType != null and maType != ''">
and mt2.type_name like concat('%',#{keyword},'%') and mt2.type_name like concat('%',#{maType},'%')
</if> </if>
</where> </where>
</select> </select>