From 9608833093007c4c6bdcd1bd13c497c07b53a201 Mon Sep 17 00:00:00 2001 From: WendyYang Date: Wed, 13 Nov 2024 14:34:47 +0800 Subject: [PATCH] =?UTF-8?q?feat:=201.=20=E9=A1=B9=E7=9B=AE=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E8=BF=9B=E5=BA=A6=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=9B=202.=20=E6=A0=87=E9=A1=B9=E7=8A=B6=E6=80=81=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=E4=BA=8B=E4=BB=B6=E4=BF=AE=E6=94=B9=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/statemachine/event/TenderStateChangeEvent.java | 15 +++++++++++++-- .../java/com/hz/pm/api/meeting/manage/MeetingManage.java | 2 +- .../hz/pm/api/projectdeclared/manage/PurchaseManage.java | 7 ++++--- .../pm/api/projectlib/handle/AbstractProcessHandle.java | 2 +- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/event/TenderStateChangeEvent.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/event/TenderStateChangeEvent.java index 711ec86..343c3f9 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/event/TenderStateChangeEvent.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/event/TenderStateChangeEvent.java @@ -15,11 +15,22 @@ import lombok.Getter; @AllArgsConstructor public enum TenderStateChangeEvent implements AbstractStateChangeEvent { - + /** + * 增加标项 + */ SUBMIT_PURCHASE_NOTICE(100, null, null), + /** + * 增加标项重新提交 + */ RESUBMIT_PURCHASE_NOTICE(108, null, null), + /** + * 增加标项通过 + */ PURCHASE_NOTICE_PASSED(107, null, null), - PURCHASE_NOTICE_FAILED(null, 108, null), + /** + * 增加标项不通过 + */ + PURCHASE_NOTICE_FAILED(null, 107, null), /** * 填写采购&合同信息 */ diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/meeting/manage/MeetingManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/meeting/manage/MeetingManage.java index e8280b9..26b35a7 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/meeting/manage/MeetingManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/meeting/manage/MeetingManage.java @@ -150,7 +150,7 @@ public class MeetingManage { throw ReturnException.wrap("会议正在创建中"); } try { - UserInfoDetails userDetail = LoginUserUtil.userDetail(); + UserInfoDetails userDetail = LoginUserUtil.userDetailNotNull(); ExpertInviteReq inviteRule = req.getExpertInviteRule(); // 保存会议基本信息 Meeting meeting = BeanUtil.copyProperties(meetingBasic, Meeting.class); diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/PurchaseManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/PurchaseManage.java index 16215a5..95020ec 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/PurchaseManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/PurchaseManage.java @@ -526,6 +526,7 @@ public class PurchaseManage { purchase.setPurchaseDate(w.getPurchaseDate()); purchase.setBidPayAmount(w.getBidPayAmount()); purchase.setPublishMhNotice(w.getPublishMhNotice()); + purchase.setId(w.getBidId()); if (w.getBidId() == null) { purchase.setCreateBy(user.getUserIdStr()); } @@ -861,7 +862,7 @@ public class PurchaseManage { throw BizException.wrap("该状态下不支持提交测试验证信息"); } }); - UserInfoDetails user = LoginUserUtil.userDetail(); + UserInfoDetails user = LoginUserUtil.userDetailNotNull(); ProjectProcessType instType = ProjectProcessType.TEST_VALID; WflowModels model = processModelManage.getWflowModelsNoNull(instType, user.getMhUnitId()); LocalDateTime now = LocalDateTime.now(); @@ -926,7 +927,7 @@ public class PurchaseManage { throw BizException.wrap("该状态下不支持提交系统自测信息"); } } - UserInfoDetails user = LoginUserUtil.userDetail(); + UserInfoDetails user = LoginUserUtil.userDetailNotNull(); ProjectProcessType instType = ProjectProcessType.SELF_TEST; WflowModels model = processModelManage.getWflowModelsNoNull(instType, user.getMhUnitId()); @@ -974,7 +975,7 @@ public class PurchaseManage { throw BizException.wrap("该状态下不支持提交适配改造信息"); } } - UserInfoDetails user = LoginUserUtil.userDetail(); + UserInfoDetails user = LoginUserUtil.userDetailNotNull(); ProjectProcessType instType = ProjectProcessType.ADAPTION; WflowModels model = processModelManage.getWflowModelsNoNull(instType, user.getMhUnitId()); Long projectId = purchases.get(0).getProjectId(); diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/handle/AbstractProcessHandle.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/handle/AbstractProcessHandle.java index f8dc59c..cfcf84d 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/handle/AbstractProcessHandle.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/handle/AbstractProcessHandle.java @@ -37,7 +37,7 @@ public abstract class AbstractProcessHandle implements Ordered, ProcessHandle { PROJECT_DECLARED("项目申报", 0), COMPLIANCE_REVIEW("合规性审查", 1), - PROJECT_REVIEW("项目复核", 2), + PROJECT_REVIEW("项目评审", 2), APPROVAL_AMOUNT("资金下达", 3), PROJECT_APPROVAL("项目立项", 4), PROJECT_PURCHASE("招标采购", 5),