dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(X-Pack):【数据填报】修复下载模板同名表头会合并的问题

Browse Source
This commit is contained in:
ulleo 2024-05-07 12:01:22 +08:00
parent a4aa7eea3b
commit 6c42d56724
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/backend/src/main/java/io/dataease/controller/datafill/DataFillController.java
View File

@ -195,6 +195,7 @@ public class DataFillController {
// 这里需要设置不关闭流 // 这里需要设置不关闭流
EasyExcel.write(response.getOutputStream()) EasyExcel.write(response.getOutputStream())
.head(dataFillService.getExcelHead(formId)) .head(dataFillService.getExcelHead(formId))
.automaticMergeHead(false)
.inMemory(true) .inMemory(true)
.registerWriteHandler(dataFillService.getCommentWriteHandler(formId)) .registerWriteHandler(dataFillService.getCommentWriteHandler(formId))
.autoCloseStream(Boolean.FALSE) .autoCloseStream(Boolean.FALSE)
@ -206,8 +207,6 @@ public class DataFillController {
@PostMapping("/form/{formId}/excel/upload") @PostMapping("/form/{formId}/excel/upload")
public void excelUpload(@RequestParam("file") MultipartFile file, @PathVariable String formId) throws Exception { public void excelUpload(@RequestParam("file") MultipartFile file, @PathVariable String formId) throws Exception {
String filename = file.getOriginalFilename(); String filename = file.getOriginalFilename();
System.out.println(filename);
System.out.println(formId);
dataFillDataService.importExcelData(file, formId); dataFillDataService.importExcelData(file, formId);
} }