Merge remote-tracking branch 'origin/master'

src/main/java/cn/cslg/pas/common/dto/PatentDetailDTO.java

@@ -1,9 +1,11 @@
 package cn.cslg.pas.common.dto;
 
+import cn.cslg.pas.common.vo.ContentVO;
 import cn.cslg.pas.domain.es.PatentClassify;
 import cn.cslg.pas.domain.es.PatentPerson;
 import cn.cslg.pas.domain.es.PersonAddress;
 import cn.cslg.pas.domain.es.Text;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
@@ -17,43 +19,55 @@ public class PatentDetailDTO {
     private String patentNo;
 
     //标题
-    private List<Text> title;
+    private ContentVO title;
 
     //摘要
-    private List<Text> abstractStr;
+    private ContentVO abstractStr;
 
     //申请号
     private String appNo;
 
     //申请日
+    @JsonFormat(
+            pattern = "yyyy-MM-dd",
+            timezone = "GMT+8"
+    )
     private Date appDate;
 
     //公开号
     private String publicNo;
 
     //公开日
+    @JsonFormat(
+            pattern = "yyyy-MM-dd",
+            timezone = "GMT+8"
+    )
     private Date publicDate;
 
     //授权号
     private String grantNo;
 
     //授权日
+    @JsonFormat(
+            pattern = "yyyy-MM-dd",
+            timezone = "GMT+8"
+    )
     private Date grantDate;
 
     //申请人
-    private List<PatentPerson> applicant;
+    private List<String> applicant;
 
     //申请人地址
     private PersonAddress applicantAddr;
 
     //权利人
-    private List<PatentPerson> rightHolder;
+    private List<String> rightHolder;
 
     //权利人地址
     private PersonAddress rightHolderAddr;
 
     //发明人
-    private List<PatentPerson> inventor;
+    private List<String> inventor;
 
     //代理机构
     private String agency;

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

@@ -103,7 +103,6 @@ public class EsPatentService {
             }
 
         }
-        long endTime = System.currentTimeMillis();
         return kinDTOS;
     }