6/6 修改装载优先权日

src/main/java/cn/cslg/pas/common/utils/DateUtils.java

@@ -752,7 +752,7 @@ public class DateUtils {
            String reDate= format.format(a);
             return reDate;
         } catch (Exception e) {
-            return "";
+            return null;
         }
     }
 

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

@@ -333,10 +333,9 @@ public class GetCataloguingFromWebThread extends Thread {
             }
         }
 
-
-        if(patent.getAppCountry()==null){
+           System.out.println("国家"+country);
             patent.setAppCountry(country);
-        }
+
     }
 
     //装载中国专利

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

@@ -162,6 +162,7 @@ public class SavePatentToEsThread extends Thread {
                 //导入完成，通知前台
                 taskThread.updateProcess(false, 1, "");
             } catch (Exception e) {
+                e.printStackTrace();
                 taskThread.updateProcess(true, 1, "");
             }
         }

src/main/resources/jsons/patent.json

@@ -1030,7 +1030,7 @@
     "value": "simpleStatus",
     "field": "SS",
     "esField": "simple_status",
-    "esClass": "LgKeyWordQueryBuilder",
+    "esClass": "LGKeyWordQueryBuilder",
     "ifSearch": "true",
     "ifGroup": "true",
     "ifShow": "true",