From 20b4e20900f699c715829dffa31a53ded2f4365d Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Thu, 16 Feb 2023 15:07:30 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=AD=E5=BB=BA=E9=A1=B9=E7=9B=AE=E9=87=91?= =?UTF-8?q?=E9=A2=9D=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../statemachine/action/ProjectDeclareAction.java | 2 +- .../event/ProjectStatusChangeEvent.java | 2 +- .../manage/ConstructionPlanManage.java | 2 +- .../projectlib/enumeration/ProjectStatusEnum.java | 3 ++- .../manage/ProjectRenewalFundManage.java | 20 +++++++++++++--- .../ningdatech/pmapi/instance/InstanceTest.java | 28 ++++++++++++++++++++++ .../pmapi/statemachine/StateMachineTest.java | 5 +++- 7 files changed, 54 insertions(+), 8 deletions(-) create mode 100644 pmapi/src/test/java/com/ningdatech/pmapi/instance/InstanceTest.java diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/action/ProjectDeclareAction.java b/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/action/ProjectDeclareAction.java index 5405fa4..8176cdb 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/action/ProjectDeclareAction.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/action/ProjectDeclareAction.java @@ -226,7 +226,7 @@ public class ProjectDeclareAction { Project project = (Project) message.getHeaders().get(PROJECT_DECLARE); // 终验审核通过后，项目一级状态变更为已归档 project.setStage(ProjectStatusEnum.ARCHIVED.getCode()); - project.setStatus(ProjectStatusEnum.ARCHIVED.getCode()); + project.setStatus(ProjectStatusEnum.ACCEPTED.getCode()); } @OnTransition(source = "FINAL_ACCEPTANCE_IS_UNDER_REVIEW", target = "FINAL_ACCEPTANCE_REVIEW_FAILED") diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/event/ProjectStatusChangeEvent.java b/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/event/ProjectStatusChangeEvent.java index ff5574e..35febc2 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/event/ProjectStatusChangeEvent.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/event/ProjectStatusChangeEvent.java @@ -105,7 +105,7 @@ public enum ProjectStatusChangeEvent { /** * 终验审核通过(项目状态变为：已归档) */ - FINAL_ACCEPTANCE_PASS(null, null, null), + FINAL_ACCEPTANCE_PASS(20004, null, null), // 下个节点还未提交审核意见时，流程发起人和前一个审核人可以点击撤回 diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ConstructionPlanManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ConstructionPlanManage.java index 3f54677..ffc0bb1 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ConstructionPlanManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ConstructionPlanManage.java @@ -81,7 +81,7 @@ public class ConstructionPlanManage { //首先要判断 项目当前状态 是不是 方案待申报 VUtils.isTrue(!ProjectStatusEnum.PLAN_TO_BE_DECLARED.getCode().equals(projectInfo.getStatus()) || !ProjectStatusEnum.NOT_APPROVED.getCode().equals(projectInfo.getStage())) - .throwMessage("提交失败 该项目不是 待预审状态或者未立项阶段"); + .throwMessage("提交失败 该项目不是 方案待申报状态或者未立项阶段"); // TODO 再判断 该项目是否 真实走完 预审审批 ProcessStartParamsVo params = new ProcessStartParamsVo(); diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/enumeration/ProjectStatusEnum.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/enumeration/ProjectStatusEnum.java index dd2b85b..1353309 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/enumeration/ProjectStatusEnum.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/enumeration/ProjectStatusEnum.java @@ -54,7 +54,8 @@ public enum ProjectStatusEnum { /** * 项目阶段：已归档 */ - ARCHIVED(30000, "已归档"); + ARCHIVED(30000, "已归档"), + ACCEPTED(30001, "已验收"); private Integer code; private String desc; diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectRenewalFundManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectRenewalFundManage.java index acbf29d..6f60913 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectRenewalFundManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectRenewalFundManage.java @@ -1,9 +1,11 @@ package com.ningdatech.pmapi.projectlib.manage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ningdatech.basic.function.VUtils; import com.ningdatech.basic.model.PageVo; import com.ningdatech.basic.util.CollUtils; import com.ningdatech.pmapi.projectlib.enumeration.ProjectRenewalApprovalStatusEnum; +import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum; import com.ningdatech.pmapi.projectlib.model.dto.ProjectRenewalFundDeclarationDTO; import com.ningdatech.pmapi.projectlib.model.entity.Project; import com.ningdatech.pmapi.projectlib.model.entity.ProjectRenewalFundDeclaration; @@ -90,14 +92,26 @@ public class ProjectRenewalFundManage { * @return */ public Long declared(ProjectRenewalFundDeclarationDTO dto) { + //要判断 项目id 是否 以及状态是 已验收 + Long projectId = dto.getProjectId(); + Project project = projectService.getById(projectId); + VUtils.isTrue(Objects.isNull(project)).throwMessage(String.format("关联的项目【%s】不存在 提交失败!",projectId)); + VUtils.isTrue(!ProjectStatusEnum.ACCEPTED.getCode().equals(project.getStatus()) || + !ProjectStatusEnum.ARCHIVED.getCode().equals(project.getStage())) + .throwMessage("提交失败 该项目不是 已验收状态或者已归档阶段"); ProjectRenewalFundDeclaration declaration = new ProjectRenewalFundDeclaration(); + //如果是重新申报 + if(Objects.nonNull(dto.getId())){ + ProjectRenewalFundDeclaration oldDeclaration = projectRenewalFundDeclarationService.getById(dto.getId()); + VUtils.isTrue(Objects.isNull(oldDeclaration)).throwMessage(String.format("重新申报失败 【%s】 该申报不存在!",dto.getId())); + BeanUtils.copyProperties(oldDeclaration,declaration); + } BeanUtils.copyProperties(dto,declaration); - declaration.setId(null); declaration.setCreateOn(LocalDateTime.now()); declaration.setUpdateOn(LocalDateTime.now()); declaration.setApprovalStatus(ProjectRenewalApprovalStatusEnum.PENDING.name()); - if(!projectRenewalFundDeclarationService.save(declaration)){ - throw new BusinessException("申报失败"); + if(!projectRenewalFundDeclarationService.saveOrUpdate(declaration)){ + throw new BusinessException(String.format("申报失败 【%s】",dto.getId())); } return declaration.getId(); } diff --git a/pmapi/src/test/java/com/ningdatech/pmapi/instance/InstanceTest.java b/pmapi/src/test/java/com/ningdatech/pmapi/instance/InstanceTest.java new file mode 100644 index 0000000..61d2527 --- /dev/null +++ b/pmapi/src/test/java/com/ningdatech/pmapi/instance/InstanceTest.java @@ -0,0 +1,28 @@ +package com.ningdatech.pmapi.instance; + +import com.alibaba.fastjson.JSON; +import com.ningdatech.pmapi.AppTests; +import com.wflow.workflow.bean.dto.ProcessInstanceUserDto; +import org.flowable.engine.RuntimeService; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * @Classname InstanceTest + * @Description + * @Date 2023/2/16 14:44 + * @Author PoffyZhang + */ +public class InstanceTest extends AppTests { + + @Autowired + private RuntimeService runtimeService; + + @Test + public void test(){ + String instanceId = "896fa188-96d8-11ed-9539-e2d4e8f16b2f"; + Object user = runtimeService.getVariable(instanceId, + "owner"); + System.out.println(JSON.toJSONString(user)); + } +} diff --git a/pmapi/src/test/java/com/ningdatech/pmapi/statemachine/StateMachineTest.java b/pmapi/src/test/java/com/ningdatech/pmapi/statemachine/StateMachineTest.java index 1819a47..a6ccbcd 100644 --- a/pmapi/src/test/java/com/ningdatech/pmapi/statemachine/StateMachineTest.java +++ b/pmapi/src/test/java/com/ningdatech/pmapi/statemachine/StateMachineTest.java @@ -1,5 +1,6 @@ package com.ningdatech.pmapi.statemachine; +import com.alibaba.fastjson.JSON; import com.ningdatech.pmapi.AppTests; import com.ningdatech.pmapi.common.statemachine.util.StateMachineUtils; import com.ningdatech.pmapi.common.statemachine.event.ProjectStatusChangeEvent; @@ -24,9 +25,11 @@ public class StateMachineTest extends AppTests { @Test public void stateMachineTest() throws Exception { Project project = new Project(); - project.setStatus(ProjectStatusEnum.PENDING_PREQUALIFICATION.getCode()); + project.setStage(ProjectStatusEnum.PROJECT_APPROVED.getCode()); + project.setStatus(ProjectStatusEnum.FINAL_ACCEPTANCE_IS_UNDER_REVIEW.getCode()); project.setDeclareAmount(BigDecimal.valueOf(2000)); // stateMachineUtils.execute(project, ProjectStatusChangeEvent.UNDER_INTERNAL_PASS); stateMachineUtils.execute(project, stateMachineUtils.getProjectStatusPassEvent(project.getStatus())); + System.out.println(String.format("project:%s", JSON.toJSONString(project))); } }