|
|
@@ -551,17 +551,16 @@ public class WbsTreeContractController extends BladeController {
|
|
|
if (18 == ancestor.getNodeType()) {
|
|
|
excelName.append(ancestor.getNodeName());
|
|
|
} else if (2 == ancestor.getNodeType()) {
|
|
|
- excelName.append(">>" + ancestor.getNodeName());
|
|
|
+ excelName.append("》" + ancestor.getNodeName());
|
|
|
} else if (3 == ancestor.getNodeType()) {
|
|
|
- excelName.append(">>" + ancestor.getNodeName());
|
|
|
+ excelName.append("》" + ancestor.getNodeName());
|
|
|
}else if (4 == ancestor.getNodeType()) {
|
|
|
- excelName.append(">>" + ancestor.getNodeName());
|
|
|
+ excelName.append("》" + ancestor.getNodeName());
|
|
|
} else if (5 == ancestor.getNodeType()) {
|
|
|
- excelName.append(">>" + ancestor.getNodeName());
|
|
|
+ excelName.append("》" + ancestor.getNodeName());
|
|
|
}
|
|
|
}
|
|
|
- excelName.append(">>" + node.getNodeName());
|
|
|
-
|
|
|
+ excelName.append("》" + node.getNodeName());
|
|
|
// 创建主工作簿(用于合并多sheet)
|
|
|
XSSFWorkbook mainWorkbook = new XSSFWorkbook();
|
|
|
|
|
|
@@ -620,9 +619,10 @@ public class WbsTreeContractController extends BladeController {
|
|
|
if (mainWorkbook.getNumberOfSheets() == 0) {
|
|
|
throw new ServiceException("所有表单均无法生成有效Excel内容");
|
|
|
}
|
|
|
-
|
|
|
String originalFileName = excelName + ".xlsx";
|
|
|
-
|
|
|
+ if(originalFileName.startsWith("》")){
|
|
|
+ originalFileName=originalFileName.substring(1);
|
|
|
+ }
|
|
|
try {
|
|
|
// 1. 先编码所有字符
|
|
|
String fullyEncoded = URLEncoder.encode(originalFileName, StandardCharsets.UTF_8.name());
|