diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java index ac20b898..63fdec41 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java @@ -12,6 +12,8 @@ import com.jero.modules.activiti.enums.ProcessTypeEnum; import com.jero.modules.activiti.process.common.entity.CommonVO; import com.jero.modules.activiti.process.common.enums.ProcessType; import com.jero.modules.activiti.process.common.service.ActFlowCommonService; +import com.jero.modules.activiti.process.esInitChange.entity.ProcessEsInitChange; +import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPRevisionType; import com.jero.modules.activiti.process.esRevision.entity.vo.InspectContentVO; import com.jero.modules.activiti.process.esRevision.entity.vo.OtherDraftUserVO; import com.jero.modules.activiti.process.esRevision.entity.ProcessEsRevision; @@ -24,6 +26,9 @@ import com.jero.modules.activiti.process.fb.service.IProcessHandleService; import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; import com.jero.modules.activiti.service.ProcessAllService; import com.jero.modules.activiti.service.ProcessNodeLinkService; +import com.jero.modules.laws.enterprise.entity.EnterpriseStandardPlan; +import com.jero.modules.laws.enterprise.service.EnterpriseStandardPlanService; +import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; import com.jero.modules.sys.utils.UserUtils; import lombok.extern.slf4j.Slf4j; import org.activiti.engine.RuntimeService; @@ -68,6 +73,8 @@ public class EsRevisionServiceImpl extends ServiceImpl variables = new HashMap<>(); + variables.put("mainDraftUser", mainDraftUser); + // 启动流程 + ProcessInstance processInstance = actFlowCommonService.startProcess(processDefinitionKey, variables); + ProcessEsRevision revision = new ProcessEsRevision(); + // 获取流程实例ID + String processDefinitionId = processInstance.getProcessDefinitionId(); + String processInstanceId = processInstance.getId(); + // 设置流程实例Id + revision.setProcessInstanceId(processInstanceId); + revision.setEspId(espId); + // 保存到业务流程表 + save(revision); + // 保存选人信息 + // 人员 + processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, variables); + // 根据流程实例id更新流程总表 + String newStandardNo = esp.getNewEnStandardNo(); + String newStandardName = esp.getNewEnStandardName(); + String revisionType = esp.getApplicationCategory().equals(ESPRevisionType.ENACT.getValue()) ? "制定" : "修订"; + String prcName = newStandardNo + "-" + newStandardName + "-" + revisionType; + Integer prcType = ProcessTypeEnum.ES_REVISION.getValue(); + actFlowCommonService.updateProcessAll(processInstanceId, mainDraftUser, prcName, null, prcType, null); } @Override