From 28776b56db3bbd2fbbfd64394e40aa11a6b7ea29 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 15 Nov 2023 17:30:53 +0800
Subject: [PATCH] fix：补充提交
---
screen-api/src/main/java/com/moral/api/controller/AllocationController.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/AllocationController.java b/screen-api/src/main/java/com/moral/api/controller/AllocationController.java
index 5865bd9..7fa6f9a 100644
--- a/screen-api/src/main/java/com/moral/api/controller/AllocationController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/AllocationController.java
@@ -7,6 +7,7 @@
import com.moral.api.entity.ResponsibilityUnit;
import com.moral.api.pojo.enums.AllocationApproveEnum;
import com.moral.api.pojo.enums.ChangeEnum;
+import com.moral.api.pojo.enums.YesOrNo;
import com.moral.api.pojo.ext.allocation.AllocationExcelExt;
import com.moral.api.pojo.ext.allocation.AllocationExt;
import com.moral.api.pojo.ext.allocation.AllocationPageExt;
@@ -248,7 +249,7 @@
urls.add(handleFileRealPath(z.getFileAddress()));
}
item.setChangeTypeStr(Objects.isNull(excelExt.getChangeType())?" ":ChangeEnum.getByValue(excelExt.getChangeType()).getName());
- item.setChangeStr(Objects.isNull(excelExt.getIsChange())?"���":ChangeEnum.getByValue(excelExt.getChangeType()).getName());
+ item.setChangeStr(Objects.isNull(excelExt.getIsChange())?"���": YesOrNo.getByValue(excelExt.getIsChange()).getName());
item.setWriteCellDataFile(urls);
List<String> urlsAfter = new ArrayList<>();
for(FileAddressVo z : excelExt.getFileChangeList()){
@@ -265,6 +266,7 @@
response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
EasyExcel.write(response.getOutputStream(), AllocationListExcelVo.class)
.registerWriteHandler(new CustomImageModifyHandler()).sheet("���������").doWrite(demoDataList);
+ response.getOutputStream().close();
}catch (Exception e){
log.error("error result ",e);
}
--
Gitblit v1.8.0