From 27e6bc3df3e39e0d0b147b155a89ad6837ea972b Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Mon, 06 Jan 2025 09:19:24 +0800
Subject: [PATCH] Merge branch 'cjl' into dev
---
screen-api/src/main/java/com/moral/api/controller/AllocationController.java | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 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..df08b55 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,9 +7,11 @@
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;
+import com.moral.api.pojo.query.ResponsibilityUnitQuery;
import com.moral.api.pojo.query.allocation.*;
import com.moral.api.pojo.query.allocationextension.AllocationExtensionAddCond;
import com.moral.api.pojo.vo.allocation.AllocationListExcelVo;
@@ -17,6 +19,7 @@
import com.moral.api.pojo.vo.allocation.AllocationVo;
import com.moral.api.pojo.vo.file.FileAddressVo;
import com.moral.api.service.AllocationService;
+import com.moral.api.service.ResponsibilityUnitService;
import com.moral.api.utils.*;
import com.moral.constant.Constants;
import com.moral.constant.PageResult;
@@ -24,6 +27,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,12 +48,15 @@
@Api(tags = {"������������"})
@RestController
@RequestMapping("allocation")
+@Slf4j
public class AllocationController {
@Value("${file.path}")
private String basePath;
@Autowired
private AllocationService allocationService;
+ @Autowired
+ private ResponsibilityUnitService responsibilityUnitService;
@ApiOperation(value = "������������", notes = "������������")
@@ -96,6 +103,7 @@
*/
@PostMapping("update")
@ApiOperation("������")
+
public ResultMessage update(@Valid @RequestBody AllocationUpdateCond allocationUpdateCond){
allocationService.updateAll(allocationUpdateCond);
return ResultMessage.ok();
@@ -169,7 +177,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);
@@ -226,7 +233,7 @@
try {
genImageExcel(extList,response);
}catch (Exception e){
-
+ log.error("error result ",e);
}
}
@@ -240,12 +247,14 @@
for(int i = 0;i<list.size();i++){
AllocationExcelExt excelExt = list.get(i);
AllocationListExcelVo item = AllocationListExcelVo.convert(excelExt);
+ String stateStr = Objects.nonNull(excelExt.getState())?AllocationApproveEnum.getByValue(excelExt.getState()).getName():"���������������";
+ item.setStateStr(stateStr);
List<String> urls = new ArrayList<>();
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.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 +262,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,12 +271,21 @@
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) {
return basePath.replaceAll(StringUtils.BACKSLASH.concat(StringUtils.BACKSLASH), StringUtils.SLASH).concat(StringUtils.SLASH).concat(path);
}
+
+ @GetMapping("unitQuery")
+ @ApiOperation("������������������")
+ public ResultMessage unitQuery(){
+ List<ResponsibilityUnitQuery> responsibilityUnitQueries = responsibilityUnitService.unitQuery();
+ return ResultMessage.ok(responsibilityUnitQueries);
+ }
+
}
--
Gitblit v1.8.0