优化审计报告模板、审计报告生成下载接口
This commit is contained in:
@@ -113,12 +113,12 @@ public class AuditReportController extends BaseController {
|
||||
// 准备模板数据
|
||||
Map<String, Object> map = new HashMap<>();
|
||||
map.put(AuditReportEnum.AUDIT_TITLE.getCode().toString(), req.getFrom0());
|
||||
map.put(AuditReportEnum.AUDIT_BASIS.getCode().toString(), req.getFrom1());
|
||||
map.put(AuditReportEnum.AUDIT_OBJECTIVE.getCode().toString(), req.getFrom2());
|
||||
map.put(AuditReportEnum.AUDIT_SCOPE.getCode().toString(), req.getFrom3());
|
||||
map.put(AuditReportEnum.UNIT_OVERVIEW.getCode().toString(), req.getFrom41());
|
||||
map.put(AuditReportEnum.ORG_AND_PERSONNEL.getCode().toString(), req.getFrom42());
|
||||
map.put(AuditReportEnum.AUDIT_CONTENT_METHODS.getCode().toString(), req.getFrom5());
|
||||
map.put(AuditReportEnum.AUDIT_BASIS.getCode().toString(), convertNewlines(req.getFrom1()));
|
||||
map.put(AuditReportEnum.AUDIT_OBJECTIVE.getCode().toString(), convertNewlines(req.getFrom2()));
|
||||
map.put(AuditReportEnum.AUDIT_SCOPE.getCode().toString(), convertNewlines(req.getFrom3()));
|
||||
map.put(AuditReportEnum.UNIT_OVERVIEW.getCode().toString(), convertNewlines(req.getFrom41()));
|
||||
map.put(AuditReportEnum.ORG_AND_PERSONNEL.getCode().toString(), convertNewlines(req.getFrom42()));
|
||||
map.put(AuditReportEnum.AUDIT_CONTENT_METHODS.getCode().toString(), convertNewlines(req.getFrom5()));
|
||||
|
||||
// 使用Easypoi的Word模板功能
|
||||
XWPFDocument document = WordExportUtil.exportWord07(templateConfig.getWordTemplatePath(), map);
|
||||
@@ -141,4 +141,14 @@ public class AuditReportController extends BaseController {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 将文本中的 \n\n 转换为Word可识别的换行格式
|
||||
*/
|
||||
private String convertNewlines(String text) {
|
||||
if (text == null) {
|
||||
return "";
|
||||
}
|
||||
String line = System.getProperty("line.separator");
|
||||
return text.replace("\n\n", line).replace("\n", line);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user