PoffyZhang преди 1 година
родител
ревизия
3139d7823f
променени са 3 файла, в които са добавени 9 реда и са изтрити 5 реда
  1. +1
    -1
      pmapi/src/main/java/com/ningdatech/pmapi/common/model/entity/ExcelExportDTO.java
  2. +7
    -3
      pmapi/src/main/java/com/ningdatech/pmapi/filemanage/manage/ProjectFileManage.java
  3. +1
    -1
      pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/ProjectDeclaredDetailVO.java

+ 1
- 1
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;


+ 7
- 3
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);
});
}

// 立项批复阶段


+ 1
- 1
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;


Loading…
Отказ
Запис