提交 c8ae44dc 作者: 925993793@qq.com

[fix] 研究中心-资讯来源分析bug修改

上级 20e3cf4e
...@@ -153,7 +153,6 @@ public class StatisticalAnalysisController { ...@@ -153,7 +153,6 @@ public class StatisticalAnalysisController {
} }
} }
} }
for (CountVO countVO : dataList) { for (CountVO countVO : dataList) {
List<CountVO> children = countVO.getChildren(); List<CountVO> children = countVO.getChildren();
sysDictItemService.changeKey(children, dictItemList); sysDictItemService.changeKey(children, dictItemList);
...@@ -188,7 +187,6 @@ public class StatisticalAnalysisController { ...@@ -188,7 +187,6 @@ public class StatisticalAnalysisController {
dataList.add(countVO); dataList.add(countVO);
} }
} }
sysDictItemService.changeKey(dataList, dictItemList); sysDictItemService.changeKey(dataList, dictItemList);
return Result.OK(dataList); return Result.OK(dataList);
} }
......
...@@ -1743,11 +1743,12 @@ public class EsService { ...@@ -1743,11 +1743,12 @@ public class EsService {
subjectIds.add(searchCondition.getSubjectId()); subjectIds.add(searchCondition.getSubjectId());
BoolQueryBuilder boolQuery = buildQuery(searchCondition, subjectIds); BoolQueryBuilder boolQuery = buildQuery(searchCondition, subjectIds);
searchSourceBuilder.query(boolQuery); searchSourceBuilder.query(boolQuery);
String[] includeValues = searchCondition.getIncludeValues();
NestedAggregationBuilder nestedAggregationBuilder = AggregationBuilders.nested("labels", "labels") NestedAggregationBuilder nestedAggregationBuilder = AggregationBuilders.nested("labels", "labels")
.subAggregation(AggregationBuilders.terms("groupTag") .subAggregation(AggregationBuilders.terms("groupTag")
.field("labels.relationId") .field("labels.relationId")
.size(10) .size(includeValues.length)
.includeExclude(new IncludeExclude(searchCondition.getIncludeValues(), searchCondition.getExcludeValues()))); .includeExclude(new IncludeExclude(includeValues, searchCondition.getExcludeValues())));
searchSourceBuilder.aggregation(nestedAggregationBuilder); searchSourceBuilder.aggregation(nestedAggregationBuilder);
searchRequest.source(searchSourceBuilder); searchRequest.source(searchSourceBuilder);
try { try {
......
...@@ -65,6 +65,8 @@ public class InfoDataSearchCondition { ...@@ -65,6 +65,8 @@ public class InfoDataSearchCondition {
//平台-审核状态(null-全部;1-通过;2-未审核;3-暂定;4-删除;5-免审核) //平台-审核状态(null-全部;1-通过;2-未审核;3-暂定;4-删除;5-免审核)
private Integer auditStatus; private Integer auditStatus;
//审核操作(0:未审核 1:审核通过 2:审核未通过 3:暂定 默认值为0) //审核操作(0:未审核 1:审核通过 2:审核未通过 3:暂定 默认值为0)
private Integer checkStatus; private Integer checkStatus;
//删除标记(1:删除;0:未删除) //删除标记(1:删除;0:未删除)
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论