diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectAcceptanceServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectAcceptanceServiceImpl.java index 22f38a15..b95e23ea 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectAcceptanceServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectAcceptanceServiceImpl.java @@ -357,6 +357,9 @@ public class ErpProjectAcceptanceServiceImpl implements IErpProjectAcceptanceSer } else if (Objects.equals(processEvent.getStatus(), BusinessStatusEnum.INVALID.getStatus()) || Objects.equals(processEvent.getStatus(), BusinessStatusEnum.TERMINATION.getStatus())) { acceptance.setAcceptanceStatus(OAStatusEnum.INVALID.getStatus()); + }else if (Objects.equals(processEvent.getStatus(), BusinessStatusEnum.BACK.getStatus())) { + // 流程驳回:业务状态还原为草稿,允许重新编辑和提交 + acceptance.setAcceptanceStatus(OAStatusEnum.DRAFT.getStatus()); } baseMapper.updateById(acceptance); } diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectChangeServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectChangeServiceImpl.java index 07c5e1a1..9c7759f1 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectChangeServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectChangeServiceImpl.java @@ -661,7 +661,14 @@ public class ErpProjectChangeServiceImpl implements IErpProjectChangeService { String handler = Convert.toStr(params.get("handler")); } if (Objects.equals(processEvent.getStatus(), BusinessStatusEnum.FINISH.getStatus())){ + // 流程完成:业务状态置为可用 projectChange.setProjectChangeStatus(OAStatusEnum.COMPLETED.getStatus()); + } else if (Objects.equals(processEvent.getStatus(), BusinessStatusEnum.INVALID.getStatus())) { + // 流程作废:业务状态置为作废 + projectChange.setProjectChangeStatus(OAStatusEnum.INVALID.getStatus()); + } else if (Objects.equals(processEvent.getStatus(), BusinessStatusEnum.BACK.getStatus())) { + // 流程驳回:业务状态还原为草稿,允许重新编辑和提交 + projectChange.setProjectChangeStatus(OAStatusEnum.DRAFT.getStatus()); } baseMapper.updateById(projectChange); }); diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectPlanServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectPlanServiceImpl.java index f2a5c3e7..6c9e6555 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectPlanServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectPlanServiceImpl.java @@ -371,6 +371,11 @@ public class ErpProjectPlanServiceImpl implements IErpProjectPlanService { } if (Objects.equals(processEvent.getStatus(), BusinessStatusEnum.FINISH.getStatus())) { projectPlan.setProjectPlanStatus(OAStatusEnum.COMPLETED.getStatus()); + }else if (Objects.equals(processEvent.getStatus(), BusinessStatusEnum.INVALID.getStatus())) { + projectPlan.setProjectPlanStatus(OAStatusEnum.INVALID.getStatus()); + }else if (Objects.equals(processEvent.getStatus(), BusinessStatusEnum.BACK.getStatus())) { + // 流程驳回:业务状态还原为草稿,允许重新编辑和提交 + projectPlan.setProjectPlanStatus(OAStatusEnum.DRAFT.getStatus()); } baseMapper.updateById(projectPlan); }); diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectReceivingServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectReceivingServiceImpl.java index 08fa24ab..5d0509d7 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectReceivingServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectReceivingServiceImpl.java @@ -352,6 +352,9 @@ public class ErpProjectReceivingServiceImpl implements IErpProjectReceivingServi } else if (Objects.equals(processEvent.getStatus(), BusinessStatusEnum.INVALID.getStatus()) || Objects.equals(processEvent.getStatus(), BusinessStatusEnum.TERMINATION.getStatus())) { receiving.setReceivingStatus(OAStatusEnum.INVALID.getStatus()); + }else if (Objects.equals(processEvent.getStatus(), BusinessStatusEnum.BACK.getStatus())) { + // 流程驳回:业务状态还原为草稿,允许重新编辑和提交 + receiving.setReceivingStatus(OAStatusEnum.DRAFT.getStatus()); } baseMapper.updateById(receiving); }