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/pojo/vo/allocation/AllocationListExcelVo.java | 8 ++++++++
screen-api/src/main/java/com/moral/api/controller/AllocationController.java | 2 ++
2 files changed, 10 insertions(+), 0 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 7a42780..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
@@ -247,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()));
diff --git a/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationListExcelVo.java b/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationListExcelVo.java
index 2587ab1..be41660 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationListExcelVo.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationListExcelVo.java
@@ -96,6 +96,14 @@
@ExcelProperty(value = "���������������",converter = MyStringImageConverterUtil.class)
private List<String> writeCellDataFileResult;
+ @ApiModelProperty(value = "������")
+ @ExcelProperty(value = "������������")
+ private String stateStr;
+
+ @ApiModelProperty(value = "������������")
+ @ExcelProperty(value = "������������")
+ private String checkDescribe;
+
/* @ApiModelProperty(value = "������������id")
private Integer unitId;
--
Gitblit v1.8.0