From 849f5de2b87fa457701c7a6daf1d521e40a6c01d Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Fri, 8 Dec 2023 14:15:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=20=E7=AB=8B=E9=A1=B9?=
 =?UTF-8?q?=E4=BE=9D=E6=8D=AE=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pmapi/common/enumeration/ExportOptionEnum.java      |  2 +-
 .../com/ningdatech/pmapi/common/util/ExcelDownUtil.java | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/common/enumeration/ExportOptionEnum.java b/pmapi/src/main/java/com/ningdatech/pmapi/common/enumeration/ExportOptionEnum.java
index 689021f..040f7e2 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/common/enumeration/ExportOptionEnum.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/common/enumeration/ExportOptionEnum.java
@@ -69,7 +69,7 @@ public enum ExportOptionEnum {
 
     projectIntroduction(24, "项目简介"),
 
-    baseBasisEstablish(25, "立项依据说明"),
+    baseBasis(25, "立项依据"),
 
     buildLevel(26, "建设层级"),
 
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/common/util/ExcelDownUtil.java b/pmapi/src/main/java/com/ningdatech/pmapi/common/util/ExcelDownUtil.java
index 4952536..6e36faf 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/common/util/ExcelDownUtil.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/common/util/ExcelDownUtil.java
@@ -7,6 +7,7 @@ import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 import com.ningdatech.basic.exception.BizException;
 import com.ningdatech.basic.model.ApiResponse;
 import com.ningdatech.basic.util.CollUtils;
@@ -40,6 +41,12 @@ import java.util.function.BiConsumer;
 @Slf4j
 public class ExcelDownUtil {
 
+    public static Map<String,String> convertMap = Maps.newHashMap();
+
+    static {
+        convertMap.put("baseBasis","baseBasisEstablish");
+    }
+
     public static String encodeName(String name) {
         String fileName;
         try {
@@ -199,6 +206,9 @@ public class ExcelDownUtil {
         List<List<String>> rowList = Lists.newArrayList();
         for (ExportOptionEnum column : columnList) {
             List<String> columnValues = Lists.newArrayList();
+            if(Objects.isNull(column)){
+                continue;
+            }
             String desc = column.getDesc();
             if (Objects.nonNull(desc)) {
                 columnValues.add(desc);
@@ -217,7 +227,12 @@ public class ExcelDownUtil {
                     List<String> nameList = CollUtils.fieldList(fileArray, w -> w.getString(CommonConst.FILE_NAME));
                     columnValue = String.join(StrPool.COMMA, nameList);
                 } else {
-                    columnValue = jsonObject.getString(column.toString());
+                    //强转列
+                    if(convertMap.containsKey(column.toString())){
+                        columnValue = jsonObject.getString(convertMap.get(column.toString()));
+                    }else{
+                        columnValue = jsonObject.getString(column.toString());
+                    }
                 }
                 if (CommonConst.NULL.equals(columnValue)) {
                     columnValue = "";