|
@@ -129,16 +129,23 @@ public class ReimburseProjectController {
|
|
|
queryWrapper.eq("apply_id", applyId);
|
|
|
List<ReimburseProject> list = reimburseProjectService.list(queryWrapper);
|
|
|
Set<Object> urls = new HashSet<>();
|
|
|
+ Set<Object> excels = new HashSet<>();
|
|
|
for (ReimburseProject project : list) {
|
|
|
if (!Check.isNull(project.getFileUrls())) {
|
|
|
List<String> fileUrls = JSONArray.parseArray(project.getFileUrls().toString(), String.class);
|
|
|
- if (Check.isNull(fileUrls)) {
|
|
|
- continue;
|
|
|
+ if (!Check.isNull(fileUrls)) {
|
|
|
+ urls.addAll(fileUrls);
|
|
|
+ }
|
|
|
+ List<String> excelUrls = JSONArray.parseArray(project.getExcelUrls().toString(), String.class);
|
|
|
+ if (!Check.isNull(excelUrls)) {
|
|
|
+ excels.addAll(excelUrls);
|
|
|
}
|
|
|
- urls.addAll(fileUrls);
|
|
|
}
|
|
|
}
|
|
|
- return Result.ok(urls);
|
|
|
+ JSONObject data = new JSONObject();
|
|
|
+ data.put("fileUrls", urls);
|
|
|
+ data.put("excelUrls", excels);
|
|
|
+ return Result.ok(excels);
|
|
|
}
|
|
|
|
|
|
/**
|