From 6992aaf0587c09f7c511c1afd12e1519d91363d3 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 14 Dec 2023 15:38:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-api/src/main/java/com/moral/api/controller/AllocationController.java | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 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..07c8d6e 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,9 @@
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.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;
@@ -22,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;
@@ -35,16 +39,14 @@
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;
@Api(tags = {"������������"})
@RestController
@RequestMapping("allocation")
+@Slf4j
public class AllocationController {
@Value("${file.path}")
@@ -97,6 +99,7 @@
*/
@PostMapping("update")
@ApiOperation("������")
+
public ResultMessage update(@Valid @RequestBody AllocationUpdateCond allocationUpdateCond){
allocationService.updateAll(allocationUpdateCond);
return ResultMessage.ok();
@@ -170,7 +173,6 @@
return ResultMessage.ok(ObjectUtils.isEmpty(map1)? "0":map1);
}
-
@GetMapping("unitExel")
public void unitExel(HttpServletResponse response,HttpServletRequest request){
Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
@@ -227,12 +229,11 @@
try {
genImageExcel(extList,response);
}catch (Exception e){
-
+ log.error("error result ",e);
}
}
- 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 +241,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())?"���": YesOrNo.getByValue(excelExt.getIsChange()).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(Objects.isNull(excelExt.getChangeTime())?" ":DateUtils.dateToDateString(excelExt.getChangeTime(),DateUtils.yyyy_MM_dd_EN));
demoDataList.add(item);
}
try {
@@ -254,8 +265,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