|
@@ -3,6 +3,7 @@ package com.ningdatech.pmapi.filemanage.manage; |
|
|
import cn.hutool.core.bean.BeanUtil; |
|
|
import cn.hutool.core.bean.BeanUtil; |
|
|
import cn.hutool.core.collection.CollUtil; |
|
|
import cn.hutool.core.collection.CollUtil; |
|
|
import com.alibaba.fastjson.JSON; |
|
|
import com.alibaba.fastjson.JSON; |
|
|
|
|
|
import com.alibaba.fastjson.JSONArray; |
|
|
import com.alibaba.fastjson.JSONObject; |
|
|
import com.alibaba.fastjson.JSONObject; |
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|
@@ -410,9 +411,12 @@ public class ProjectFileManage { |
|
|
String constructionPlanFile = project.getConstructionPlanFile(); |
|
|
String constructionPlanFile = project.getConstructionPlanFile(); |
|
|
String str = StrPool.LEFT_SQ_BRACKET + StrPool.RIGHT_SQ_BRACKET; |
|
|
String str = StrPool.LEFT_SQ_BRACKET + StrPool.RIGHT_SQ_BRACKET; |
|
|
if (!str.equals(constructionPlanFile)) { |
|
|
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); |
|
|
|
|
|
}); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// 立项批复阶段 |
|
|
// 立项批复阶段 |
|
|