wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-11-25 09:48:39 +08:00
parent 08960eebeb ca8713ab50
commit 06a3e0c478
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
renren-admin/src/main/java/io/renren/common/controller/CensusController.java
View File

@ -597,10 +597,10 @@ public class CensusController {
ArrayList<Map> resultList = (ArrayList<Map>) resourceDao.selectCensusApplyTable(params); ArrayList<Map> resultList = (ArrayList<Map>) resourceDao.selectCensusApplyTable(params);
List<List<Object>> date = resultList.stream().map(index -> { List<List<Object>> date = resultList.stream().map(index -> {
List<Object> data = new ArrayList<>(); List<Object> data = new ArrayList<>();
data.add(index.getOrDefault("resourceDeptName", "") == null ? "" : index.getOrDefault("resourceDeptName", "").toString()); data.add(index.getOrDefault("deptName", "") == null ? "" : index.getOrDefault("deptName", "").toString());
data.add(index.getOrDefault("resourceName", "") == null ? "" : index.getOrDefault("resourceName", "").toString()); data.add(index.getOrDefault("resourceName", "") == null ? "" : index.getOrDefault("resourceName", "").toString());
data.add(index.getOrDefault("type", "") == null ? "" : index.getOrDefault("type", "").toString()); data.add(index.getOrDefault("type", "") == null ? "" : index.getOrDefault("type", "").toString());
data.add(index.getOrDefault("deptName", "") == null ? "" : index.getOrDefault("deptName", "").toString()); data.add(index.getOrDefault("resourceDeptName", "") == null ? "" : index.getOrDefault("resourceDeptName", "").toString());
data.add(index.getOrDefault("createDate", "") == null ? "" : index.getOrDefault("createDate", "").toString()); data.add(index.getOrDefault("createDate", "") == null ? "" : index.getOrDefault("createDate", "").toString());
data.add(index.getOrDefault("approveStatus", "") == null ? "" : index.getOrDefault("approveStatus", "").toString()); data.add(index.getOrDefault("approveStatus", "") == null ? "" : index.getOrDefault("approveStatus", "").toString());
return data; return data;
@ -618,13 +618,13 @@ public class CensusController {
private List<List<String>> exportSelectCensusApplyTableHead() { private List<List<String>> exportSelectCensusApplyTableHead() {
List<List<String>> list = new ArrayList<>(); List<List<String>> list = new ArrayList<>();
List<String> head0 = new ArrayList<>(); List<String> head0 = new ArrayList<>();
head0.add("提供部门"); head0.add("申请部门");
List<String> head1 = new ArrayList<>(); List<String> head1 = new ArrayList<>();
head1.add("资源名称"); head1.add("资源名称");
List<String> head2 = new ArrayList<>(); List<String> head2 = new ArrayList<>();
head2.add("类型"); head2.add("类型");
List<String> head3 = new ArrayList<>(); List<String> head3 = new ArrayList<>();
head3.add("申请部门"); head3.add("提供部门");
List<String> head4 = new ArrayList<>(); List<String> head4 = new ArrayList<>();
head4.add("日期"); head4.add("日期");
List<String> head5 = new ArrayList<>(); List<String> head5 = new ArrayList<>();