6/6 修改装载优先权日

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

@@ -387,10 +387,22 @@ public class ReportExportService {
                         rightPerson = StringUtils.join(patent.getRightHolder(), "\n");
                     } else {
                     }
-                    List<String> affairs = esLegalEventService.getStrLegalEvent(patent.getAppNo());
                     String affairStrs = "";
-                    if (affairs != null && affairs.size() != 0) {
-                        affairStrs = StringUtils.join(affairs, "\n");
+                    if (patent.getSimpleStatus() != null) {
+                        switch (patent.getSimpleStatus()) {
+                            case "3":
+                                patent.setSimpleStatus("3");
+                                affairStrs = "有效";
+                                break;
+                            case "1":
+                                patent.setSimpleStatus("1");
+                                affairStrs = "审中";
+                                break;
+                            case "2":
+                                patent.setSimpleStatus("2");
+                                affairStrs = "失效";
+                                break;
+                        }
                     }
 
                     //装载单个专利的信息

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

@@ -387,8 +387,10 @@ public class GetPatentFromExcelThread extends Thread {
                         break;
                     case "审中":
                         patent.setSimpleStatus("1");
+                        break;
                     case "失效":
                         patent.setSimpleStatus("2");
+                        break;
 
                 }
             }