需求

mall-server-api/src/main/java/com/gree/mall/manager/logic/big/BigLogic.java

@@ -607,13 +607,15 @@ public class BigLogic {
                 .groupBy(OrderSmallType::getOrderSmallTypeText).list();
 
 
+/*
         List<PgOrderBase> pgOrderBases = pgOrderBaseService.lambdaQuery()
                 .in(!StringUtil.isEmpty(adminUser.getCompanyWechatId()), PgOrderBase::getCompanyWechatId, adminUser.getCompanyWechatId())
                 .in(!CollectionUtils.isEmpty(adminUser.getAdminWebsitIds()) , PgOrderBase::getWebsitId, adminUser.getAdminWebsitIds())
-                .notIn(PgOrderBase::getOrderStatus, "YQX","FWZT","YCGB","FWQX","FL")
+                .notIn(PgOrderBase::getOrderStatus, "YQX","FWZT","YCGB","FWQX","FL","YZP")
                 .between(PgOrderBase::getCreateTime, DateUtil.offsetDay(DateUtil.beginOfDay(new Date()), -30), new Date())
                 .select(PgOrderBase::getOrderSmallTypeText, PgOrderBase::getId, PgOrderBase::getTotalNum, PgOrderBase::getUndoneNum, PgOrderBase::getCreateTime,
                         PgOrderBase::getSaleType,PgOrderBase::getOverTime,PgOrderBase::getWebsitOverTime,PgOrderBase::getOrderStatus).list();
+*/
 
         List<LargeWorkerOrderDateBean> largeWorkerOrderDateBeans = new ArrayList<>();
 
@@ -672,14 +674,31 @@ public class BigLogic {
 
 
 
-                Integer integerWwg = pgOrderBases.stream().filter(item -> item.getCreateTime().before(endDay)
+           /*     Integer integerWwg = pgOrderBases.stream().filter(item ->
+                        item.getCreateTime().before(endDay)
                         && item.getCreateTime().after(startDay) && !status.contains(item.getOrderStatus())
                         && item.getOrderSmallTypeText().equals(largeWorkerOrderDateBean.getLx())
                 )
                         .map(PgOrderBase::getTotalNum).reduce(Integer::sum).orElse(0);
+*/
+
+                //完工单
+                NativeSearchQuery searchQueryWWG = new NativeSearchQueryBuilder()
+                        .withQuery(queryBuilder)
+                        .withPageable(PageRequest.of(1, 1))
+                        .addAggregation(orderBaseCountLogic.getAggs(AggregationBuilders.filter("wwg", QueryBuilders.boolQuery()
+                                .mustNot(QueryBuilders.termsQuery("order_status",status))
+                                .must(QueryBuilders.termsQuery("order_small_type_text",orderSmallType.getOrderSmallTypeText()))
+                                .must(QueryBuilders.rangeQuery("over_time")
+                                        .gte(DateUtil.format(startDay,"yyyy-MM-dd HH:mm:ss"))
+                                        .lte(DateUtil.format(endDay,"yyyy-MM-dd HH:mm:ss")))
+                        )))
+                        .build();
+                SearchHits responseWWG = elasticsearchRestTemplate.search(searchQueryWWG, OrderBaseEs.class);
+
 
                 unitNum.add(Convert.toInt(orderBaseCountLogic.getWorkerOrderCountResult(responseWGD.getAggregations(),"wgd")));
-                unitNumWwg.add(integerWwg);
+                unitNumWwg.add(Convert.toInt(orderBaseCountLogic.getWorkerOrderCountResult(responseWWG.getAggregations(),"wwg")));
             }
 
             largeWorkerOrderDateBean.setUnitNum(unitNum);