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 | 13 +++++++++----
1 files changed, 9 insertions(+), 4 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 329c765..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;
@@ -24,6 +25,7 @@
import com.moral.util.DateUtils;
import com.moral.util.WebUtils;
import io.swagger.annotations.*;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -44,6 +46,7 @@
@Api(tags = {"������������"})
@RestController
@RequestMapping("allocation")
+@Slf4j
public class AllocationController {
@Value("${file.path}")
@@ -96,6 +99,7 @@
*/
@PostMapping("update")
@ApiOperation("������")
+
public ResultMessage update(@Valid @RequestBody AllocationUpdateCond allocationUpdateCond){
allocationService.updateAll(allocationUpdateCond);
return ResultMessage.ok();
@@ -226,7 +230,7 @@
try {
genImageExcel(extList,response);
}catch (Exception e){
-
+ log.error("error result ",e);
}
}
@@ -245,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()){
@@ -253,7 +257,7 @@
}
item.setWriteCellDataFileResult(urlsAfter);
item.setEscalationTimeStr(DateUtils.dateToDateString(excelExt.getEscalationTime(),DateUtils.yyyy_MM_dd_EN));
- item.setChangeTimeStr(DateUtils.dateToDateString(excelExt.getChangeTime(),DateUtils.yyyy_MM_dd_EN));
+ item.setChangeTimeStr(Objects.isNull(excelExt.getChangeTime())?" ":DateUtils.dateToDateString(excelExt.getChangeTime(),DateUtils.yyyy_MM_dd_EN));
demoDataList.add(item);
}
try {
@@ -262,8 +266,9 @@
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);
}
}
private String handleFileRealPath(String path) {
--
Gitblit v1.8.0