|
|
@@ -487,7 +487,7 @@ public class ReportDocumentService extends ServiceImpl<ReportDocumentMapper, Rep
|
|
|
LoopRowTableRenderPolicy policy = new LoopRowTableRenderPolicy();
|
|
|
HtmlRenderPolicy htmlRenderPolicy = new HtmlRenderPolicy();
|
|
|
// 将bz设置为行循环绑定的数据源的key,即key是bz的value会在模板中的{{bz}}处进行解析
|
|
|
- Configure configure = Configure.builder().bind("patentList", policy).bind("fileDetails", policy).bind("allResults", policy).bind("rights",policy).bind("remark", htmlRenderPolicy).build();
|
|
|
+ Configure configure = Configure.builder().bind("patentList", policy).bind("fileDetails", policy).bind("allResults", policy).bind("signPatent.rights",policy).bind("remark", htmlRenderPolicy).build();
|
|
|
// 读取模板、数据并渲染
|
|
|
XWPFTemplate template = XWPFTemplate.compile(filePath, configure).render(map);
|
|
|
return template;
|
|
|
@@ -589,7 +589,7 @@ public class ReportDocumentService extends ServiceImpl<ReportDocumentMapper, Rep
|
|
|
Map<String, Object> temMap = compareMessageService.queryforTemplate(patent.get("patentNo").toString(), reportId);
|
|
|
List<CompareMessageVO> compareMessageVOS = (List<CompareMessageVO>) temMap.get("compareMessageVOs");
|
|
|
//装载对比记录的信息
|
|
|
- patentMap.put("compareMessage", compareMessageVOS);
|
|
|
+ patentMap.put("cM", compareMessageVOS);
|
|
|
patentMap.put("rightNum", temMap.get("right"));
|
|
|
patentMap.put("mainRightNum", temMap.get("mainRight"));
|
|
|
Integer status = Integer.parseInt(patent.get("simpleStatusInt").toString());
|
|
|
@@ -615,7 +615,7 @@ public class ReportDocumentService extends ServiceImpl<ReportDocumentMapper, Rep
|
|
|
LoopRowTableRenderPolicy policy = new LoopRowTableRenderPolicy();
|
|
|
HtmlRenderPolicy htmlRenderPolicy = new HtmlRenderPolicy();
|
|
|
// 将bz设置为行循环绑定的数据源的key,即key是bz的value会在模板中的{{bz}}处进行解析
|
|
|
- Configure configure = Configure.builder().bind("compareMessage", policy).bind("targetDescription", htmlRenderPolicy).build();
|
|
|
+ Configure configure = Configure.builder().bind("cM", policy).bind("targetDescription", htmlRenderPolicy).build();
|
|
|
XWPFTemplate template = XWPFTemplate.compile(filePath, configure).render(map);
|
|
|
return template;
|
|
|
}
|
|
|
@@ -678,6 +678,7 @@ public class ReportDocumentService extends ServiceImpl<ReportDocumentMapper, Rep
|
|
|
patentMap.put("applicant", applicants);
|
|
|
patentMap.put("rightPerson", rightPerson);
|
|
|
patentMap.put("affair", affair);
|
|
|
+ patentMap.put("name", patent.get("name"));
|
|
|
//图示
|
|
|
patentMap.put("abstractPath", "http://139.224.24.90:8081" + patent.get("abstractPath"));
|
|
|
//获得专利对比记录的信息
|
lwhhszx