From d117d3af15dddc4f07baffa8b5bf6b727c05de7c Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 15 Nov 2023 15:48:14 +0800
Subject: [PATCH] fix：补充提交
---
screen-api/src/main/java/com/moral/api/controller/AllocationController.java | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 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 afdc6de..329c765 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
@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.entity.AllocationLog;
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.ext.allocation.AllocationExcelExt;
import com.moral.api.pojo.ext.allocation.AllocationExt;
import com.moral.api.pojo.ext.allocation.AllocationPageExt;
@@ -35,10 +37,7 @@
import java.io.IOException;
import java.net.URL;
import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.concurrent.atomic.AtomicReference;
@@ -232,7 +231,6 @@
}
- private final String PARHTINAGE = "https://qx.7drlb.com/api/file/preview/";
private void genImageExcel(List<AllocationExcelExt> list, HttpServletResponse response) throws IOException {
if (CollectionUtils.isEmpty(list)) {
@@ -240,12 +238,22 @@
}
List<AllocationListExcelVo> demoDataList = new ArrayList<>();
for(int i = 0;i<list.size();i++){
- AllocationListExcelVo item = AllocationListExcelVo.convert(list.get(i));
+ AllocationExcelExt excelExt = list.get(i);
+ AllocationListExcelVo item = AllocationListExcelVo.convert(excelExt);
List<String> urls = new ArrayList<>();
- for(FileAddressVo z : list.get(i).getFileBaseList()){
+ for(FileAddressVo z : excelExt.getFileBaseList()){
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.setWriteCellDataFile(urls);
+ List<String> urlsAfter = new ArrayList<>();
+ for(FileAddressVo z : excelExt.getFileChangeList()){
+ urlsAfter.add(handleFileRealPath(z.getFileAddress()));
+ }
+ 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));
demoDataList.add(item);
}
try {
--
Gitblit v1.8.0