@@ -54,7 +54,7 @@ public class OrderBaseController {
@ApiParam(value = "页大小",required = true) @RequestParam Integer pageSize
) throws Exception{
IPage<OrderBaseVO> list = orderBaseLogic.list(keyword,pgIncreOrderId,isYb,isWb, orderBaseStatus, byDay, startTime, endTime, pageNum, pageSize);
- return ResponseHelper.success(list());
+ return ResponseHelper.success(list);
}
@PostMapping("/list2")
@@ -611,11 +611,12 @@ public class OrderBaseLogic {
.should(QueryBuilders.termsQuery("order_status", OrderBaseStatusEnum.DQD.getKey()))
);
- if (startTime != null)
- boolQueryOrder.must( QueryBuilders.rangeQuery("create_time")
+ if (!StringUtil.isEmpty(startTime)) {
+ boolQueryOrder.must(QueryBuilders.rangeQuery("create_time")
.gte(startTime)
.lte(endTime)
+ }
String orderStatus = orderBaseStatusEnum != null ? orderBaseStatusEnum.getKey() : null;