Browse Source

项目列表修改

tags/24080901
WendyYang 7 months ago
parent
commit
c007a4b6d9
1 changed files with 3 additions and 7 deletions
  1. +3
    -7
      hz-pm-api/src/main/java/com/hz/pm/api/workbench/manage/WorkbenchManage.java

+ 3
- 7
hz-pm-api/src/main/java/com/hz/pm/api/workbench/manage/WorkbenchManage.java View File

@@ -92,7 +92,6 @@ public class WorkbenchManage {
WorkbenchVO res = new WorkbenchVO();
Long userId = LoginUserUtil.getUserId();
UserFullInfoDTO user = userInfoHelper.getUserFullInfo(userId);

CompletableFuture.allOf(
CompletableFuture.runAsync(() -> {
StopWatch stopWatch = new StopWatch();
@@ -115,7 +114,6 @@ public class WorkbenchManage {
CompletableFuture.runAsync(() -> {
StopWatch stopWatch = new StopWatch();
stopWatch.start();

//2.项目统计数据
res.setOrgDeclared(WorkbenchConverter.convert(defaultDeclaredProjectManage.declaredProjectOrgStatistics(year, user),
defaultDeclaredProjectManage.declaredProjectOrgStatistics(year - 1, user)));
@@ -131,10 +129,9 @@ public class WorkbenchManage {
CompletableFuture.runAsync(() -> {
StopWatch stopWatch = new StopWatch();
stopWatch.start();

//3.所有公告按类型分
NoticeListReq noticeListReq = new NoticeListReq();
noticeListReq.page(1, 1000);
noticeListReq.page(1, 20);
res.setNoticeList(noticeManage.listToMapByManager(noticeListReq, user));
stopWatch.stop();
log.info("公告 耗时,{} s", stopWatch.getTotalTimeSeconds());
@@ -150,13 +147,12 @@ public class WorkbenchManage {
CompletableFuture.runAsync(() -> {
StopWatch stopWatch = new StopWatch();
stopWatch.start();

// 项目列表
ProjectListReq projectListReq = new ProjectListReq();
projectListReq.page(1, 2000);
projectListReq.page(1, 20);
projectListReq.setProjectYear(year);
res.setProjects(new ArrayList<>(projectLibManage.listWithPermissionWorkBench(projectListReq, user).getRecords()));
log.info("工作台 项目列表 耗时,{} s", stopWatch.getTotalTimeSeconds());
log.info("项目列表 耗时,{} s", stopWatch.getTotalTimeSeconds());
}, ForkJoinPool.commonPool())
).join();



Loading…
Cancel
Save