Skip to content

A
amos-boot-biz
Commit cf0cf8ad authored by tianyiming's avatar tianyiming
Browse files
Options

fix: 统一日期范围查询条件

parent 82edbfeb
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 5 deletions
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/ComprehensiveStatisticalAnalysisServiceImpl.java
View file @ cf0cf8ad
...@@ -1092,11 +1092,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl { ...@@ -1092,11 +1092,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
JSONArray dates = (JSONArray) v; JSONArray dates = (JSONArray) v;
String startDate = dates.getString(0); String startDate = dates.getString(0);
String endDate = dates.getString(1); String endDate = dates.getString(1);
if (k.equals("USE_DATE") || k.equals("issueDate")) { boolMust.filter(QueryBuilders.rangeQuery(field).gte(startDate).lte(endDate));
boolMust.filter(QueryBuilders.rangeQuery(field).gte(startDate).lt(endDate));
} else {
boolMust.filter(QueryBuilders.rangeQuery(field).gte(startDate).lte(endDate));
}
} else if (k.equals("EQU_LIST") || k.equals("EQU_CATEGORY") || k.equals("EQU_DEFINE") || k.equals("DATA_QUALITY_SCORE")) { } else if (k.equals("EQU_LIST") || k.equals("EQU_CATEGORY") || k.equals("EQU_DEFINE") || k.equals("DATA_QUALITY_SCORE")) {
if (k.equals("EQU_LIST")) { if (k.equals("EQU_LIST")) {
field = "EQU_LIST_CODE"; field = "EQU_LIST_CODE";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment