canrd-outside / order-erp · Commits

Commit 3164be45b56821f2d5ed47d5feb36e4516846335

Authored by 谢茂盛
1 parent 49f537d2
build: skipped

fix: 订单列表筛选

Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
  View file @3164be4
@@ -1032,8 +1032,8 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O @@ -1032,8 +1032,8 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O
1032 List<OrderTrackStageDO> trackStageDOS = trackStageService.list(new LambdaQueryWrapper<OrderTrackStageDO>() 1032 List<OrderTrackStageDO> trackStageDOS = trackStageService.list(new LambdaQueryWrapper<OrderTrackStageDO>()
1033 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN) 1033 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
1034 .eq(StringUtils.isNotBlank(queryVO.getPpConfirmResult()), OrderTrackStageDO::getPpConfirmResult, queryVO.getPpConfirmResult()) 1034 .eq(StringUtils.isNotBlank(queryVO.getPpConfirmResult()), OrderTrackStageDO::getPpConfirmResult, queryVO.getPpConfirmResult())
1035 - .eq(StringUtils.isNotBlank(queryVO.getSelfTestPassStartTime()), OrderTrackStageDO::getSelfTestPassTime, queryVO.getSelfTestPassStartTime())  
1036 - .eq(StringUtils.isNotBlank(queryVO.getSelfTestPassEndTime()), OrderTrackStageDO::getSelfTestPassTime, queryVO.getSelfTestPassEndTime()) 1035 + .ge(StringUtils.isNotBlank(queryVO.getSelfTestPassStartTime()), OrderTrackStageDO::getSelfTestPassTime, queryVO.getSelfTestPassStartTime())
  1036 + .le(StringUtils.isNotBlank(queryVO.getSelfTestPassEndTime()), OrderTrackStageDO::getSelfTestPassTime, queryVO.getSelfTestPassEndTime())
1037 ); 1037 );
1038 if (CollectionUtils.isNotEmpty(trackStageDOS)) { 1038 if (CollectionUtils.isNotEmpty(trackStageDOS)) {
1039 Set<Long> trackOrderIds = trackStageDOS.stream().map(OrderTrackStageDO::getOrderId).collect(Collectors.toSet()); 1039 Set<Long> trackOrderIds = trackStageDOS.stream().map(OrderTrackStageDO::getOrderId).collect(Collectors.toSet());