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

优化

This commit is contained in:
mashuai 2025-07-05 22:39:43 +08:00
parent a431d047c4
commit ad33168e9c
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,8 +70,8 @@ public class Machine extends BaseEntity
/** 出厂日期 */ /** 出厂日期 */
@ApiModelProperty(value = "出厂日期") @ApiModelProperty(value = "出厂日期")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "出厂日期", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "出厂日期")
private Date outFacTime; private String outFacTime;
/** 出厂编号 */ /** 出厂编号 */
@Excel(name = "出厂编号") @Excel(name = "出厂编号")

7
bonus-modules/bonus-material/src/main/resources/mapper/material/codeCollection/WsMaInfoMapper.xml
View File

@ -78,8 +78,11 @@
SELECT * SELECT *
FROM ws_ma_info FROM ws_ma_info
<where> <where>
<if test="maCode != null"> <if test="maCode != null and maCode != ''">
ma_code like concat('%', #{maCode}, '%') and ma_code like concat('%', #{maCode}, '%')
</if>
<if test="qrCode != null and qrCode != ''">
and qr_code = #{qrCode}
</if> </if>
</where> </where>
</select> </select>