1.修复无法根据单据流水号查询单据问题

2.修复单据自定义前缀无法为空的问题
master
x_z 3 years ago
parent 99d9fcf02c
commit 0d62de6925

@ -93,6 +93,8 @@ public class OrderService {
private static QueryWrapper<OrderEntity> buildQueryWrapper(OrderFilterRequest orderFilterRequest) {
QueryWrapper<OrderEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StrUtil.isNotBlank(orderFilterRequest.getId()), "orderId", orderFilterRequest.getId())
.or(StrUtil.isNotBlank(orderFilterRequest.getId()))
.eq(StrUtil.isNotBlank(orderFilterRequest.getId()),"corpOrderId", orderFilterRequest.getId())
.in(CollUtil.isNotEmpty(orderFilterRequest.getInvCodes()), "locStorageCode", orderFilterRequest.getInvCodes())
.ge(StrUtil.isNotBlank(orderFilterRequest.getStartTime()), "actDate", StrUtil.isBlank(orderFilterRequest.getStartTime()) ? null : DateUtil.parse(orderFilterRequest.getStartTime()).toString(DatePattern.NORM_DATETIME_PATTERN))
.le(StrUtil.isNotBlank(orderFilterRequest.getEndTime()), "actDate", StrUtil.isBlank(orderFilterRequest.getEndTime()) ? null : DateUtil.parse(orderFilterRequest.getEndTime()).toString(DatePattern.NORM_DATETIME_PATTERN))

@ -300,7 +300,7 @@
<if test="customerId != null and customerId != ''">
customerId=#{customerId},
</if>
<if test="prefix != null and prefix != ''">
<if test="prefix != null">
prefix=#{prefix},
</if>
thirdSysFk=#{thirdSysFk},

Loading…
Cancel
Save