|
|
@@ -12,6 +12,7 @@ import cn.cslg.pas.domain.ReportDocument;
|
|
|
import cn.cslg.pas.domain.business.*;
|
|
|
import cn.cslg.pas.domain.es.Patent;
|
|
|
import cn.cslg.pas.domain.es.PatentPerson;
|
|
|
+import cn.cslg.pas.domain.es.Priorities;
|
|
|
import cn.cslg.pas.domain.es.Text;
|
|
|
import cn.cslg.pas.exception.XiaoShiException;
|
|
|
import cn.cslg.pas.mapper.AvoidDesignMapper;
|
|
|
@@ -453,7 +454,9 @@ public class ReportExportService {
|
|
|
|
|
|
//优先权日
|
|
|
if (patent.getPriorities() != null && patent.getPriorities().size() != 0) {
|
|
|
- patentMap.put("priorityDate", patent.getPriorities().get(0).getPriorityDate());
|
|
|
+ List<String> dates =patent.getPriorities().stream().map(Priorities::getPriorityDate).collect(Collectors.toList());
|
|
|
+ String nosStr = StringUtils.join(dates, "\\|");
|
|
|
+ patentMap.put("priorityDate", nosStr);
|
|
|
}
|
|
|
|
|
|
//图示
|
lwhhszx