fixed

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

@@ -48,7 +48,7 @@ public class PatentColumnDTO {
     /**
      * 申请人地址
      */
-    private PersonAddress applicantAddr;
+//    private PersonAddress applicantAddr;
 
     //申请人地址
     private String appAddress;
@@ -61,6 +61,11 @@ public class PatentColumnDTO {
     //申请人县
     private String appDistrict;
 
+    /**
+     * 权利人地址
+     */
+//    private PersonAddress rightHolderAddr;
+
     //权利人地址
     private String rightAddress;
     //权利人国家
@@ -73,11 +78,6 @@ public class PatentColumnDTO {
     private String rightDistrict;
 
     /**
-     * 权利人地址
-     */
-    private PersonAddress rightHolderAddr;
-
-    /**
      * 审查员
      */
     private String examiner;
@@ -141,7 +141,7 @@ public class PatentColumnDTO {
     /**
      * 优先权
      */
-    private List<Priorities> priorities;
+//    private List<Priorities> priorities;
     private String priorityCountry;
     private String priorityDate;
     private String priorityNo;
@@ -337,7 +337,7 @@ public class PatentColumnDTO {
     /**
      * 自定义栏位
      */
-    List<ESCustomField> ESCustomField;
+//    List<ESCustomField> ESCustomField;
     /**
      * 扩展同族数量
      */
@@ -373,29 +373,29 @@ public class PatentColumnDTO {
     /**
      * 专题库或报告id
      */
-    private String productId;
+//    private String productId;
 
     /**
      * 专题库或报告的任务
      */
-    EsProjectTask projectTask;
+//    EsProjectTask projectTask;
 
     /**
      * 导入任务
      */
-    ESImportTask importTask;
+//    ESImportTask importTask;
 
     /**
      * 法律状态
      */
-    List<String> legalStatus;
+//    List<String> legalStatus;
 
     /**
      * 标注
      */
-    List<Marking> markings;
+//    List<Marking> markings;
 
-    PatentJoin patentJoin;
+//    PatentJoin patentJoin;
 
    private String pictureGuid;
 

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

@@ -468,9 +468,13 @@ public class ReportExportService {
 
 
                     //优先权日
-                    if (patent.getPriorities() != null && patent.getPriorities().size() != 0) {
-                        List<String> dates = patent.getPriorities().stream().map(Priorities::getPriorityDate).collect(Collectors.toList());
-                        String nosStr = StringUtils.join(dates, ";");
+//                    if (patent.getPriorities() != null && patent.getPriorities().size() != 0) {
+//                        List<String> dates = patent.getPriorities().stream().map(Priorities::getPriorityDate).collect(Collectors.toList());
+//                        String nosStr = StringUtils.join(dates, ";");
+//                        patentMap.put("priorityDate", nosStr);
+//                    }
+                    if (StringUtils.isNotEmpty(patent.getPriorityDate())) {
+                        String nosStr = patent.getPriorityDate().replace("<br>", ",");
                         patentMap.put("priorityDate", nosStr);
                     }
 

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

@@ -400,7 +400,11 @@ public class EsService {
             columnDTO.setPriorityNo(priorityNo);
             List<String> priorityDates = priorities.stream().map(Priorities::getPriorityDate).distinct().collect(Collectors.toList());
             String priorityDate = String.join("<br>", priorityDates);
-            columnDTO.setPriorityDate(priorityDate);
+            if (priorityDate.contains("null")) {
+                columnDTO.setPriorityDate("");
+            } else {
+                columnDTO.setPriorityDate(priorityDate);
+            }
         }
         columnDTO.setApplicant(esPatentService.loadName(patent.getApplicant()));
         columnDTO.setRightHolder(esPatentService.loadName(patent.getRightHolder()));

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

@@ -988,10 +988,6 @@ public class PatentStarApiService {
             }
 //            patentColumnDTO.setAppCountry(item.getBureau());
             //装载申请人地址
-            PersonAddress appAddress = new PersonAddress();
-            appAddress.setAddress(item.getApplicationAddress());
-            appAddress.setProvince(item.getProvinceStr());
-            patentColumnDTO.setApplicantAddr(appAddress);
             patentColumnDTO.setAppAddress(item.getApplicationAddress());
 //            patentColumnDTO.setApplicantCountry(item.getProvinceStr());
             String provinceStr = item.getProvinceStr();