Merge remote-tracking branch 'origin/dev2' into dev2

PAS/src/main/java/cn/cslg/pas/service/PatentFieldService.java

@@ -230,6 +230,8 @@ public class PatentFieldService {
             add(new PatentField("quotedNum", "被引用数量", Constants.SYSTEM_FIELD_PATENT_LIST, 25));
             add(new PatentField("agency", "代理机构", Constants.SYSTEM_FIELD_PATENT_LIST, 26));
             add(new PatentField("agent", "代理人", Constants.SYSTEM_FIELD_PATENT_LIST, 27));
+            add(new PatentField("publicAccreditNo", "授权号", Constants.SYSTEM_FIELD_PATENT_LIST, 28));
+            add(new PatentField("publicNo", "公开号", Constants.SYSTEM_FIELD_PATENT_LIST, 29));
             add(new PatentField("clientName", "委托方", Constants.SYSTEM_FIELD_PROJECT, 1));
             add(new PatentField("scenarioid", "应用场景", Constants.SYSTEM_FIELD_PROJECT, 1));
             add(new PatentField("typeid", "调查类型", Constants.SYSTEM_FIELD_PROJECT, 1));

PAS/src/main/java/cn/cslg/pas/service/outApi/PatentStarApiService.java

@@ -158,17 +158,23 @@ public class PatentStarApiService {
     public void loadStarPatentVOS(List<StarPatentVO> starPatentVOS, JSONObject Data) {
         String aa = Data.toString();
         starPatentVOS.forEach(item -> {
-
             //如果有公开号，则将公开号作为专利号
             if (item.getApplicationNo() != null && !item.getApplicationNo().equals("") && item.getApplicationNo().contains("CN")) {
                 item.setPatentNo(item.getApplicationNo());
-            } else if (item.getPublicNo() != null && !item.getPublicNo().equals("")) {
-                item.setPatentNo(item.getPublicNo());
+            }
+            else if (item.getPublicNo() != null && !item.getPublicNo().equals("")) {
+                    item.setPatentNo(item.getPublicNo());
                 //如果没有公开号，但是有公告号，则将公告号作为公开号和专利号
-            } else if (item.getPublicAccreditNo() != null && !item.getPublicAccreditNo().equals("")) {
-                item.setPublicNo(item.getPublicAccreditNo());
-                item.setPatentNo(item.getPublicAccreditNo());
-            } else {
+            }
+            if (item.getPublicAccreditNo() != null && !item.getPublicAccreditNo().equals("")) {
+                if(item.getPublicNo()==null||item.getPublicNo().equals("")){
+                    item.setPublicNo(item.getPublicAccreditNo());
+                }
+                if(item.getPatentNo() ==null) {
+                    item.setPatentNo(item.getPublicAccreditNo());
+                }
+            }
+            else {
                 System.out.println("");
 
             }