‘linchangsheng’ преди 2 месеца
родител
ревизия
7bb1d179f2

+ 2 - 2
mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseCountLogic.java

@@ -120,10 +120,10 @@ public class OrderBaseCountLogic {
                 );
             }
 
-            queryBuilder.must(QueryBuilders.rangeQuery("create_time")
+      /*      queryBuilder.must(QueryBuilders.rangeQuery("create_time")
                     .gte(startTime)
                     .lte(endTime)
-            );
+            );*/
             //新增工单
             NativeSearchQuery searchQuery = new NativeSearchQueryBuilder()
                     .withQuery(queryBuilder)

+ 1 - 0
mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseEsLogic.java

@@ -568,6 +568,7 @@ public class OrderBaseEsLogic {
         HashMap<String, Object> DZF = new HashMap<>();
         List<String> collect = workerOrderService.lambdaQuery()
                 .eq(WorkerOrder::getPayStatus, "WAIT")
+                .between(!StringUtil.isEmpty(startTime),WorkerOrder::getCreateTime, startTime,endTime)
                 .ne(WorkerOrder::getWorkerOrderId, "").select(WorkerOrder::getWorkerOrderId)
                 .list().stream().map(WorkerOrder::getWorkerOrderId).collect(Collectors.toList());
         if (!CollectionUtils.isEmpty(collect)) {