modify:

1. 增加已完成采购的服务类项目数量;

hz-pm-api/src/main/java/com/hz/pm/api/workbench/manage/WorkbenchManage.java

@@ -32,6 +32,7 @@ import com.hz.pm.api.projectlib.model.entity.Project;
 import com.hz.pm.api.projectlib.model.entity.ProjectStatusChange;
 import com.hz.pm.api.projectlib.model.enumeration.GovSystemReplaceTypeEnum;
 import com.hz.pm.api.projectlib.model.enumeration.status.ProjectStatus;
+import com.hz.pm.api.projectlib.model.enumeration.status.TenderMainStatus;
 import com.hz.pm.api.projectlib.model.req.ProjectListReq;
 import com.hz.pm.api.projectlib.model.vo.ProjectLibListItemVO;
 import com.hz.pm.api.projectlib.model.vo.SystemReplaceInfoVO;
@@ -459,6 +460,7 @@ public class WorkbenchManage {
                         currStat.setTargetCount(replaceSystemCount.getValue());
                         List<String> projectCodes = CollUtils.convert(projectIds, ProjectIdCodeCacheUtil::get);
                         Map<Long, Long> submitPurcahseRecordMap = purchaseEventMap.get(TenderStateChangeEvent.SUBMIT_PURCHASE_CONSTRUCTION_INFO.name());
+
                         if (submitPurcahseRecordMap != null) {
                             List<Long> tmpProjectIds = submitPurcahseRecordMap.entrySet().stream()
                                     .filter(w -> w.getValue() > 0)
@@ -468,6 +470,17 @@ public class WorkbenchManage {
                                 currStat.setAdaptFinishStat(tenderAdaptStatistics(tmpProjectIds));
                             }
                         }
+                        long finishPurchaseByWithoutApp = CollUtil.count(projectPurchaseCountMap.entrySet(), w -> {
+                            List<Purchase> purchases = w.getValue();
+                            return CollUtil.allMatch(purchases, x -> !BidTypeEnum.BUILD_APP.eq(x.getBidType()))
+                                    && CollUtil.allMatch(purchases, x -> TenderMainStatus.FINALLY_INSPECTED_PASSED.eq(x.getStatus()));
+                        });
+                        TenderAdaptFinishStatVO adaptFinishStat = currStat.getAdaptFinishStat();
+                        if (adaptFinishStat == null) {
+                            currStat.setAdaptFinishStat(new TenderAdaptFinishStatVO());
+                            adaptFinishStat = currStat.getAdaptFinishStat();
+                        }
+                        adaptFinishStat.setFinishPurchaseCountWithoutApp(finishPurchaseByWithoutApp);
                         currStat.setStoppedCount(stoppedProjectCount(projectStatusChangeMap, projectCodes));
                     }
                     break;

hz-pm-api/src/main/java/com/hz/pm/api/workbench/model/vo/ProjectProcessStatVO.java

@@ -57,6 +57,9 @@ public class ProjectProcessStatVO {
         @ApiModelProperty("单位确认")
         private Integer finishOrgConfirmCount;
 
+        @ApiModelProperty("已完成采购的服务类项目数量")
+        private Long finishPurchaseCountWithoutApp;
+
     }
 
 }