fix: 87915 法规符合性排查流程(主排查人分批下发) --不分发--导出的条款内容有代码
This commit is contained in:
+4
-8
@@ -494,9 +494,10 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
|
|||||||
ExportParams exportParams = new ExportParams();
|
ExportParams exportParams = new ExportParams();
|
||||||
exportParams.setType(ExcelType.HSSF);
|
exportParams.setType(ExcelType.HSSF);
|
||||||
// 去除文本的<p>
|
// 去除文本的<p>
|
||||||
|
String regex = "<[^>]*>";
|
||||||
detailInfoList.forEach(detail -> {
|
detailInfoList.forEach(detail -> {
|
||||||
if (StrUtil.isNotBlank(detail.getTermContent())) {
|
if (StrUtil.isNotBlank(detail.getTermContent())) {
|
||||||
detail.setTermContent(detail.getTermContent().replaceAll("<p>", ""));
|
detail.setTermContent(detail.getTermContent().replaceAll(regex, ""));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
// 复制一份数据
|
// 复制一份数据
|
||||||
@@ -542,9 +543,10 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
|
|||||||
ProcessStandardComplianceCheckDetail::setFileList);
|
ProcessStandardComplianceCheckDetail::setFileList);
|
||||||
|
|
||||||
// 去除文本的<p>
|
// 去除文本的<p>
|
||||||
|
String regex = "<[^>]*>";
|
||||||
detailInfoList.forEach(detail -> {
|
detailInfoList.forEach(detail -> {
|
||||||
if (StrUtil.isNotBlank(detail.getTermContent())) {
|
if (StrUtil.isNotBlank(detail.getTermContent())) {
|
||||||
detail.setTermContent(detail.getTermContent().replaceAll("<p>", ""));
|
detail.setTermContent(detail.getTermContent().replaceAll(regex, ""));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -559,14 +561,8 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
|
|||||||
item.setResult(excelUtils.translateDict("evaluation_result", item.getResult(), listDict));
|
item.setResult(excelUtils.translateDict("evaluation_result", item.getResult(), listDict));
|
||||||
item.setMaterial(excelUtils.translateDictValue("id", "file_name", "oss_file", item.getMaterial(), listDict));
|
item.setMaterial(excelUtils.translateDictValue("id", "file_name", "oss_file", item.getMaterial(), listDict));
|
||||||
});
|
});
|
||||||
|
|
||||||
List<WithoutDistributeExcelTemplate> newRecordsExport = new ArrayList<>(data);
|
|
||||||
|
|
||||||
Workbook workbook = ExcelExportUtil
|
Workbook workbook = ExcelExportUtil
|
||||||
.exportExcel(exportParams, WithoutDistributeExcelTemplate.class, data);
|
.exportExcel(exportParams, WithoutDistributeExcelTemplate.class, data);
|
||||||
// 生成超链接
|
|
||||||
// excelExportUtilPro.generateHyperlink(newRecordsExport, workbook,
|
|
||||||
// WithoutDistributeExcelTemplate::getFileList, 13);
|
|
||||||
// 导出excel
|
// 导出excel
|
||||||
workbook.write(fos);
|
workbook.write(fos);
|
||||||
// 生成并导出zip
|
// 生成并导出zip
|
||||||
|
|||||||
Reference in New Issue
Block a user