Skip to content

A
amos-boot-biz
Commit c09bb8d9 authored by 李松's avatar 李松
Browse files
Options

Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into…

Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into develop_tzs_register_to_0715
parents 81e4a830 f15848d7
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 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/ZLDPStatisticsServiceImpl.java
View file @ c09bb8d9
...@@ -988,6 +988,8 @@ public class ZLDPStatisticsServiceImpl { ...@@ -988,6 +988,8 @@ public class ZLDPStatisticsServiceImpl {
String param = QueryParser.escape("true"); String param = QueryParser.escape("true");
pBuilder.must(QueryBuilders.matchQuery(IS_INTO_MANAGEMENT, param)); pBuilder.must(QueryBuilders.matchQuery(IS_INTO_MANAGEMENT, param));
boolMust.must(pBuilder); boolMust.must(pBuilder);
boolMust.must(QueryBuilders.termsQuery("EQU_LIST_CODE",
StCommonServiceImpl.getEquipmentCategory().stream().map(EquipmentCategoryDto::getCode).collect(Collectors.toList())));
builder.query(boolMust); builder.query(boolMust);
builder.sort("REC_DATE", SortOrder.DESC); builder.sort("REC_DATE", SortOrder.DESC);
......
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