Merge remote-tracking branch 'origin/master' into prod_test

src/main/java/cn/cslg/pas/factorys/EsCountAnalyseBuilderFactory/ChildCountAnalysisBuilder.java

@@ -32,14 +32,17 @@ public class ChildCountAnalysisBuilder implements IEsCountAnalysisBuilder {
     public Aggregation createCountAnalyseAgg() throws Exception {
         Aggregation aggregation = null;
         List<Query> queryList = new ArrayList<>();
+        Query q = null;
         Query q1 = QueryBuilders.term(i -> i.field("custom_field.field").value(fieldId));
-        if (projectId != null) {
-            Query q2 = QueryBuilders.term(i -> i.field("custom_field.project_id").value(projectId));
-            queryList.add(q2);
-        }
         if (taskId != null) {
             Query q3 = QueryBuilders.term(i -> i.field("custom_field.task_id").value(taskId));
             queryList.add(q3);
+        } else {
+            if (projectId != null) {
+                Query q2 = QueryBuilders.term(i -> i.field("custom_field.project_id").value(projectId));
+                queryList.add(q2);
+                q = QueryBuilders.exists(i -> i.field("custom_field.task_id"));
+            }
         }
         queryList.add(q1);
         Aggregation termAgg = null;
@@ -59,10 +62,19 @@ public class ChildCountAnalysisBuilder implements IEsCountAnalysisBuilder {
                     queryList.add(query);
                 }
                 Aggregation terms = AggregationBuilders.terms(i -> i.field("custom_field.stats_value.raw").size(topN));
-                termAgg = new Aggregation.Builder().filter(n -> n.bool(k -> k.must(queryList)))
-                        .aggregations(new HashMap() {{
-                            put("filterAgg", terms);
-                        }}).build();
+                if (taskId != null) {
+                    termAgg = new Aggregation.Builder().filter(n -> n.bool(k -> k.must(queryList)))
+                            .aggregations(new HashMap() {{
+                                put("filterAgg", terms);
+                            }}).build();
+                } else {
+                    Query finalQ = q;
+                    termAgg = new Aggregation.Builder().filter(n -> n.bool(k -> k.must(queryList).mustNot(finalQ)))
+                            .aggregations(new HashMap() {{
+                                put("filterAgg", terms);
+                            }}).build();
+                }
+
             }
         } else {
             if (!CollectionUtils.isEmpty(values)) {
@@ -80,10 +92,18 @@ public class ChildCountAnalysisBuilder implements IEsCountAnalysisBuilder {
                     queryList.add(query);
                 }
                 Aggregation terms = AggregationBuilders.terms(i -> i.field("custom_field.field_value.raw").size(topN));
-                termAgg = new Aggregation.Builder().filter(n -> n.bool(k -> k.must(queryList)))
-                        .aggregations(new HashMap() {{
-                            put("filterAgg", terms);
-                        }}).build();
+                if (taskId != null) {
+                    termAgg = new Aggregation.Builder().filter(n -> n.bool(k -> k.must(queryList)))
+                            .aggregations(new HashMap() {{
+                                put("filterAgg", terms);
+                            }}).build();
+                } else {
+                    Query finalQ = q;
+                    termAgg = new Aggregation.Builder().filter(n -> n.bool(k -> k.must(queryList).mustNot(finalQ)))
+                            .aggregations(new HashMap() {{
+                                put("filterAgg", terms);
+                            }}).build();
+                }
             }
         }
 

src/main/java/cn/cslg/pas/service/ReportExportService.java

@@ -385,6 +385,8 @@ public class ReportExportService {
                     if (patent.getRightHolder() != null && patent.getRightHolder().size() != 0) {
                         rightPerson = StringUtils.join(patent.getRightHolder(), "\n");
                     }
+                    else {
+                    }
                     List<String> affairs = esLegalEventService.getStrLegalEvent(patent.getAppNo());
                     String affairStrs = "";
                     if (affairs != null && affairs.size() != 0) {
@@ -398,6 +400,9 @@ public class ReportExportService {
                     try {
                         //装载同族信息
                         List<Map<String, Object>> familyMaps = esFamilyService.getPatentFamilyByNos(Arrays.asList(patent.getPatentNo()), "inpadoc");
+                        if (familyMaps.size() <= 0) {
+                            familyMaps = esFamilyService.getPatentFamilyByNos(Arrays.asList(patent.getPatentNo()), "simple");
+                        }
                         if (familyMaps != null && familyMaps.size() > 0) {
                             Map<String, Object> familyMap = familyMaps.get(0);
                             if (familyMap.get("nos") != null) {
@@ -466,6 +471,9 @@ public class ReportExportService {
                     patentMap.put("rightNum", temMap.get("rightNum"));
 
                     patentMap.put("mainNum", temMap.get("mainRightNum"));
+                    if (patent.getSimpleStatus() == null) {
+                        patent.setSimpleStatus("1");
+                    }
                     Integer status = Integer.parseInt(patent.getSimpleStatus());
                     if (status == 1 || status == 5 || status == 6) {
                         announcePatents.add(patentMap);

src/main/resources/application-prodNetOut.yml

@@ -1,5 +1,4 @@
 spring:
- data:
   data:
     redis:
       host: 47.101.137.223