|
@@ -636,7 +636,7 @@ public class BigLogic {
|
|
|
List<Integer> unitNum = new ArrayList<>();
|
|
|
List<Integer> unitNumWwg = new ArrayList<>();
|
|
|
|
|
|
- for (int i = 29; i > -1; i--) {
|
|
|
+ /* for (int i = 29; i > -1; i--) {
|
|
|
|
|
|
BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery();
|
|
|
|
|
@@ -651,13 +651,13 @@ public class BigLogic {
|
|
|
|
|
|
DateTime endDay = DateUtil.endOfDay(startDay);
|
|
|
|
|
|
- /* Integer integer = pgOrderBases.stream().filter(item -> status.contains(item.getOrderStatus())
|
|
|
+ *//* Integer integer = pgOrderBases.stream().filter(item -> status.contains(item.getOrderStatus())
|
|
|
&& item.getOverTime().before(endDay)
|
|
|
&& item.getOverTime().after(startDay)
|
|
|
&& item.getOrderSmallTypeText().equals(largeWorkerOrderDateBean.getLx())
|
|
|
)
|
|
|
.map(PgOrderBase::getTotalNum).reduce(Integer::sum).orElse(0);
|
|
|
-*/
|
|
|
+*//*
|
|
|
//完工单
|
|
|
NativeSearchQuery searchQueryWGD = new NativeSearchQueryBuilder()
|
|
|
.withQuery(queryBuilder)
|
|
@@ -674,13 +674,13 @@ public class BigLogic {
|
|
|
|
|
|
|
|
|
|
|
|
- /* Integer integerWwg = pgOrderBases.stream().filter(item ->
|
|
|
+ *//* 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()
|
|
@@ -700,7 +700,7 @@ public class BigLogic {
|
|
|
unitNum.add(Convert.toInt(orderBaseCountLogic.getWorkerOrderCountResult(responseWGD.getAggregations(),"wgd")));
|
|
|
unitNumWwg.add(Convert.toInt(orderBaseCountLogic.getWorkerOrderCountResult(responseWWG.getAggregations(),"wwg")));
|
|
|
}
|
|
|
-
|
|
|
+*/
|
|
|
largeWorkerOrderDateBean.setUnitNum(unitNum);
|
|
|
largeWorkerOrderDateBean.setUnitNumWwg(unitNumWwg);
|
|
|
|