From 29c985b1ef625b5f2142852a28d1e57b6f0a700e Mon Sep 17 00:00:00 2001 From: WendyYang Date: Fri, 23 Aug 2024 14:30:08 +0800 Subject: [PATCH] =?UTF-8?q?modify:=201.=20=E4=BF=AE=E6=94=B9=E6=A0=87?= =?UTF-8?q?=E9=A1=B9=E6=95=B0=E6=8D=AE=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/projectdeclared/model/vo/PurchaseVO.java | 4 +-- .../pm/api/workbench/manage/WorkbenchManage.java | 30 ++++++++-------------- .../workbench/model/WorkbenchProjectLibReq.java | 5 +++- 3 files changed, 16 insertions(+), 23 deletions(-) diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/vo/PurchaseVO.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/vo/PurchaseVO.java index bf92149..9f6145d 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/vo/PurchaseVO.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/vo/PurchaseVO.java @@ -169,10 +169,10 @@ public class PurchaseVO { private BigDecimal bidPayAmount; @ApiModelProperty("采购时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm") + @JsonFormat(pattern = "yyyy-MM-dd") private LocalDate purchaseDate; @ApiModelProperty("是否发布信创云图") - public Boolean publishMhNotice; + private Boolean publishMhNotice; } diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/workbench/manage/WorkbenchManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/workbench/manage/WorkbenchManage.java index c6d4962..d389c9c 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/workbench/manage/WorkbenchManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/workbench/manage/WorkbenchManage.java @@ -278,9 +278,7 @@ public class WorkbenchManage { w -> { Set sourceNames = CollUtils.fieldSet(w, ProjectGovSystemReplaceInfos::getSourceSystem); Set targetNames = CollUtils.fieldSet(w, ProjectGovSystemReplaceInfos::getTargetSystem); - int targetCount = CollUtil.count(targetNames, isValidSystem::test); - int sourceCount = CollUtil.count(sourceNames, isValidSystem::test); - return Pair.create(sourceCount, targetCount); + return Pair.create(sourceNames.size(), targetNames.size()); }))).values(); int totalTargetCount = 0; int totalSourceCount = 0; @@ -534,11 +532,13 @@ public class WorkbenchManage { // 下达金额 .ge(req.getApproveAmountMin() != null, Project::getApprovalAmount, req.getApproveAmountMin()) .ge(req.getApproveAmountMax() != null, Project::getApprovalAmount, req.getApproveAmountMax()) + .eq(req.getUnitStrip() != null, Project::getUnitStrip, req.getUnitStrip()) + .eq(Project::getStage, ProjectStatus.STOPPED.getCode()) .eq(Project::getNewest, Boolean.TRUE) .orderByDesc(Project::getUpdateOn); + projectQueryByProjectStatusChange(query, ProjectStateChangeEvent.PROJECT_APPLICATION_SUBMIT); switch (req.getProcessNode()) { case PROJECT_DECLARED: - projectQueryByProjectStatusChange(query, ProjectStateChangeEvent.COMPLIANCE_REVIEW_PASS); break; case PROJECT_REVIEW: projectQueryByProjectStatusChange(query, ProjectStateChangeEvent.PROJECT_REVIEW_PASS); @@ -547,29 +547,19 @@ public class WorkbenchManage { query.isNotNull(Project::getApprovalAmount).gt(Project::getApprovalAmount, BigDecimal.ZERO); break; case PROJECT_APPROVAL: - projectQueryByProjectStatusChange(query, ProjectStateChangeEvent.DECLARED_RECORD_PASS); + projectQueryByProjectStatusChange(query, ProjectStateChangeEvent.DECLARED_RECORD_SUBMIT); break; case PROJECT_PURCHASE: - projectQueryByProjectStatusChange(query, ProjectStateChangeEvent.SUBMIT_PURCHASE_NOTICE); - break; - case PROJECT_ADAPTION: - projectQueryByPurchaseStatusChange(query, AdaptStateChangeEvent.ADAPT_INFO_PASSED); - break; - case SYSTEM_SELF_TEST: - projectQueryByPurchaseStatusChange(query, SelfTestStateChangeEvent.SELF_TEST_PASSED); - break; - case SYSTEM_TEST_VALID: - projectQueryByPurchaseStatusChange(query, TestValidStateChangeEvent.TEST_VALID_INFO_PASSED); + projectQueryByProjectStatusChange(query, ProjectStateChangeEvent.SUBMIT_PURCHASE_CONTRACT_RECORD); break; case FIRST_INSPECTED: - case PILOT_RUNNING: - projectQueryByPurchaseStatusChange(query, TenderStateChangeEvent.SUBMIT_FIRST_INSPECTED_FILES); + projectQueryByProjectStatusChange(query, ProjectStateChangeEvent.SUBMIT_FIRST_INSPECTED_FILES); break; - case XCFHX_REVIEW: - projectQueryByPurchaseStatusChange(query, XcfhxStateChangeEvent.XCFHX_APPLY_PASSED); + case PROJECT_ADAPTION: + projectQueryByProjectStatusChange(query, ProjectStateChangeEvent.SUBMIT_PURCHASE_ORG_CONFIRM); break; case FINAL_INSPECTED: - projectQueryByPurchaseStatusChange(query, TenderStateChangeEvent.FINALLY_INSPECTED_PASSED); + projectQueryByProjectStatusChange(query, ProjectStateChangeEvent.FINAL_ACCEPTANCE_PASS); break; default: return PageVo.empty(); diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/workbench/model/WorkbenchProjectLibReq.java b/hz-pm-api/src/main/java/com/hz/pm/api/workbench/model/WorkbenchProjectLibReq.java index 198b827..b078bc0 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/workbench/model/WorkbenchProjectLibReq.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/workbench/model/WorkbenchProjectLibReq.java @@ -24,11 +24,14 @@ public class WorkbenchProjectLibReq extends PagePo { @ApiModelProperty("单位ID") private Long unitId; + @ApiModelProperty("所属领域") + private Integer unitStrip; + @ApiModelProperty("项目年度") private Integer projectYear; @ApiModelProperty("项目阶段") - private ProcessNode processNode; + private WorkbenchProcessNode processNode; @ApiModelProperty("项目名称") private String projectName;