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