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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
sxu 2024-12-18 16:37:35 +08:00
parent 9082068c29 6ea7ceefa6
commit c8dd8523ba
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java
View File

@ -149,4 +149,7 @@ public class DevInfoVo extends DevInfo {
@ApiModelProperty(value = "结束时间") @ApiModelProperty(value = "结束时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private String endTime; private String endTime;
@ApiModelProperty(value = "订单编码")
private String orderCode;
} }

8
bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml
View File

@ -353,6 +353,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN sys_dept sd ON moi.buyer_company = sd.dept_id LEFT JOIN sys_dept sd ON moi.buyer_company = sd.dept_id
WHERE WHERE
md.ma_id = #{maId} md.ma_id = #{maId}
<if test="orderCode != null and orderCode != ''">
AND moi.`code` like concat( '%',#{orderCode},'%' )
</if>
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
AND ((md.rent_begin_time BETWEEN #{startTime} AND #{endTime})
OR (md.rent_end_time BETWEEN #{startTime} AND #{endTime})
OR (md.rent_begin_time &lt; #{startTime} AND md.rent_end_time > #{endTime}))
</if>
ORDER BY ORDER BY
moi.order_time DESC moi.order_time DESC
</select> </select>