From 3139d7823fc9473e087d970c60ddb55f85400bf1 Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Thu, 21 Sep 2023 11:22:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E8=A7=A3=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ningdatech/pmapi/common/model/entity/ExcelExportDTO.java   |  2 +-
 .../ningdatech/pmapi/filemanage/manage/ProjectFileManage.java  | 10 +++++++---
 .../projectdeclared/model/vo/ProjectDeclaredDetailVO.java      |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/common/model/entity/ExcelExportDTO.java b/pmapi/src/main/java/com/ningdatech/pmapi/common/model/entity/ExcelExportDTO.java
index 57579cc..3991490 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/common/model/entity/ExcelExportDTO.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/common/model/entity/ExcelExportDTO.java
@@ -97,7 +97,7 @@ public class ExcelExportDTO implements Serializable {
     private String buildBasis;
 
     @ExcelProperty("建设层级")
-    private Integer buildLevel;
+    private String buildLevel;
 
     @ExcelProperty("发改编码")
     private String developCode;
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/filemanage/manage/ProjectFileManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/filemanage/manage/ProjectFileManage.java
index 3970ba6..cd4829d 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/filemanage/manage/ProjectFileManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/filemanage/manage/ProjectFileManage.java
@@ -3,6 +3,7 @@ package com.ningdatech.pmapi.filemanage.manage;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -410,9 +411,12 @@ public class ProjectFileManage {
         String constructionPlanFile = project.getConstructionPlanFile();
         String str = StrPool.LEFT_SQ_BRACKET + StrPool.RIGHT_SQ_BRACKET;
         if (!str.equals(constructionPlanFile)) {
-            JSONObject jsonObject = JSON.parseObject(constructionPlanFile, JSONObject.class);
-            Long constructFileId = jsonObject.getLong(CommonConst.FILE_ID_STR);
-            fileIdList.add(constructFileId);
+            JSONArray array = JSON.parseArray(constructionPlanFile);
+            array.forEach(o -> {
+                JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(o));
+                Long constructFileId = jsonObject.getLong(CommonConst.FILE_ID_STR);
+                fileIdList.add(constructFileId);
+            });
         }
 
         // 立项批复阶段
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/ProjectDeclaredDetailVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/ProjectDeclaredDetailVO.java
index 1b795d0..0bffceb 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/ProjectDeclaredDetailVO.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/ProjectDeclaredDetailVO.java
@@ -91,7 +91,7 @@ public class ProjectDeclaredDetailVO {
     private String bizDomain;
 
     @ApiModelProperty("建设层级 1:国家级 2:省级 3:省本级 4:市级 5:市本级 6:区县 7乡镇")
-    private Integer buildLevel;
+    private String buildLevel;
 
     @ApiModelProperty("立项依据")
     private String buildBasis;