diff --git a/renren-admin/src/main/java/io/renren/common/controller/CensusController.java b/renren-admin/src/main/java/io/renren/common/controller/CensusController.java index 44615e44..dc0f3f18 100644 --- a/renren-admin/src/main/java/io/renren/common/controller/CensusController.java +++ b/renren-admin/src/main/java/io/renren/common/controller/CensusController.java @@ -485,10 +485,10 @@ public class CensusController { ArrayList resultList = (ArrayList) resourceService.selectCensusResourceTable(params); List> date = resultList.stream().map(index -> { List data = new ArrayList<>(); - data.add(index.getOrDefault("deptName", "").toString()); - data.add(index.getOrDefault("type", "").toString()); - data.add(index.getOrDefault("resourceName", "").toString()); - data.add(index.getOrDefault("createDate", "").toString()); + data.add(index.getOrDefault("deptName", "")); + data.add(index.getOrDefault("type", "")); + data.add(index.getOrDefault("resourceName", "")); + data.add(index.getOrDefault("createDate", "")); data.add(index.getOrDefault("approveStatus", "").toString()); return data; }).collect(Collectors.toList()); @@ -550,12 +550,12 @@ public class CensusController { ArrayList resultList = (ArrayList) resourceService.selectCensusApplyTable(params); List> date = resultList.stream().map(index -> { List data = new ArrayList<>(); - data.add(index.getOrDefault("resourceDeptName", "").toString()); - data.add(index.getOrDefault("resourceName", "").toString()); - data.add(index.getOrDefault("type", "").toString()); - data.add(index.getOrDefault("deptName", "").toString()); - data.add(index.getOrDefault("createDate", "").toString()); - data.add(index.getOrDefault("approveStatus", "").toString()); + data.add(index.getOrDefault("resourceDeptName", "")); + data.add(index.getOrDefault("resourceName", "")); + data.add(index.getOrDefault("type", "")); + data.add(index.getOrDefault("deptName", "")); + data.add(index.getOrDefault("createDate", "")); + data.add(index.getOrDefault("approveStatus", "")); return data; }).collect(Collectors.toList()); response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");