|
|
@@ -2,36 +2,28 @@ package com.gree.mall.manager.logic.workorder;
|
|
|
|
|
|
import cn.hutool.core.convert.Convert;
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
-import com.google.common.collect.Lists;
|
|
|
import com.gree.mall.manager.bean.admin.AdminUserCom;
|
|
|
import com.gree.mall.manager.bean.es.OrderBase2022Es;
|
|
|
import com.gree.mall.manager.bean.es.OrderBase2023Es;
|
|
|
import com.gree.mall.manager.bean.es.OrderBase2024Es;
|
|
|
import com.gree.mall.manager.bean.es.OrderBaseEs;
|
|
|
import com.gree.mall.manager.bean.workorder.OrderBaseCountBean;
|
|
|
-import com.gree.mall.manager.bean.workorder.OrderCount7DayBean;
|
|
|
import com.gree.mall.manager.commonmapper.workorder.OrderBaseCMapper;
|
|
|
-import com.gree.mall.manager.enums.OrderStatusEnum;
|
|
|
-import com.gree.mall.manager.enums.workorder.OrderBaseStatusEnum;
|
|
|
import com.gree.mall.manager.enums.workorder.OrderTypeEnum;
|
|
|
import com.gree.mall.manager.logic.common.CommonLogic;
|
|
|
-import com.gree.mall.manager.plus.entity.PgOrderBase;
|
|
|
import com.gree.mall.manager.plus.service.PgOrderBaseService;
|
|
|
import com.gree.mall.manager.utils.CommonUtils;
|
|
|
-import io.swagger.models.auth.In;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import lombok.var;
|
|
|
-import org.apache.commons.collections4.CollectionUtils;
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
import org.elasticsearch.index.query.BoolQueryBuilder;
|
|
|
-import org.elasticsearch.index.query.QueryBuilder;
|
|
|
import org.elasticsearch.index.query.QueryBuilders;
|
|
|
import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
|
|
|
import org.elasticsearch.search.aggregations.AggregationBuilders;
|
|
|
import org.elasticsearch.search.aggregations.Aggregations;
|
|
|
import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
|
|
|
import org.elasticsearch.search.aggregations.bucket.filter.ParsedFilter;
|
|
|
-import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
|
|
|
import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramInterval;
|
|
|
import org.elasticsearch.search.aggregations.bucket.histogram.Histogram;
|
|
|
import org.elasticsearch.search.aggregations.bucket.histogram.ParsedDateHistogram;
|
|
|
@@ -42,14 +34,9 @@ import org.springframework.data.elasticsearch.core.query.FetchSourceFilter;
|
|
|
import org.springframework.data.elasticsearch.core.query.NativeSearchQuery;
|
|
|
import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
-import org.springframework.web.bind.annotation.RequestParam;
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
-import java.text.SimpleDateFormat;
|
|
|
-import java.time.LocalDateTime;
|
|
|
-import java.time.ZoneOffset;
|
|
|
import java.util.*;
|
|
|
-import java.util.stream.Collectors;
|
|
|
|
|
|
@Slf4j
|
|
|
@Service
|
|
|
@@ -500,7 +487,7 @@ public class OrderBaseCountLogic {
|
|
|
return response;
|
|
|
}
|
|
|
|
|
|
- if (year.equals("2022") || Convert.toInt(year) < 2022) {
|
|
|
+ if (year.equals("2022") || (StringUtils.isNotBlank(year) && Convert.toInt(year) < 2022)) {
|
|
|
SearchHits response = elasticsearchRestTemplate.search(searchQuery, OrderBase2022Es.class);
|
|
|
return response;
|
|
|
}else {
|
