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 | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 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 7fa6f9a..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
@@ -11,6 +11,7 @@
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;
@@ -18,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;
@@ -53,6 +55,8 @@
private String basePath;
@Autowired
private AllocationService allocationService;
+ @Autowired
+ private ResponsibilityUnitService responsibilityUnitService;
@ApiOperation(value = "������������", notes = "������������")
@@ -173,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);
@@ -244,6 +247,8 @@
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()));
@@ -275,4 +280,12 @@
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