Commit 0ddc9f1f authored by 麻笑宇's avatar 麻笑宇

修改检验检测大屏办理量下钻页面数据问题

parent ccd27a04
...@@ -623,7 +623,7 @@ public class JYJCDPStatisticsServiceImpl { ...@@ -623,7 +623,7 @@ public class JYJCDPStatisticsServiceImpl {
long currentDayAfter30DayTime = DateUtil.offsetDay(DateUtil.parse(DateUtil.today(), "yyy-MM-dd"), 30).getTime(); long currentDayAfter30DayTime = DateUtil.offsetDay(DateUtil.parse(DateUtil.today(), "yyy-MM-dd"), 30).getTime();
boolMust.must(QueryBuilders.rangeQuery("NEXT_INSPECT_DATE").gte(currentDayTime).lte(currentDayAfter30DayTime)); boolMust.must(QueryBuilders.rangeQuery("NEXT_INSPECT_DATE").gte(currentDayTime).lte(currentDayAfter30DayTime));
if(StrUtil.isNotEmpty(dpFilterParamForDetailDto.getTreeValue())) { if(StrUtil.isNotEmpty(dpFilterParamForDetailDto.getTreeValue()) && !"0".equals(dpFilterParamForDetailDto.getTreeValue())) {
boolMust.must(QueryBuilders.termQuery("EQU_LIST_CODE", dpFilterParamForDetailDto.getTreeValue())); boolMust.must(QueryBuilders.termQuery("EQU_LIST_CODE", dpFilterParamForDetailDto.getTreeValue()));
}else{ }else{
// 且8大类,目的去掉脏数据 // 且8大类,目的去掉脏数据
...@@ -661,7 +661,7 @@ public class JYJCDPStatisticsServiceImpl { ...@@ -661,7 +661,7 @@ public class JYJCDPStatisticsServiceImpl {
long currentDayTime = DateUtil.parse(DateUtil.now(), "yyy-MM-dd").getTime(); long currentDayTime = DateUtil.parse(DateUtil.now(), "yyy-MM-dd").getTime();
boolMust.must(QueryBuilders.rangeQuery("NEXT_INSPECT_DATE").lt(currentDayTime)); boolMust.must(QueryBuilders.rangeQuery("NEXT_INSPECT_DATE").lt(currentDayTime));
if(StrUtil.isNotEmpty(dpFilterParamForDetailDto.getTreeValue())) { if(StrUtil.isNotEmpty(dpFilterParamForDetailDto.getTreeValue()) && !"0".equals(dpFilterParamForDetailDto.getTreeValue())) {
boolMust.must(QueryBuilders.termQuery("EQU_LIST_CODE", dpFilterParamForDetailDto.getTreeValue())); boolMust.must(QueryBuilders.termQuery("EQU_LIST_CODE", dpFilterParamForDetailDto.getTreeValue()));
}else{ }else{
// 且8大类,目的去掉脏数据 // 且8大类,目的去掉脏数据
......
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