✨ 报告条件过滤

cas-system/src/main/java/com/inscloudtech/datacenter/service/QueryCenterService.java

@@ -590,8 +590,12 @@ public class QueryCenterService {
         if(!indexList.contains(indexName)){
             throw new RuntimeException("非法操作！");
         }
-
-        QueryBuilder queryBuilder = QueryBuilders.termQuery("caseId", query.getCaseId());
+        QueryBuilder queryBuilder = null;
+        if (StrUtil.isNotEmpty(query.getCaseId())) {
+            queryBuilder = QueryBuilders.termQuery("caseId", query.getCaseId());
+        }else if(StrUtil.isNotEmpty(query.getAnalysisResultId())){
+            queryBuilder = QueryBuilders.termQuery("analysisResultId", query.getAnalysisResultId());
+        }
         DeleteByQueryRequest deleteRequest = new DeleteByQueryRequest(indexName);
         deleteRequest.setQuery(queryBuilder);
         // 启用刷新操作

cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/CollectionInformationServiceImpl.java

@@ -142,7 +142,12 @@ public class CollectionInformationServiceImpl implements CollectionInformationSe
             lqw.eq(StrUtil.isNotEmpty(bo.getCaseId()), CollectionInformation::getCaseId, bo.getCaseId());
         }
         if(StrUtil.isNotBlank(bo.getSearchValue())){
-            lqw.queryStringQuery("*"+bo.getSearchValue().trim().replaceAll("([　]|\\s|\\u00A0)+","")+"*");
+            String keyword = bo.getSearchValue().trim();
+            String keywordQ = "*" + keyword.replaceAll("([　]|\\s|\\u00A0)+", "") + "*";
+            lqw.multiMatchQuery(keyword, CollectionInformation::getInformationSources, CollectionInformation::getName,
+                CollectionInformation::getBasicInfo,CollectionInformation::getRelationInfo,CollectionInformation::getAssetsInfo,
+                CollectionInformation::getActionInfo,CollectionInformation::getRemark);
+
         }
         return lqw;
     }