diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/enums/ProcessTypeEnum.java b/laws-modules/src/main/java/com/jero/modules/activiti/enums/ProcessTypeEnum.java index 87f436c8..e3b3b67b 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/enums/ProcessTypeEnum.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/enums/ProcessTypeEnum.java @@ -20,7 +20,8 @@ public enum ProcessTypeEnum { ANNUAL_INIT("企业标准年度制修订计划流程", 7, "com.jero.modules.activiti.process.annualinit.service.ProcessAnnualInitService","/workCenter/ESAnnualRevisionPlanProcess","/workCenter/ESAnnualRevisionPlanProcess"), DOMESTIC_VEHICLE_CONTROL_PUBLISH("国内整车型号和VIN前八位管控流程", 8, "com.jero.modules.activiti.process.vehicledomestic.service.impl.ProcessVehicleDomesticReleaseServiceImpl","/workCenter/VehicleDomesticReleaseProcess","/workCenter/VehicleDomesticReleaseProcess"), PLAN_CHANGE("企业标准计划变更流程", 9, "com.jero.modules.activiti.process.planchange.service.ProcessPlanChangeService","/workCenter/enterpriseStandardRevision/enterpriseStandardRevisionFlow","/workCenter/enterpriseStandardRevision"), - INTERNATIONAL_VEHICLE_CONTROL_PUBLISH("国际整车型号和VIN前八位管控流程", 10, "com.jero.modules.activiti.process.vehicleinternational.service.impl.ProcessVehicleDomesticReleaseServiceImpl","/workCenter/VehicleInternationalReleaseProcess","/workCenter/VehicleInternationalReleaseProcess") + INTERNATIONAL_VEHICLE_CONTROL_PUBLISH("国际整车型号和VIN前八位管控流程", 10, "com.jero.modules.activiti.process.vehicleinternational.service.impl.ProcessVehicleDomesticReleaseServiceImpl","/workCenter/VehicleInternationalReleaseProcess","/workCenter/VehicleInternationalReleaseProcess"), + PART_TYPE_APPLY("关键零部件型号申请流程", 11, "com.jero.modules.activiti.process.part.service.impl.ProcessPartTypeApplyServiceImpl","/workCenter/KeyComponentModelRequestProcess","/workCenter/KeyComponentModelRequestProcess") ; private final String name; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/enums/ProcessType.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/enums/ProcessType.java index 6e68d5b2..164169fc 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/enums/ProcessType.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/enums/ProcessType.java @@ -20,7 +20,8 @@ public enum ProcessType { ANNUAL_INIT("企业标准年度制修订计划流程", "7", "process-annual-init", "ProcessAnnualInitService"), DOMESTIC_VEHICLE_CONTROL_PUBLISH("国内整车型号和VIN前八位管控流程", "8", "domestic_vehicle_control_publish", "ProcessVehicleDomesticReleaseServiceImpl"), PLAN_CHANGE("企业标准计划变更流程", "9", "process-plan-change", "ProcessPlanChangeService"), - INTERNATIONAL_VEHICLE_CONTROL_PUBLISH("国际整车型号和VIN前八位管控流程", "10", "international_vehicle_control_publish", "ProcessVehicleInternationalReleaseServiceImpl") + INTERNATIONAL_VEHICLE_CONTROL_PUBLISH("国际整车型号和VIN前八位管控流程", "10", "international_vehicle_control_publish", "ProcessVehicleInternationalReleaseServiceImpl"), + PART_TYPE_APPLY("关键零部件型号申请流程", "11", "part_type_apply","ProcessPartTypeApplyServiceImpl") ; private final String name; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/part/controller/ProcessPartTypeApplyController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/part/controller/ProcessPartTypeApplyController.java index b3d7213b..8bdd0d26 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/part/controller/ProcessPartTypeApplyController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/part/controller/ProcessPartTypeApplyController.java @@ -79,7 +79,7 @@ public class ProcessPartTypeApplyController extends JeroController handle(@PathVariable("taskId") String taskId) { - ProcessDraft draft = actFlowCommonService.getExistDraftByTaskId(taskId, ProcessTypeEnum.NEW_STANDARD_IMPORT); + ProcessDraft draft = actFlowCommonService.getExistDraftByTaskId(taskId, ProcessTypeEnum.PART_TYPE_APPLY); if (draft != null) { return Result.OK(draft); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/part/service/impl/ProcessPartTypeApplyServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/part/service/impl/ProcessPartTypeApplyServiceImpl.java index 259a3261..08dcc94d 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/part/service/impl/ProcessPartTypeApplyServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/part/service/impl/ProcessPartTypeApplyServiceImpl.java @@ -81,7 +81,7 @@ public class ProcessPartTypeApplyServiceImpl extends ServiceImpl processInfoVO) { // 流程Key - String processDefinitionKey = ProcessType.NEW_STANDARD_IMPORT.getProcessKey(); + String processDefinitionKey = ProcessType.PART_TYPE_APPLY.getProcessKey(); // 流程信息 BasicProcessInfoDTO processInfo = processInfoVO.getBasicProcessInfoDTO(); // 任务信息 @@ -103,7 +103,7 @@ public class ProcessPartTypeApplyServiceImpl extends ServiceImpl