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

领料接口优化

This commit is contained in:
sxu 2024-11-16 16:11:59 +08:00
parent d82eb42817
commit d73cb36a93
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Machine.java
View File

@ -43,6 +43,7 @@ public class Machine extends BaseEntity
/** 机具状态（数据字典） */ /** 机具状态（数据字典） */
@Excel(name = "机具状态") @Excel(name = "机具状态")
@ApiModelProperty(value = "机具状态")
private String maStatus; private String maStatus;
/** 二维码 */ /** 二维码 */

3
bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml
View File

@ -95,6 +95,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="typeId != null"> <if test="typeId != null">
and ma.type_id = #{typeId} and ma.type_id = #{typeId}
</if> </if>
<if test="maStatus != null and maStatus != ''">
and ma.ma_status = #{maStatus}
</if>
<if test="materialType != null and materialType != ''"> <if test="materialType != null and materialType != ''">
and mt3.type_name like concat('%', #{materialType}, '%') and mt3.type_name like concat('%', #{materialType}, '%')
</if> </if>