|
@@ -878,7 +878,7 @@ public class WaybillManagementService {
|
|
|
}
|
|
}
|
|
|
// 查询时间段
|
|
// 查询时间段
|
|
|
if (Objects.nonNull(query.getStartDate()) && Objects.nonNull(query.getEndDate())) {
|
|
if (Objects.nonNull(query.getStartDate()) && Objects.nonNull(query.getEndDate())) {
|
|
|
- criteria.and("createTime")
|
|
|
|
|
|
|
+ criteria.and("updateTime")
|
|
|
.gte(DateUtil.strDateTimeToDateTime(StringTimeUtil.fillStart(query.getStartDate())))
|
|
.gte(DateUtil.strDateTimeToDateTime(StringTimeUtil.fillStart(query.getStartDate())))
|
|
|
.lte(DateUtil.strDateTimeToDateTime(StringTimeUtil.fillEnd(query.getEndDate())));
|
|
.lte(DateUtil.strDateTimeToDateTime(StringTimeUtil.fillEnd(query.getEndDate())));
|
|
|
}
|
|
}
|
|
@@ -886,7 +886,7 @@ public class WaybillManagementService {
|
|
|
// 总记录数
|
|
// 总记录数
|
|
|
long total = mongoTemplate.count(queryFormat, SckwWaybillOrder.class);
|
|
long total = mongoTemplate.count(queryFormat, SckwWaybillOrder.class);
|
|
|
queryFormat.with(PageRequest.of(query.getPage() - 1, query.getPageSize(),
|
|
queryFormat.with(PageRequest.of(query.getPage() - 1, query.getPageSize(),
|
|
|
- Sort.by(Sort.Order.desc("createTime"))));
|
|
|
|
|
|
|
+ Sort.by(Sort.Order.desc("updateTime"))));
|
|
|
// 执行查询
|
|
// 执行查询
|
|
|
List<SckwWaybillOrder> list = mongoTemplate.find(queryFormat, SckwWaybillOrder.class);
|
|
List<SckwWaybillOrder> list = mongoTemplate.find(queryFormat, SckwWaybillOrder.class);
|
|
|
List<WaybillBoardListVO> returnList = new ArrayList<>();
|
|
List<WaybillBoardListVO> returnList = new ArrayList<>();
|