From 4107073950f459e051e5b9e828750ab57be3863b Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 15 Nov 2023 16:03:53 +0800
Subject: [PATCH] fix：补充提交
---
screen-api/src/main/java/com/moral/api/controller/AllocationController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 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..5865bd9 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
@@ -24,6 +24,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 +45,7 @@
@Api(tags = {"������������"})
@RestController
@RequestMapping("allocation")
+@Slf4j
public class AllocationController {
@Value("${file.path}")
@@ -96,6 +98,7 @@
*/
@PostMapping("update")
@ApiOperation("������")
+
public ResultMessage update(@Valid @RequestBody AllocationUpdateCond allocationUpdateCond){
allocationService.updateAll(allocationUpdateCond);
return ResultMessage.ok();
@@ -226,7 +229,7 @@
try {
genImageExcel(extList,response);
}catch (Exception e){
-
+ log.error("error result ",e);
}
}
@@ -253,7 +256,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 {
@@ -263,7 +266,7 @@
EasyExcel.write(response.getOutputStream(), AllocationListExcelVo.class)
.registerWriteHandler(new CustomImageModifyHandler()).sheet("���������").doWrite(demoDataList);
}catch (Exception e){
-
+ log.error("error result ",e);
}
}
private String handleFileRealPath(String path) {
--
Gitblit v1.8.0