From e76243e8ad7466983463acdbc0c6dcaa73a2c801 Mon Sep 17 00:00:00 2001 From: WendyYang Date: Sat, 2 Mar 2024 14:18:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=A1=E5=88=9B=E7=AC=A6=E5=90=88=E6=80=A7?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hz/pm/api/common/statemachine/action/TenderAction.java | 11 +++++++++++ .../builder/impl/TenderStateMachineBuilderImpl.java | 5 +++++ .../common/statemachine/event/TenderStatusChangeEvent.java | 4 ++++ .../hz/pm/api/performance/manage/OrgSelfAppraisalManage.java | 4 ++-- .../hz/pm/api/projectdeclared/manage/ConstructionManage.java | 3 ++- .../api/projectlib/model/enumeration/ProjectStatusEnum.java | 2 +- 6 files changed, 25 insertions(+), 4 deletions(-) diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/TenderAction.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/TenderAction.java index 782eb9a..fe18296 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/TenderAction.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/TenderAction.java @@ -107,6 +107,17 @@ public class TenderAction { } /** + * 重新提交信创符合性申请 + * + * @param message \ + */ + @OnTransition(source = "XCFHX_APPLY_FAILED", target = "ON_XCFHX_APPLY") + public void RESUBMIT_XCFHX_APPLY(Message message) { + Purchase purchase = getPurchaseInfo(message); + purchase.setStatus(TenderStatusEnum.ON_XCFHX_APPLY.getTenderStatus()); + } + + /** * 终验申报 * * @param message \ diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/impl/TenderStateMachineBuilderImpl.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/impl/TenderStateMachineBuilderImpl.java index c1d99ee..df8c250 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/impl/TenderStateMachineBuilderImpl.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/impl/TenderStateMachineBuilderImpl.java @@ -98,6 +98,11 @@ public class TenderStateMachineBuilderImpl implements TenderStateMachineBuilder .source(TenderStatusEnum.TO_BE_SUBMIT_XCFHX_APPLY) .target(TenderStatusEnum.ON_XCFHX_APPLY) .event(TenderStatusChangeEvent.SUBMIT_XCFHX_APPLY) + .and()// 信创符合性申请 + .withExternal() + .source(TenderStatusEnum.XCFHX_APPLY_FAILED) + .target(TenderStatusEnum.ON_XCFHX_APPLY) + .event(TenderStatusChangeEvent.RESUBMIT_XCFHX_APPLY) .and() // 信创符合性申请通过 .withExternal() diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/event/TenderStatusChangeEvent.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/event/TenderStatusChangeEvent.java index 4640242..3f56b34 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/event/TenderStatusChangeEvent.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/event/TenderStatusChangeEvent.java @@ -38,6 +38,10 @@ public enum TenderStatusChangeEvent { */ SUBMIT_XCFHX_APPLY(301, null, null), /** + * 信创符合性重新申请 + */ + RESUBMIT_XCFHX_APPLY(303, null, null), + /** * 信创符合性申请通过 */ XCFHX_APPLY_PASSED(302, null, null), diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/performance/manage/OrgSelfAppraisalManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/performance/manage/OrgSelfAppraisalManage.java index ceda0d8..4371951 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/performance/manage/OrgSelfAppraisalManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/performance/manage/OrgSelfAppraisalManage.java @@ -82,8 +82,8 @@ public class OrgSelfAppraisalManage { /** * 绩效列表 * - * @param req - * @return + * @param req \ + * @return \ */ public PageVo list(PerformanceAppraisalListReq req) { UserInfoDetails user = LoginUserUtil.loginUserDetail(); diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/ConstructionManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/ConstructionManage.java index dd5fe79..2c9132f 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/ConstructionManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/ConstructionManage.java @@ -642,7 +642,8 @@ public class ConstructionManage { @Transactional(rollbackFor = Exception.class) public void submitXcfhxApply(XcfhxApplyReq req) { Purchase purchase = purchaseService.getById(req.getBidId()); - if (!TenderStatusEnum.TO_BE_SUBMIT_XCFHX_APPLY.eq(purchase.getStatus())) { + if (!TenderStatusEnum.TO_BE_SUBMIT_XCFHX_APPLY.eq(purchase.getStatus()) + && !TenderStatusEnum.XCFHX_APPLY_FAILED.eq(purchase.getStatus())) { throw BizException.wrap("该标段不支持提交信创符合性申请"); } diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/enumeration/ProjectStatusEnum.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/enumeration/ProjectStatusEnum.java index 9ce1ed5..7c78d71 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/enumeration/ProjectStatusEnum.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/enumeration/ProjectStatusEnum.java @@ -101,7 +101,7 @@ public enum ProjectStatusEnum { return null; } - public boolean eq(int code) { + public boolean eq(Integer code) { return this.getCode().equals(code); }