diff --git a/backend/ruoyi-admin/pom.xml b/backend/ruoyi-admin/pom.xml
index a5e691f..a996354 100644
--- a/backend/ruoyi-admin/pom.xml
+++ b/backend/ruoyi-admin/pom.xml
@@ -108,8 +108,8 @@
org.apache.maven.plugins
maven-compiler-plugin
- 16
- 16
+ 9
+ 9
diff --git a/backend/ruoyi-admin/src/main/java/com/ruoyi/dashboard/service/impl/SysDashboardServiceImpl.java b/backend/ruoyi-admin/src/main/java/com/ruoyi/dashboard/service/impl/SysDashboardServiceImpl.java
index d0b1265..8cec740 100644
--- a/backend/ruoyi-admin/src/main/java/com/ruoyi/dashboard/service/impl/SysDashboardServiceImpl.java
+++ b/backend/ruoyi-admin/src/main/java/com/ruoyi/dashboard/service/impl/SysDashboardServiceImpl.java
@@ -46,15 +46,15 @@ public SysDashboard getDashboardData() {
// 根据项目状态分类
List plannedProjects = projects.stream()
- .filter(p -> "规划中".equals(p.getStatus()))
+ .filter(p -> "Planning".equals(p.getStatus()))
.collect(Collectors.toList());
List ongoingProjects = projects.stream()
- .filter(p -> "进行中".equals(p.getStatus()))
+ .filter(p -> "In Progress".equals(p.getStatus()))
.collect(Collectors.toList());
List completedProjects = projects.stream()
- .filter(p -> "已完成".equals(p.getStatus()))
+ .filter(p -> "Completed".equals(p.getStatus()))
.collect(Collectors.toList());
sysDashboard.setPlannedProjects(plannedProjects);
@@ -68,11 +68,11 @@ public SysDashboard getDashboardData() {
if (tasks != null && !tasks.isEmpty()) {
// 根据任务状态分类
List ongoingTasks = tasks.stream()
- .filter(t -> "进行中".equals(t.getStatus()))
+ .filter(t -> "In Progress".equals(t.getStatus()))
.collect(Collectors.toList());
List completedTasks = tasks.stream()
- .filter(t -> "已完成".equals(t.getStatus()))
+ .filter(t -> "Completed".equals(t.getStatus()))
.collect(Collectors.toList());
sysDashboard.setOngoingTasks(ongoingTasks);
diff --git a/backend/ruoyi-admin/src/main/java/com/ruoyi/project/controller/SysProjectController.java b/backend/ruoyi-admin/src/main/java/com/ruoyi/project/controller/SysProjectController.java
index 882b094..2892abc 100644
--- a/backend/ruoyi-admin/src/main/java/com/ruoyi/project/controller/SysProjectController.java
+++ b/backend/ruoyi-admin/src/main/java/com/ruoyi/project/controller/SysProjectController.java
@@ -2,6 +2,7 @@
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.utils.SecurityUtils;
@@ -63,11 +64,14 @@ public TableDataInfo listMyProject(SysProject sysProject) {
startPage();
List projectIds = sysProjectMemberService
.selectSysProjectMemberByUserId(SecurityUtils.getUserId())
- .stream().map(SysProjectMember::getProjectId).toList();
+ .stream()
+ .map(SysProjectMember::getProjectId)
+ .collect(Collectors.toList());;
- List myProjectList = projectIds.stream()
+ List myProjectList = projectIds
+ .stream()
.map(projectId -> sysProjectService.selectSysProjectByProjectId(projectId))
- .toList();
+ .collect(Collectors.toList());;
return getDataTable(myProjectList);
}
@@ -93,10 +97,13 @@ public void exportMy(HttpServletResponse response, @RequestBody SysProject sysPr
public void export(HttpServletResponse response, @RequestBody SysProject sysProject) {
List projectIds = sysProjectMemberService
.selectSysProjectMemberByUserId(SecurityUtils.getUserId())
- .stream().map(SysProjectMember::getProjectId).toList();
- List myProjectList = projectIds.stream()
+ .stream()
+ .map(SysProjectMember::getProjectId)
+ .collect(Collectors.toList());;
+ List myProjectList = projectIds
+ .stream()
.map(projectId -> sysProjectService.selectSysProjectByProjectId(projectId))
- .toList();
+ .collect(Collectors.toList());;
ExcelUtil util = new ExcelUtil(SysProject.class);
util.exportExcel(response, myProjectList, "用户参与项目数据");