2/21 自定义字段查询

src/main/java/cn/cslg/pas/service/business/es/EsCustomFieldService.java

@@ -444,14 +444,17 @@ public class EsCustomFieldService {
         Query bool = null;
 
         if (taskId == null) {
-            Query q5 = QueryBuilders.exists((t -> t.field("custom_field.task_id")));
-            bool = QueryBuilders.bool(i -> i.must(q1, q2, q3, q4).mustNot(q5));
+
+            bool = QueryBuilders.bool(i -> i.must(q1, q2, q3, q4));
         } else {
             Query q5 = QueryBuilders.term((t -> t.field("custom_field.task_id").value(taskId)));
             bool = QueryBuilders.bool(i -> i.must(q1, q2, q3, q4, q5));
         }
 
         builder.query(bool);
+        builder.sort(sortOptionsBuilder -> sortOptionsBuilder
+                .field(fieldSortBuilder -> fieldSortBuilder
+                        .field("custom_field.create_time").order(SortOrder.Asc)));
         SearchResponse<Patent> response = client.search(builder.build(), Patent.class);
         long total = response.hits().total().value();
         if (total > 0) {

src/main/java/cn/cslg/pas/service/importPatent/ImportSinglePatentService.java

@@ -793,6 +793,7 @@ public class ImportSinglePatentService {
         //根据projectId查询
         LambdaQueryWrapper<PatentClaim> queryWrapper1 = new LambdaQueryWrapper<>();
         queryWrapper1.eq(PatentClaim::getProjectId, projectId);
+        queryWrapper1.isNotNull(PatentClaim::getSysOrder);
         List<PatentClaim> patentClaims = patentClaimService.list(queryWrapper1);
         List<Integer> ids =patentClaims.stream().map(PatentClaim::getId).collect(Collectors.toList());