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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
mashuai 2025-01-23 09:49:10 +08:00
parent 3ca213b4a1 445b8db21c
commit 6a66e48eab
2 changed files with 2 additions and 2 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/purchase/domain/dto/PurchaseQueryDto.java
View File

@ -59,7 +59,7 @@ public class PurchaseQueryDto {
private Long supplierId; private Long supplierId;
@ApiModelProperty(value = "出场日期") @ApiModelProperty(value = "出场日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd")
private Date productionTime; private Date productionTime;
/** 采购日期 */ /** 采购日期 */

2
bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml
View File

@ -119,7 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and pcd.supplier_id = #{supplierId} and pcd.supplier_id = #{supplierId}
</if> </if>
<if test="productionTime != null"> <if test="productionTime != null">
and pcd.production_time between #{startTime} and #{endTime} and pcd.production_time = #{productionTime}
</if> </if>
<if test="keyWord != null and keyWord != ''"> <if test="keyWord != null and keyWord != ''">
and (mt.type_name like concat('%', #{keyWord}, '%') and (mt.type_name like concat('%', #{keyWord}, '%')