es检索

src/main/java/cn/cslg/pas/domain/es/Patent.java

@@ -196,13 +196,13 @@ public class Patent {
     private List<Text> claim;
 
     /**
-     * pct申请号
+     * pct申请日
      */
     @JsonProperty("pctappdate")
-    private Integer pctAppDate;
+    private Date pctAppDate;
 
     /**
-     * pct申请日
+     * pct申请号
      */
     @JsonProperty("pctappno")
     private String pctAppNo;
@@ -217,7 +217,7 @@ public class Patent {
      * pct公开日
      */
     @JsonProperty("pctpubdate")
-    private Integer pctPubDate;
+    private Date pctPubDate;
 
     /**
      * pct公开号
@@ -241,7 +241,7 @@ public class Patent {
      * ep申请日
      */
     @JsonProperty("ep_date")
-    private String epDate;
+    private Date epDate;
 
 
     /**

src/main/resources/jsons/esCountAnalysis.json

@@ -351,7 +351,7 @@
     "name": "申请人国家",
     "type": "String",
     "value": "applicantCountry",
-    "field": "DZ",
+    "field": "applicantCountry",
     "esField": "applicant_addr.country",
     "esClass": "termsCountAnalysisBuilder",
     "ifSearch": "false",

src/main/resources/jsons/patent.json

@@ -230,6 +230,7 @@
     "ifSearch": "false",
     "ifGroup": "false",
     "ifShow": "true",
+    "ifStats": "true",
     "ifAsCondition": "true"
   },
   {
@@ -242,6 +243,7 @@
     "ifSearch": "false",
     "ifGroup": "false",
     "ifShow": "true",
+    "ifStats": "true",
     "ifAsCondition": "true"
   },
   {
@@ -254,6 +256,7 @@
     "ifSearch": "false",
     "ifGroup": "false",
     "ifShow": "false",
+    "ifStats": "false",
     "ifAsCondition": "true"
   },
   {
@@ -266,6 +269,7 @@
     "ifSearch": "false",
     "ifGroup": "false",
     "ifShow": "false",
+    "ifStats": "false",
     "ifAsCondition": "true"
   },
   {
@@ -286,8 +290,8 @@
     "type": "Array",
     "value": "agent",
     "field": "AG",
-    "esField": "agent",
-    "esClass": "matchQueryBuilder",
+    "esField": "agent.key",
+    "esClass": "keyWordQueryBuilder",
     "ifSearch": "false",
     "ifGroup": "false",
     "ifShow": "true",
@@ -364,6 +368,7 @@
     "ifSearch": "false",
     "ifGroup": "false",
     "ifShow": "false",
+    "ifStats": "false",
     "ifAsCondition": "true"
   },
   {
@@ -389,7 +394,7 @@
     "ifSearch": "false",
     "ifGroup": "false",
     "ifShow": "false",
-    "ifStats": "false",
+    "ifStats": "true",
     "ifAsCondition": "true"
   },
   {
@@ -402,7 +407,7 @@
     "ifSearch": "false",
     "ifGroup": "false",
     "ifShow": "false",
-    "ifStats": "false",
+    "ifStats": "true",
     "ifAsCondition": "true"
   },
   {
@@ -440,6 +445,7 @@
     "ifSearch": "false",
     "ifGroup": "false",
     "ifShow": "false",
+    "ifStats": "false",
     "ifAsCondition": "true"
   },
   {
@@ -478,7 +484,7 @@
     "ifSearch": "false",
     "ifGroup": "false",
     "ifShow": "false",
-    "ifStats": "true",
+    "ifStats": "false",
     "ifAsCondition": "true"
   },
   {
@@ -807,6 +813,149 @@
     "ifAsCondition": "true"
   },
   {
+    "name": "审查员",
+    "type": "String",
+    "value": "examiner",
+    "field": "EXAM",
+    "esField": "examiner.key",
+    "esClass": "keyWordQueryBuilder",
+    "ifSearch": "false",
+    "ifGroup": "false",
+    "ifShow": "true",
+    "ifStats": "false",
+    "ifAsCondition": "true"
+  },
+  {
+    "name": "助理审查员",
+    "type": "String",
+    "value": "aidExaminer",
+    "field": "ADEXAM",
+    "esField": "aid_examiner.key",
+    "esClass": "keyWordQueryBuilder",
+    "ifSearch": "false",
+    "ifGroup": "false",
+    "ifShow": "true",
+    "ifStats": "false",
+    "ifAsCondition": "true"
+  },
+  {
+    "name": "pct申请号",
+    "type": "String",
+    "value": "pctAppNo",
+    "field": "PAN",
+    "esField": "pctappno",
+    "esClass": "keyWordQueryBuilder",
+    "ifSearch": "false",
+    "ifGroup": "false",
+    "ifShow": "true",
+    "ifStats": "false",
+    "ifAsCondition": "true"
+  },
+  {
+    "name": "pct申请日",
+    "type": "String",
+    "value": "pctAppDate",
+    "field": "PAD",
+    "esField": "pctappdate",
+    "esClass": "dateQueryBuilder",
+    "ifSearch": "false",
+    "ifGroup": "false",
+    "ifShow": "true",
+    "ifStats": "false",
+    "ifAsCondition": "true"
+  },
+  {
+    "name": "pct进入日期",
+    "type": "String",
+    "value": "pctEnterDate",
+    "field": "PED",
+    "esField": "pctenterdate",
+    "esClass": "dateQueryBuilder",
+    "ifSearch": "false",
+    "ifGroup": "false",
+    "ifShow": "true",
+    "ifStats": "false",
+    "ifAsCondition": "true"
+  },
+  {
+    "name": "pct公开号",
+    "type": "String",
+    "value": "pctPubNo",
+    "field": "PPN",
+    "esField": "pctpubno",
+    "esClass": "keyWordQueryBuilder",
+    "ifSearch": "false",
+    "ifGroup": "false",
+    "ifShow": "true",
+    "ifStats": "false",
+    "ifAsCondition": "true"
+  },
+  {
+    "name": "pct公开日",
+    "type": "String",
+    "value": "pctPubDate",
+    "field": "PPD",
+    "esField": "pctpubdate",
+    "esClass": "dateQueryBuilder",
+    "ifSearch": "false",
+    "ifGroup": "false",
+    "ifShow": "true",
+    "ifStats": "false",
+    "ifAsCondition": "true"
+  },
+  {
+    "name": "wo指定国",
+    "type": "String",
+    "value": "wo",
+    "field": "WOC",
+    "esField": "wo",
+    "esClass": "keyWordQueryBuilder",
+    "ifSearch": "false",
+    "ifGroup": "false",
+    "ifShow": "true",
+    "ifStats": "false",
+    "ifAsCondition": "true"
+  },
+  {
+    "name": "ep申请号",
+    "type": "String",
+    "value": "epNo",
+    "field": "EPNO",
+    "esField": "ep_no",
+    "esClass": "keyWordQueryBuilder",
+    "ifSearch": "false",
+    "ifGroup": "false",
+    "ifShow": "true",
+    "ifStats": "false",
+    "ifAsCondition": "true"
+  },
+  {
+    "name": "EP指定国",
+    "type": "String",
+    "value": "epCountry",
+    "field": "EPC",
+    "esField": "ep_country",
+    "esClass": "keyWordQueryBuilder",
+    "ifSearch": "false",
+    "ifGroup": "false",
+    "ifShow": "true",
+    "ifStats": "false",
+    "ifAsCondition": "true"
+  },
+  {
+    "name": "ep申请日",
+    "type": "String",
+    "value": "epDate",
+    "field": "EPD",
+    "esField": "ep_date",
+    "esClass": "dateQueryBuilder",
+    "ifSearch": "false",
+    "ifGroup": "false",
+    "ifShow": "true",
+    "ifStats": "false",
+    "ifAsCondition": "true"
+  },
+  {
     "name": "自定义栏位id",
     "type": "String",
     "value": "field",