|
@@ -331,23 +331,6 @@ public class GetCataloguingFromWebThread extends Thread {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- //装载优先权
|
|
|
- if (starPatentVO.getPriorityNo() != null && !starPatentVO.getPriorityNo().equals("")) {
|
|
|
- String pr = starPatentVO.getPriorityNo();
|
|
|
- String prStrs[] = pr.split(" ");
|
|
|
- String priorityNo = prStrs[0];
|
|
|
- String prDate = "";
|
|
|
- if (prStrs.length > 1) {
|
|
|
- prDate = prStrs[1];
|
|
|
- }
|
|
|
- Priorities priorities = new Priorities();
|
|
|
- priorities.setPriorityNo(priorityNo);
|
|
|
- String pCountry = priorityNo.substring(0, 2);
|
|
|
- priorities.setPriorityCountry(pCountry);
|
|
|
- //装载优先权日
|
|
|
- priorities.setPriorityDate(prDate);
|
|
|
- patent.setPriorities(Arrays.asList(priorities));
|
|
|
- }
|
|
|
|
|
|
//装载受理局
|
|
|
if (starPatentVO.getBureau() != null && !starPatentVO.getBureau().equals("")) {
|
|
@@ -526,7 +509,10 @@ public class GetCataloguingFromWebThread extends Thread {
|
|
|
String pCountry = priorityNo.substring(0, 2);
|
|
|
priorities.setPriorityCountry(pCountry);
|
|
|
//装载优先权日
|
|
|
- priorities.setPriorityDate(prDate);
|
|
|
+ if (prDate != null) {
|
|
|
+ String a = DateUtils.strToStr(prDate, "yyyy-MM-dd");
|
|
|
+ priorities.setPriorityDate(a);
|
|
|
+ }
|
|
|
patent.setPriorities(Arrays.asList(priorities));
|
|
|
}
|
|
|
|