Browse Source

feat:

1. 待办统计不包含已终止的;
tags/25012001
climba 1 month ago
parent
commit
3d3cd7274e
1 changed files with 6 additions and 2 deletions
  1. +6
    -2
      hz-pm-api/src/main/java/com/hz/pm/api/workbench/manage/WorkbenchManage.java

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

@@ -353,6 +353,10 @@ public class WorkbenchManage {
Map<Long, List<Purchase>> projectPurchaseMap) { Map<Long, List<Purchase>> projectPurchaseMap) {
return CollUtil.count(projectStatusChanges.entrySet(), w -> { return CollUtil.count(projectStatusChanges.entrySet(), w -> {
List<ProjectStatusChange> changes = w.getValue(); List<ProjectStatusChange> changes = w.getValue();
if (CollUtil.anyMatch(changes, w1 -> ProjectStateChangeEvent.STOPPED_APPLY_PASS.eq(w1.getEvent())
|| ProjectStateChangeEvent.STOPPED_APPLY_AUTO_PASS.eq(w1.getEvent()))) {
return false;
}
if (startEvent.equals(ProjectStateChangeEvent.SUBMIT_PURCHASE_CONTRACT_RECORD)) { if (startEvent.equals(ProjectStateChangeEvent.SUBMIT_PURCHASE_CONTRACT_RECORD)) {
Long projectId = ProjectIdCodeCacheUtil.newest(w.getKey()); Long projectId = ProjectIdCodeCacheUtil.newest(w.getKey());
List<Purchase> purchases = projectPurchaseMap.getOrDefault(projectId, Collections.emptyList()); List<Purchase> purchases = projectPurchaseMap.getOrDefault(projectId, Collections.emptyList());
@@ -434,7 +438,7 @@ public class WorkbenchManage {
currStat.setReviewingCount(reviewing); currStat.setReviewingCount(reviewing);
currStat.setReviewFailedCount(reviewFailed); currStat.setReviewFailedCount(reviewFailed);
currStat.setPendingCount(processNodeNotFinishedCount(projectStatusChangeMap, currStat.setPendingCount(processNodeNotFinishedCount(projectStatusChangeMap,
ProjectStateChangeEvent.COMPLIANCE_REVIEW_PASS, ProjectStateChangeEvent.PROJECT_REVIEW_PASS,
ProjectStateChangeEvent.PROJECT_APPLICATION_SUBMIT, ProjectStateChangeEvent.PROJECT_REVIEW_PASS,
projectPurchaseCountMap)); projectPurchaseCountMap));
} }
break; break;
@@ -672,7 +676,7 @@ public class WorkbenchManage {
break; break;
case PROJECT_REVIEW: case PROJECT_REVIEW:
projectProcessNodeFinishedQuery(query, req.getProcessNodeFinished(), projectProcessNodeFinishedQuery(query, req.getProcessNodeFinished(),
ProjectStateChangeEvent.COMPLIANCE_REVIEW_PASS, ProjectStateChangeEvent.PROJECT_REVIEW_PASS);
ProjectStateChangeEvent.PROJECT_APPLICATION_SUBMIT, ProjectStateChangeEvent.PROJECT_REVIEW_PASS);
break; break;
case APPROVAL_AMOUNT: case APPROVAL_AMOUNT:
if (Boolean.FALSE.equals(req.getProcessNodeFinished())) { if (Boolean.FALSE.equals(req.getProcessNodeFinished())) {


Loading…
Cancel
Save