|
@@ -107,61 +107,61 @@ public class PatentNewServiceImpl extends BaseMybatisDao<PatentNewMapper> imple
|
|
|
pl.setPid(p.getId());
|
|
pl.setPid(p.getId());
|
|
|
boolean flag=false;
|
|
boolean flag=false;
|
|
|
StringBuffer s=new StringBuffer();
|
|
StringBuffer s=new StringBuffer();
|
|
|
- if (!p.getPatentNo().equals(pn.getPatentNo())) {
|
|
|
|
|
|
|
+ if (p.getPatentNo()!=null&&!p.getPatentNo().equals(pn.getPatentNo())) {
|
|
|
s.append("[专利号:").append(pn.getPatentNo()).append(" => ").append(p.getPatentNo()).append("],");
|
|
s.append("[专利号:").append(pn.getPatentNo()).append(" => ").append(p.getPatentNo()).append("],");
|
|
|
flag=true;
|
|
flag=true;
|
|
|
}
|
|
}
|
|
|
- if (!p.getName().equals(pn.getName())) {
|
|
|
|
|
|
|
+ if (p.getName()!=null&&!p.getName().equals(pn.getName())) {
|
|
|
s.append("[专利名称:").append(pn.getName()).append(" => ").append(p.getName()).append("],");
|
|
s.append("[专利名称:").append(pn.getName()).append(" => ").append(p.getName()).append("],");
|
|
|
flag=true;
|
|
flag=true;
|
|
|
}
|
|
}
|
|
|
- if (!p.getType().equals(pn.getType())) {
|
|
|
|
|
|
|
+ if (p.getType()!=null&&!p.getType().equals(pn.getType())) {
|
|
|
// 0=发明专利,1=使用新型,2=外观设计
|
|
// 0=发明专利,1=使用新型,2=外观设计
|
|
|
String type = getPatentType(p.getType());
|
|
String type = getPatentType(p.getType());
|
|
|
String type1 = getPatentType(pn.getType());
|
|
String type1 = getPatentType(pn.getType());
|
|
|
s.append("[专利类型:").append(type1).append(" => ").append(type).append("],");
|
|
s.append("[专利类型:").append(type1).append(" => ").append(type).append("],");
|
|
|
flag=true;
|
|
flag=true;
|
|
|
}
|
|
}
|
|
|
- if (!p.getTid().equals(pn.getTid())) {
|
|
|
|
|
|
|
+ if (p.getTid()!=null&&!p.getTid().equals(pn.getTid())) {
|
|
|
s.append("[项目编号:").append(pn.getTid()).append(" => ").append(p.getTid()).append("],");
|
|
s.append("[项目编号:").append(pn.getTid()).append(" => ").append(p.getTid()).append("],");
|
|
|
flag=true;
|
|
flag=true;
|
|
|
}
|
|
}
|
|
|
- if (!p.getApplyDate().equals(pn.getApplyDate())) {
|
|
|
|
|
|
|
+ if (p.getApplyDate()!=null&&!p.getApplyDate().equals(pn.getApplyDate())) {
|
|
|
String date = DateUtils.formatDate(p.getApplyDate(), AFTConstants.YYYYMMDD);
|
|
String date = DateUtils.formatDate(p.getApplyDate(), AFTConstants.YYYYMMDD);
|
|
|
String date1 = DateUtils.formatDate(pn.getApplyDate(), AFTConstants.YYYYMMDD);
|
|
String date1 = DateUtils.formatDate(pn.getApplyDate(), AFTConstants.YYYYMMDD);
|
|
|
s.append("[申请日期:").append(date1).append(" => ").append(date).append("],");
|
|
s.append("[申请日期:").append(date1).append(" => ").append(date).append("],");
|
|
|
flag=true;
|
|
flag=true;
|
|
|
}
|
|
}
|
|
|
- if (!p.getAuthorizationDate().equals(pn.getAuthorizationDate())) {
|
|
|
|
|
|
|
+ if (p.getAuthorizationDate()!=null&&!p.getAuthorizationDate().equals(pn.getAuthorizationDate())) {
|
|
|
String date = DateUtils.formatDate(p.getAuthorizationDate(), AFTConstants.YYYYMMDD);
|
|
String date = DateUtils.formatDate(p.getAuthorizationDate(), AFTConstants.YYYYMMDD);
|
|
|
String date1 = DateUtils.formatDate(pn.getAuthorizationDate(), AFTConstants.YYYYMMDD);
|
|
String date1 = DateUtils.formatDate(pn.getAuthorizationDate(), AFTConstants.YYYYMMDD);
|
|
|
s.append("[授权日期:").append(date1).append(" => ").append(date).append("],");
|
|
s.append("[授权日期:").append(date1).append(" => ").append(date).append("],");
|
|
|
flag=true;
|
|
flag=true;
|
|
|
}
|
|
}
|
|
|
- if (!p.getEmail().equals(pn.getEmail())) {
|
|
|
|
|
|
|
+ if (p.getEmail()!=null&&!p.getEmail().equals(pn.getEmail())) {
|
|
|
s.append("[Email:").append(pn.getEmail()).append(" => ").append(p.getEmail()).append("],");
|
|
s.append("[Email:").append(pn.getEmail()).append(" => ").append(p.getEmail()).append("],");
|
|
|
flag=true;
|
|
flag=true;
|
|
|
}
|
|
}
|
|
|
- if (p.getDelayingAmount().compareTo(pn.getDelayingAmount()) != 0) {
|
|
|
|
|
|
|
+ if (p.getDelayingAmount()!=null&&p.getDelayingAmount().compareTo(pn.getDelayingAmount()) != 0) {
|
|
|
s.append("[滞纳金:").append(pn.getDelayingAmount().stripTrailingZeros().toPlainString()).append(" => ")
|
|
s.append("[滞纳金:").append(pn.getDelayingAmount().stripTrailingZeros().toPlainString()).append(" => ")
|
|
|
.append(p.getDelayingAmount().stripTrailingZeros().toPlainString()).append("],");
|
|
.append(p.getDelayingAmount().stripTrailingZeros().toPlainString()).append("],");
|
|
|
flag=true;
|
|
flag=true;
|
|
|
}
|
|
}
|
|
|
- if (p.getRecoveryAmount().compareTo(pn.getRecoveryAmount()) != 0) {
|
|
|
|
|
|
|
+ if (p.getRecoveryAmount()!=null&&p.getRecoveryAmount().compareTo(pn.getRecoveryAmount()) != 0) {
|
|
|
s.append("[权利恢复费:").append(pn.getRecoveryAmount().stripTrailingZeros().toPlainString()).append(" => ")
|
|
s.append("[权利恢复费:").append(pn.getRecoveryAmount().stripTrailingZeros().toPlainString()).append(" => ")
|
|
|
.append(p.getRecoveryAmount().stripTrailingZeros().toPlainString()).append("],");
|
|
.append(p.getRecoveryAmount().stripTrailingZeros().toPlainString()).append("],");
|
|
|
flag=true;
|
|
flag=true;
|
|
|
}
|
|
}
|
|
|
- if (!p.getAnnualFeeStatus().equals(pn.getAnnualFeeStatus())) {
|
|
|
|
|
|
|
+ if (p.getAnnualFeeStatus()!=null&&!p.getAnnualFeeStatus().equals(pn.getAnnualFeeStatus())) {
|
|
|
s.append("[年费状态:").append(pn.getAnnualFeeStatus() == 1 ? "已缴费" : "未缴费").append(" => ")
|
|
s.append("[年费状态:").append(pn.getAnnualFeeStatus() == 1 ? "已缴费" : "未缴费").append(" => ")
|
|
|
.append(p.getAnnualFeeStatus() == 1 ? "已缴费" : "未缴费").append("],");
|
|
.append(p.getAnnualFeeStatus() == 1 ? "已缴费" : "未缴费").append("],");
|
|
|
flag=true;
|
|
flag=true;
|
|
|
}
|
|
}
|
|
|
- if (!p.getHolders().equals(pn.getHolders())) {
|
|
|
|
|
|
|
+ if (p.getHolders()!=null&&!p.getHolders().equals(pn.getHolders())) {
|
|
|
s.append("[权利人:").append(pn.getHolders()).append(" => ").append(p.getHolders()).append("],");
|
|
s.append("[权利人:").append(pn.getHolders()).append(" => ").append(p.getHolders()).append("],");
|
|
|
flag=true;
|
|
flag=true;
|
|
|
}
|
|
}
|
|
|
- if (!p.getInventor().equals(pn.getInventor())) {
|
|
|
|
|
|
|
+ if (p.getInventor()!=null&&!p.getInventor().equals(pn.getInventor())) {
|
|
|
s.append("[发明人:").append(pn.getInventor()).append(" => ").append(p.getInventor()).append("],");
|
|
s.append("[发明人:").append(pn.getInventor()).append(" => ").append(p.getInventor()).append("],");
|
|
|
flag=true;
|
|
flag=true;
|
|
|
}
|
|
}
|