|
|
@@ -128,13 +128,19 @@ public class PatentNewServiceImpl extends BaseMybatisDao<PatentNewMapper> imple
|
|
|
}
|
|
|
if (p.getApplyDate()!=null&&!p.getApplyDate().equals(pn.getApplyDate())) {
|
|
|
String date = DateUtils.formatDate(p.getApplyDate(), AFTConstants.YYYYMMDD);
|
|
|
- String date1 = DateUtils.formatDate(pn.getApplyDate(), AFTConstants.YYYYMMDD);
|
|
|
+ String date1="";
|
|
|
+ if(pn.getApplyDate()!=null) {
|
|
|
+ date1 = DateUtils.formatDate(pn.getApplyDate(), AFTConstants.YYYYMMDD);
|
|
|
+ }
|
|
|
s.append("[申请日期:").append(date1).append(" => ").append(date).append("],");
|
|
|
flag=true;
|
|
|
}
|
|
|
if (p.getAuthorizationDate()!=null&&!p.getAuthorizationDate().equals(pn.getAuthorizationDate())) {
|
|
|
String date = DateUtils.formatDate(p.getAuthorizationDate(), AFTConstants.YYYYMMDD);
|
|
|
- String date1 = DateUtils.formatDate(pn.getAuthorizationDate(), AFTConstants.YYYYMMDD);
|
|
|
+ String date1="";
|
|
|
+ if(pn.getAuthorizationDate()!=null) {
|
|
|
+ date1 = DateUtils.formatDate(pn.getAuthorizationDate(), AFTConstants.YYYYMMDD);
|
|
|
+ }
|
|
|
s.append("[授权日期:").append(date1).append(" => ").append(date).append("],");
|
|
|
flag=true;
|
|
|
}
|