6/6 修改装载优先权日

src/main/java/cn/cslg/pas/common/config/WebSocketConfig.java

@@ -6,8 +6,8 @@ import org.springframework.web.socket.server.standard.ServerEndpointExporter;
 
 @Configuration
 public class WebSocketConfig {
-//    @Bean
-//    public ServerEndpointExporter serverEndpointExporter() {
-//        return new ServerEndpointExporter();
-//    }
+    @Bean
+    public ServerEndpointExporter serverEndpointExporter() {
+        return new ServerEndpointExporter();
+    }
 }

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

@@ -385,8 +385,7 @@ public class ReportExportService {
                     }
                     if (patent.getRightHolder() != null && patent.getRightHolder().size() != 0) {
                         rightPerson = StringUtils.join(patent.getRightHolder(), "\n");
-                    }
-                    else {
+                    } else {
                     }
                     List<String> affairs = esLegalEventService.getStrLegalEvent(patent.getAppNo());
                     String affairStrs = "";
@@ -437,8 +436,12 @@ public class ReportExportService {
                         patentMap.put("appDate", dateFormat.format(patent.getAppDate()));
                     }
                     //公开日
-                    if (patent.getPublicDate() != null) {
-                        patentMap.put("publicDate", dateFormat.format(patent.getPublicDate()));
+                    if (patent.getPublicDate() != null || patent.getGrantDate() != null) {
+                        if (patent.getPublicDate() != null) {
+                            patentMap.put("publicDate", dateFormat.format(patent.getPublicDate()));
+                        } else if (patent.getGrantDate() != null) {
+                            patentMap.put("publicDate", dateFormat.format(patent.getGrantDate()));
+                        }
                     }
                     //专利号
                     patentMap.put("publicNo", patent.getPatentNo());
@@ -454,7 +457,7 @@ public class ReportExportService {
 
                     //优先权日
                     if (patent.getPriorities() != null && patent.getPriorities().size() != 0) {
-                        List<String> dates =patent.getPriorities().stream().map(Priorities::getPriorityDate).collect(Collectors.toList());
+                        List<String> dates = patent.getPriorities().stream().map(Priorities::getPriorityDate).collect(Collectors.toList());
                         String nosStr = StringUtils.join(dates, ";");
                         patentMap.put("priorityDate", nosStr);
                     }

src/main/java/cn/cslg/pas/service/importPatent/GetPatentFromExcelThread.java

@@ -137,6 +137,9 @@ public class GetPatentFromExcelThread extends Thread {
             }
         }
         patent.setPatentNo(patentNo);
+
+        //装载国家
+        patent.setAppCountry(contry);
         //装载标题
         if (uploadParamsVO.getTitle() != null) {
             List<Text> texts = new ArrayList<>();
@@ -366,6 +369,7 @@ public class GetPatentFromExcelThread extends Thread {
 
         this.loadLegalStatus(patent);
         this.loadPatentType(patent);
+        this.loadLegalStatusBySta(uploadParamsVO);
 
     }
 
@@ -392,6 +396,30 @@ public class GetPatentFromExcelThread extends Thread {
 
         }
     }
+
+
+    private void loadLegalStatusBySta(UploadParamsVO uploadParamsVO) {
+        Patent patent =uploadParamsVO.getPatent();
+        if (uploadParamsVO != null && uploadParamsVO.getPatentAffair() != null && uploadParamsVO.getPatentAffair().getStatus()!=null&&patent.getSimpleStatus()==null) {
+            String status = uploadParamsVO.getPatentAffair().getStatus().split("\\|")[0];
+            if (status != null) {
+
+                switch (status) {
+                    case "公开":
+                    case "授权":
+                        patent.setSimpleStatus("3");
+                        break;
+                    case "实质审查":
+                        patent.setSimpleStatus("1");
+                         break;
+                    default:
+                        patent.setSimpleStatus("3");
+                }
+            }
+
+
+        }
+    }
     private void loadPatentType(Patent patent) {
         String type = patent.getPatentType();
         if (type != null) {

src/main/resources/jsons/patent.json

@@ -1148,7 +1148,7 @@
     "ifAsCondition": "true",
     "groupBy": "dateType",
     "ifSort": "false",
-    "exportClass": "getDateValue"
+    "exportClass": "getCommonValue"
   },
   {
     "name": "优先权号",