6/14 拆分权要修改

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

@@ -208,8 +208,6 @@ public class GetCataloguingFromWebThread extends Thread {
 
         //装载公告日
         if (starPatentVO.getPublicAccreditDate() != null && !starPatentVO.getPublicAccreditDate().equals("")) {
-//
-//            patent.setGrantDate();
             Date date = DateUtils.strToDate(starPatentVO.getPublicAccreditDate());
             patent.setGrantDate(date);
         }
@@ -247,7 +245,6 @@ public class GetCataloguingFromWebThread extends Thread {
         if (starPatentVO.getApplicationNo() != null && !starPatentVO.getApplicationNo().equals("")) {
             patent.setAppNo(starPatentVO.getApplicationNo());
             country = starPatentVO.getApplicationNo().substring(0, 2);
-
         }
 
         //装载公开号
@@ -285,8 +282,8 @@ public class GetCataloguingFromWebThread extends Thread {
 
         if (starPatentVO.getAgencyStr() != null && !starPatentVO.getAgencyStr().equals("")) {
             patent.setAgency(starPatentVO.getAgencyStr());
-
         }
+
         //装载公开日
         if (starPatentVO.getPublicDate() != null && !starPatentVO.getPublicDate().equals("")) {
             Date date = DateUtils.strToDate(starPatentVO.getPublicDate());
@@ -344,6 +341,7 @@ public class GetCataloguingFromWebThread extends Thread {
         if (chinaPatentZhuLuStr != null && !chinaPatentZhuLuStr.trim().equals("") && !chinaPatentZhuLuStr.equals("{}") && !chinaPatentZhuLuStr.contains("请求不合法")) {
             List<ChinaPatentZhuLu> chinaPatentZhuLus = JSON.parseArray(chinaPatentZhuLuStr, ChinaPatentZhuLu.class);
             ChinaPatentZhuLu chinaPatentZhuLu = chinaPatentZhuLus.get(0);
+
             //装载申请人地址
             if (patent.getApplicantAddr() == null) {
                 if (chinaPatentZhuLu.getDZ() != null && !chinaPatentZhuLu.getDZ().equals("")) {
@@ -352,6 +350,7 @@ public class GetCataloguingFromWebThread extends Thread {
                     patent.setApplicantAddr(personAddress);
                 }
             }
+
             //装载代理人
             if (patent.getAgent() == null || patent.getAgent().size() == 0) {
                 if (chinaPatentZhuLu.getAT() != null && !chinaPatentZhuLu.getAT().equals("")) {
@@ -378,6 +377,7 @@ public class GetCataloguingFromWebThread extends Thread {
                     patent.setInventor(patentPeople);
                 }
             }
+
             //装载优先权号、优先权国家、优先权日
             if (chinaPatentZhuLu.getPR() != null && chinaPatentZhuLu.getPR() != "") {
                 String pr = chinaPatentZhuLu.getPR();
@@ -524,6 +524,7 @@ public class GetCataloguingFromWebThread extends Thread {
             text.setTextContent(worldPatentZhuLu.getTitle());
             patent.setTitle(Arrays.asList(text));
         }
+
         //装载摘要
         if (patent.getAbstractStr() == null || patent.getAbstractStr().equals("")) {
             Text text = new Text();
@@ -532,8 +533,6 @@ public class GetCataloguingFromWebThread extends Thread {
             text.setTextContent(worldPatentZhuLu.getAbstract());
             patent.setAbstractStr(Arrays.asList(text));
         }
-
-
     }
 
     public List<String> reQuotedNos(String str) {

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

@@ -137,7 +137,6 @@ public class GetPatentFromExcelThread extends Thread {
             }
         }
         patent.setPatentNo(patentNo);
-
         //装载国家
         patent.setAppCountry(contry);
         //装载标题
@@ -247,6 +246,7 @@ public class GetPatentFromExcelThread extends Thread {
         }
 
         List<String> applicantNames = uploadParamsVO.getPatentApplicantOriginalName();
+
         //申请人
         if (applicantNames != null && applicantNames.size() != 0) {
             List<PatentPerson> patentPeople = new ArrayList<>();
@@ -272,7 +272,6 @@ public class GetPatentFromExcelThread extends Thread {
                 patentPeople.add(patentPerson);
             }
             patent.setRightHolder(patentPeople);
-
         }
 
         //发明人
@@ -287,7 +286,6 @@ public class GetPatentFromExcelThread extends Thread {
                 patentPeople.add(patentPerson);
             }
             patent.setInventor(patentPeople);
-
         }
 
         List<String> ipcList = uploadParamsVO.getIpcList();
@@ -391,7 +389,9 @@ public class GetPatentFromExcelThread extends Thread {
                     case "失效":
                         patent.setSimpleStatus("2");
                         break;
-
+                    default:
+                        patent.setSimpleStatus("3");
+                        break;
                 }
             }
 
@@ -401,8 +401,8 @@ 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) {
+        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) {
 
@@ -413,15 +413,16 @@ public class GetPatentFromExcelThread extends Thread {
                         break;
                     case "实质审查":
                         patent.setSimpleStatus("1");
-                         break;
+                        break;
                     default:
                         patent.setSimpleStatus("3");
                 }
             }
 
-
         }
     }
+
+
     private void loadPatentType(Patent patent) {
         String type = patent.getPatentType();
         if (type != null) {