|
@@ -215,7 +215,7 @@ public class ExcelDownUtil { |
|
|
String columnValue; |
|
|
String columnValue; |
|
|
if (ExportOptionEnum.preliminaryPlanFile.equals(column) |
|
|
if (ExportOptionEnum.preliminaryPlanFile.equals(column) |
|
|
|| ExportOptionEnum.supportingMaterialsFile.equals(column)){ |
|
|
|| ExportOptionEnum.supportingMaterialsFile.equals(column)){ |
|
|
String fileStr = String.valueOf(jsonObject.get(column.toString())); |
|
|
|
|
|
|
|
|
String fileStr = jsonObject.getString(column.toString()); |
|
|
if (Objects.isNull(fileStr) || CommonConst.NULL.equals(fileStr)){ |
|
|
if (Objects.isNull(fileStr) || CommonConst.NULL.equals(fileStr)){ |
|
|
return; |
|
|
return; |
|
|
} |
|
|
} |
|
@@ -223,7 +223,7 @@ public class ExcelDownUtil { |
|
|
List<String> nameList = CollUtils.fieldList(fileArray, w -> w.getString(CommonConst.FILE_NAME)); |
|
|
List<String> nameList = CollUtils.fieldList(fileArray, w -> w.getString(CommonConst.FILE_NAME)); |
|
|
columnValue = nameList.stream().collect(Collectors.joining(StrPool.COMMA)); |
|
|
columnValue = nameList.stream().collect(Collectors.joining(StrPool.COMMA)); |
|
|
}else { |
|
|
}else { |
|
|
columnValue = String.valueOf(jsonObject.get(column.toString())); |
|
|
|
|
|
|
|
|
columnValue = jsonObject.getString(column.toString()); |
|
|
} |
|
|
} |
|
|
columnValues.add(columnValue); |
|
|
columnValues.add(columnValue); |
|
|
}); |
|
|
}); |
|
|