fixed

src/main/java/cn/cslg/pas/common/vo/patentCount/GetAllPatentCountVO.java

@@ -24,9 +24,11 @@ public class GetAllPatentCountVO {
      * 是否统计
      */
     private Boolean ifStats;
+    private Boolean ifGroup;
 
     //-1专利著录 0自定义字段 7产品 8产品类别 9技术分类
     private Integer filedKind;
     private Boolean defaultShowStats;
     private String field;
+    private String groupBy;
 }

src/main/java/cn/cslg/pas/service/common/PersonFieldService.java

@@ -403,7 +403,7 @@ public class PersonFieldService {
         }
         Boolean flag = true;
         List<GetAllPatentCountVO> fieldVOS = JSON.parseArray(fieldJson, GetAllPatentCountVO.class);
-        fieldVOS = fieldVOS.stream().filter(item -> flag.equals(item.getIfStats())).collect(Collectors.toList());
+        fieldVOS = fieldVOS.stream().filter(item -> flag.equals(item.getIfStats()) || flag.equals(item.getIfGroup())).collect(Collectors.toList());
         fieldVOS.forEach(item -> item.setFiledKind(-1));
 
         //当专题库id或者报告id不为null时

src/main/resources/jsons/patent.json

@@ -7,7 +7,7 @@
     "esField": "patent_no.keyword",
     "esClass": "wildcardQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "true",
     "ifAsCondition": "true",
     "ifStats": "false",
@@ -22,7 +22,7 @@
     "esField": "app_no.keyword",
     "esClass": "wildcardQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "true",
     "ifAsCondition": "true",
     "ifStats": "false",
@@ -37,7 +37,7 @@
     "esField": "public_no.keyword",
     "esClass": "wildcardQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "true",
     "ifAsCondition": "true",
     "ifStats": "false",
@@ -52,7 +52,7 @@
     "esField": "grant_no.keyword",
     "esClass": "wildcardQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "true",
     "ifAsCondition": "true",
     "ifStats": "false",
@@ -67,7 +67,7 @@
     "esField": "public_date",
     "esClass": "dateQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "true",
     "ifAsCondition": "true",
     "ifStats": "true",
@@ -82,7 +82,7 @@
     "esField": "app_date",
     "esClass": "dateQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "true",
     "ifAsCondition": "true",
     "ifStats": "true",
@@ -97,7 +97,7 @@
     "esField": "grant_date",
     "esClass": "dateQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "true",
     "ifAsCondition": "true",
     "ifStats": "true",
@@ -125,7 +125,7 @@
     "esField": "abstract_str.text_content",
     "esClass": "matchQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "true",
     "ifAsCondition": "true",
     "defaultHidden": "true",
@@ -140,7 +140,7 @@
     "esField": "title.text_content",
     "esClass": "matchQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "true",
     "ifAsCondition": "true",
     "groupBy": "text"
@@ -153,7 +153,7 @@
     "esField": "examination_date",
     "esClass": "dateQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "true",
     "ifAsCondition": "true",
     "groupBy": "dateType"
@@ -166,7 +166,7 @@
     "esField": "applicant.name",
     "esClass": "nestedQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "true",
     "ifAsCondition": "true",
     "ifStats": "true",
@@ -182,7 +182,7 @@
     "esField": "stander_applicant.name",
     "esClass": "nestedQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "true",
     "ifStats": "true",
     "ifAsCondition": "true",
@@ -196,7 +196,7 @@
     "esField": "merge_applicant.name",
     "esClass": "nestedQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "true",
     "ifStats": "true",
     "ifAsCondition": "true",
@@ -210,7 +210,7 @@
     "esField": "inventor.name",
     "esClass": "nestedQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "true",
     "ifStats": "true",
     "ifAsCondition": "true",
@@ -224,7 +224,7 @@
     "esField": "merge_inventor.name",
     "esClass": "nestedQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "true",
     "ifStats": "true",
     "ifAsCondition": "true",
@@ -238,7 +238,7 @@
     "esField": "right_holder.name",
     "esClass": "nestedQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "true",
     "ifStats": "true",
     "ifAsCondition": "true",
@@ -252,7 +252,7 @@
     "esField": "stander_right_holder.name",
     "esClass": "nestedQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "true",
     "ifStats": "true",
     "ifAsCondition": "true",
@@ -266,7 +266,7 @@
     "esField": "merge_right_holder.name",
     "esClass": "nestedQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "true",
     "ifStats": "true",
     "ifAsCondition": "true",
@@ -280,7 +280,7 @@
     "esField": "public_full_text.text_content",
     "esClass": "matchQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "false",
     "ifStats": "false",
     "ifAsCondition": "true",
@@ -294,7 +294,7 @@
     "esField": "grant_full_text.text_content",
     "esClass": "matchQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "false",
     "ifStats": "false",
     "ifAsCondition": "true",
@@ -308,7 +308,7 @@
     "esField": "agency",
     "esClass": "matchQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "true",
     "ifStats": "true",
     "ifAsCondition": "true",
@@ -322,7 +322,7 @@
     "esField": "agent.key",
     "esClass": "keyWordQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "true",
     "ifStats": "true",
     "ifAsCondition": "true",
@@ -336,7 +336,7 @@
     "esField": "simple_family_num",
     "esClass": "numberQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "true",
     "ifAsCondition": "true",
     "groupBy": "amount"
@@ -349,7 +349,7 @@
     "esField": "inpadoc_family_num",
     "esClass": "numberQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "true",
     "ifAsCondition": "true",
     "groupBy": "amount"
@@ -362,7 +362,7 @@
     "esField": "patsnap_family_num",
     "esClass": "numberQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "true",
     "ifAsCondition": "true",
     "groupBy": "amount"
@@ -375,7 +375,7 @@
     "esField": "quote_patent_no_num",
     "esClass": "numberQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "true",
     "ifAsCondition": "true",
     "groupBy": "amount"
@@ -388,7 +388,7 @@
     "esField": "quoted_patent_no_num",
     "esClass": "numberQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "true",
     "ifAsCondition": "true",
     "groupBy": "amount"
@@ -401,7 +401,7 @@
     "esField": "applicant_addr.address",
     "esClass": "matchQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "false",
     "ifStats": "false",
     "ifAsCondition": "true",
@@ -415,7 +415,7 @@
     "esField": "app_country",
     "esClass": "keyWordQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "false",
     "ifStats": "true",
     "ifAsCondition": "true",
@@ -429,7 +429,7 @@
     "esField": "applicant_addr.country",
     "esClass": "keyWordQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "false",
     "ifStats": "true",
     "ifAsCondition": "true",
@@ -443,7 +443,7 @@
     "esField": "applicant_addr.province",
     "esClass": "prefixQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "false",
     "ifStats": "true",
     "ifAsCondition": "true",
@@ -457,7 +457,7 @@
     "esField": "applicant_addr.city",
     "esClass": "prefixQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "false",
     "ifStats": "false",
     "ifAsCondition": "true",
@@ -471,7 +471,7 @@
     "esField": "applicant_addr.district",
     "esClass": "prefixQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "false",
     "ifAsCondition": "true",
     "groupBy": "nation"
@@ -484,7 +484,7 @@
     "esField": "right_holder_addr.address",
     "esClass": "matchQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "false",
     "ifStats": "false",
     "ifAsCondition": "true",
@@ -498,7 +498,7 @@
     "esField": "right_holder_addr.country",
     "esClass": "keyWordQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "false",
     "ifStats": "true",
     "ifAsCondition": "true",
@@ -512,7 +512,7 @@
     "esField": "right_holder_addr.province",
     "esClass": "prefixQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "false",
     "ifStats": "true",
     "ifAsCondition": "true",
@@ -526,7 +526,7 @@
     "esField": "right_holder_addr.city",
     "esClass": "prefixQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "false",
     "ifStats": "false",
     "ifAsCondition": "true",
@@ -540,7 +540,7 @@
     "esField": "right_holder_addr.district",
     "esClass": "prefixQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "false",
     "ifAsCondition": "true",
     "groupBy": "nation"
@@ -553,7 +553,7 @@
     "esField": "mipc",
     "esClass": "prefixQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "true",
     "ifStats": "true",
     "ifAsCondition": "true",
@@ -632,7 +632,7 @@
     "esField": "mcpc",
     "esClass": "prefixQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "true",
     "ifStats": "true",
     "ifAsCondition": "true",
@@ -711,7 +711,7 @@
     "esField": "mupc",
     "esClass": "prefixQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "true",
     "ifStats": "true",
     "ifAsCondition": "true",
@@ -764,7 +764,7 @@
     "esField": "mloc",
     "esClass": "prefixQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "true",
     "ifStats": "true",
     "ifAsCondition": "true",
@@ -817,7 +817,7 @@
     "esField": "claim.text_content",
     "esClass": "matchQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "false",
     "ifAsCondition": "true",
     "groupBy": "text"
@@ -830,7 +830,7 @@
     "esField": "simple_status",
     "esClass": "keyWordQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "true",
     "ifAsCondition": "true",
     "ifStats": "true",
@@ -845,7 +845,7 @@
     "esField": "patent_type",
     "esClass": "keyWordQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "true",
     "ifAsCondition": "true",
     "ifStats": "true",
@@ -860,7 +860,7 @@
     "esField": "legal_status.raw",
     "esClass": "keyWordQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "true",
     "ifStats": "true",
     "ifAsCondition": "true",
@@ -874,7 +874,7 @@
     "esField": "examiner.key",
     "esClass": "keyWordQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "true",
     "ifStats": "false",
     "ifAsCondition": "true",
@@ -888,7 +888,7 @@
     "esField": "aid_examiner.key",
     "esClass": "keyWordQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "true",
     "ifStats": "false",
     "ifAsCondition": "true",
@@ -902,7 +902,7 @@
     "esField": "pctappno",
     "esClass": "keyWordQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "true",
     "ifStats": "false",
     "ifAsCondition": "true",
@@ -916,7 +916,7 @@
     "esField": "pctappdate",
     "esClass": "dateQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "true",
     "ifStats": "false",
     "ifAsCondition": "true",
@@ -930,7 +930,7 @@
     "esField": "pctenterdate",
     "esClass": "dateQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "true",
     "ifStats": "false",
     "ifAsCondition": "true",
@@ -944,7 +944,7 @@
     "esField": "pctpubno",
     "esClass": "keyWordQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "true",
     "ifStats": "false",
     "ifAsCondition": "true",
@@ -958,7 +958,7 @@
     "esField": "pctpubdate",
     "esClass": "dateQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "true",
     "ifStats": "false",
     "ifAsCondition": "true",
@@ -972,7 +972,7 @@
     "esField": "wo",
     "esClass": "keyWordQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "true",
     "ifStats": "false",
     "ifAsCondition": "true",
@@ -986,7 +986,7 @@
     "esField": "ep_no",
     "esClass": "keyWordQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "true",
     "ifStats": "false",
     "ifAsCondition": "true",
@@ -1000,7 +1000,7 @@
     "esField": "ep_country",
     "esClass": "keyWordQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "true",
     "ifStats": "false",
     "ifAsCondition": "true",
@@ -1014,7 +1014,7 @@
     "esField": "ep_date",
     "esClass": "dateQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "false",
+    "ifGroup": "true",
     "ifShow": "true",
     "ifStats": "false",
     "ifAsCondition": "true",
@@ -1079,5 +1079,5 @@
     "ifGroup": "false",
     "ifShow": "false",
     "ifAsCondition": "true"
-  },
+  }
 ]