|
@@ -5790,6 +5790,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
headList.add(MessageUtils.message("entry.endDate"));
|
|
headList.add(MessageUtils.message("entry.endDate"));
|
|
headList.add(MessageUtils.message("entry.creator"));
|
|
headList.add(MessageUtils.message("entry.creator"));
|
|
headList.add(MessageUtils.message("entry.creDate"));
|
|
headList.add(MessageUtils.message("entry.creDate"));
|
|
|
|
+
|
|
//自定义维度
|
|
//自定义维度
|
|
if (timeType.getCustomDegreeActive() == 1) {
|
|
if (timeType.getCustomDegreeActive() == 1) {
|
|
headList.add(timeType.getCustomDegreeName());
|
|
headList.add(timeType.getCustomDegreeName());
|
|
@@ -5843,6 +5844,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
headList.add(projectKeyNodesSetting.getName()+MessageUtils.message("excel.actualTime"));
|
|
headList.add(projectKeyNodesSetting.getName()+MessageUtils.message("excel.actualTime"));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ headList.add("状态");
|
|
|
|
+ String[] statusArray = new String[]{"","进行中","已完成","已撤销","暂停"};
|
|
List<List<String>> allList = new ArrayList<List<String>>();
|
|
List<List<String>> allList = new ArrayList<List<String>>();
|
|
allList.add(headList);
|
|
allList.add(headList);
|
|
//String[] levelArray = new String[]{"正常","紧急","重要","重要且紧急","低风险","中风险","高风险"};
|
|
//String[] levelArray = new String[]{"正常","紧急","重要","重要且紧急","低风险","中风险","高风险"};
|
|
@@ -6036,26 +6039,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
rowData.add("");
|
|
rowData.add("");
|
|
rowData.add("");
|
|
rowData.add("");
|
|
}
|
|
}
|
|
- Integer state = projectVO.getStatus();
|
|
|
|
- switch (state){
|
|
|
|
- //case 0:rowData.add("全部");
|
|
|
|
- case 0:rowData.add(MessageUtils.message("excel.whole"));
|
|
|
|
- break;
|
|
|
|
- //case 1:rowData.add("进行中");
|
|
|
|
- case 1:rowData.add(MessageUtils.message("excel.onGoing"));
|
|
|
|
- break;
|
|
|
|
- //case 2:rowData.add("已完成");
|
|
|
|
- case 2:rowData.add(MessageUtils.message("excel.complete"));
|
|
|
|
- break;
|
|
|
|
- //case 3:rowData.add("已撤销");
|
|
|
|
- case 3:rowData.add(MessageUtils.message("excel.revoke"));
|
|
|
|
- break;
|
|
|
|
- //case 4:rowData.add("暂停");
|
|
|
|
- case 4:rowData.add(MessageUtils.message("excel.pause"));
|
|
|
|
- break;
|
|
|
|
- default:rowData.add("");
|
|
|
|
- break;
|
|
|
|
- }
|
|
|
|
|
|
+ rowData.add(statusArray[projectVO.getStatus()]);
|
|
rowData.add(projectVO.getCurrentStageName()==null?"":projectVO.getCurrentStageName());
|
|
rowData.add(projectVO.getCurrentStageName()==null?"":projectVO.getCurrentStageName());
|
|
for (ProjectKeyNodesSetting projectKeyNodesSetting : projectKeyNodesSettingList) {
|
|
for (ProjectKeyNodesSetting projectKeyNodesSetting : projectKeyNodesSettingList) {
|
|
Optional<ProjectKeyNodes> it = nodesList.stream().filter(nl -> nl.getNodesId().equals(projectKeyNodesSetting.getId())&&nl.getProjectId().equals(projectVO.getId())).findFirst();
|
|
Optional<ProjectKeyNodes> it = nodesList.stream().filter(nl -> nl.getNodesId().equals(projectKeyNodesSetting.getId())&&nl.getProjectId().equals(projectVO.getId())).findFirst();
|
|
@@ -6068,6 +6052,9 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
rowData.add("");
|
|
rowData.add("");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ } else {
|
|
|
|
+ //增加状态
|
|
|
|
+ rowData.add(statusArray[projectVO.getStatus()]);
|
|
}
|
|
}
|
|
allList.add(rowData);
|
|
allList.add(rowData);
|
|
}
|
|
}
|