瀏覽代碼

modify:

1. 过程管理角标提醒修改;
tags/24110601
WendyYang 4 月之前
父節點
當前提交
931d7f1259
共有 2 個檔案被更改,包括 3 行新增2 行删除
  1. +1
    -1
      hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/ProjectReviewManage.java
  2. +2
    -1
      hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/ProjectManageTodoCountManage.java

+ 1
- 1
hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/ProjectReviewManage.java 查看文件

@@ -249,7 +249,7 @@ public class ProjectReviewManage {
});
return ReviewProgressStatisticsVO.builder()
.totalCount(projects.size())
.withoutConstructionPlanSealFileCount(CollUtil.count(projects, w -> StrUtil.isNotBlank(w.getConstructionPlanSealFile())))
.withoutConstructionPlanSealFileCount(CollUtil.count(projects, w -> StrUtil.isBlank(w.getConstructionPlanSealFile())))
.todoCount(countMap.getOrDefault(ProjectStatus.WITHOUT_EXPERT_REVIEW, 0L))
.auditCount(countMap.getOrDefault(ProjectStatus.ON_EXPERT_REVIEW, 0L))
.passedCount(countMap.getOrDefault(ProjectStatus.EXPERT_REVIEW_PASSED, 0L))


+ 2
- 1
hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/ProjectManageTodoCountManage.java 查看文件

@@ -75,7 +75,8 @@ public class ProjectManageTodoCountManage {
futures.add(CompletableFuture.runAsync(() -> {
// 招标采购
PurchaseProgressStatVO purchaseStat = purchaseManage.purchaseProgressStatistics(new ProjectListReq());
todoCount.setProjectPurchase(sum(purchaseStat, PurchaseProgressStatVO::getToBePurchaseCount));
todoCount.setProjectPurchase(sum(purchaseStat, PurchaseProgressStatVO::getToBePurchaseCount,
PurchaseProgressStatVO::getOnPurchaseCount));
// 适配改造
AdaptionProgressStatVO adaptionStat = purchaseManage.adaptionProgressStatistics(new PurchaseAdaptionListReq());
todoCount.setProjectAdaption(sum(adaptionStat, AdaptionProgressStatVO::getWithoutOperationCount,


Loading…
取消
儲存