|
@@ -299,16 +299,21 @@ public class ReportDocumentService extends ServiceImpl<ReportDocumentMapper, Rep
|
|
|
String content = record.getContent() != null ? record.getContent() : "";
|
|
|
//获得对比专利号
|
|
|
String patentNo = record.getPatentNo() != null ? record.getPatentNo() : "";
|
|
|
- if (OtherName.containsKey(patentNo)) {
|
|
|
- patentNo = OtherName.get(patentNo).toString()+":";
|
|
|
+ if(record.getPatentNo()==null){
|
|
|
+ compareContent="公识";
|
|
|
}
|
|
|
- else if(!patentNo.equals("")){
|
|
|
- patentNo+=":";
|
|
|
+ else{
|
|
|
+ if (OtherName.containsKey(patentNo)) {
|
|
|
+ patentNo = OtherName.get(patentNo).toString()+":";
|
|
|
+ }
|
|
|
+ else if(!patentNo.equals("")){
|
|
|
+ patentNo+=":";
|
|
|
+ }
|
|
|
+ //获得解析过程
|
|
|
+ String paresingProcess = record.getParesingProcess() != null ? "(" + record.getParesingProcess() + ")" : "";
|
|
|
+ compareContent = patentNo + content + paresingProcess;
|
|
|
}
|
|
|
|
|
|
- //获得解析过程
|
|
|
- String paresingProcess = record.getParesingProcess() != null ? "(" + record.getParesingProcess() + ")" : "";
|
|
|
- compareContent = patentNo + content + paresingProcess;
|
|
|
//获取对比专利号
|
|
|
map.put("compareContent", compareContent);
|
|
|
map.put("figure", fileUtils.getSystemPath() + record.getFilePath());
|