Merge remote-tracking branch 'origin/1.2.0' into 1.2.0
commit
2a02a551fd
|
@ -10,6 +10,7 @@ import cn.palmte.work.pojo.ActProcIns;
|
||||||
import cn.palmte.work.utils.ActUtil;
|
import cn.palmte.work.utils.ActUtil;
|
||||||
import cn.palmte.work.utils.InterfaceUtil;
|
import cn.palmte.work.utils.InterfaceUtil;
|
||||||
import cn.palmte.work.utils.StrKit;
|
import cn.palmte.work.utils.StrKit;
|
||||||
|
import com.alibaba.fastjson.JSON;
|
||||||
import org.activiti.bpmn.model.BpmnModel;
|
import org.activiti.bpmn.model.BpmnModel;
|
||||||
import org.activiti.bpmn.model.FlowNode;
|
import org.activiti.bpmn.model.FlowNode;
|
||||||
import org.activiti.bpmn.model.SequenceFlow;
|
import org.activiti.bpmn.model.SequenceFlow;
|
||||||
|
@ -89,7 +90,8 @@ public class ActProcInsService {
|
||||||
variables.put(ActConstant.START_PROCESS_USERID, adminId);
|
variables.put(ActConstant.START_PROCESS_USERID, adminId);
|
||||||
//启动流程
|
//启动流程
|
||||||
ProcessInstance instance = runtimeService.startProcessInstanceById(processDefinition.getId(), businessKey, variables);
|
ProcessInstance instance = runtimeService.startProcessInstanceById(processDefinition.getId(), businessKey, variables);
|
||||||
logger.info("startProcessInstanceSuccess procInsId:{}, procDefKey:{}, procDefName:{}", instance.getId(), instance.getProcessDefinitionKey(), instance.getProcessDefinitionName());
|
logger.info("startProcessInstanceSuccess procInsId:{}, procDefKey:{}, procDefName:{}, variables:{}",
|
||||||
|
instance.getId(), instance.getProcessDefinitionKey(), instance.getProcessDefinitionName(), JSON.toJSONString(variables));
|
||||||
|
|
||||||
String procInsId = instance.getProcessInstanceId();
|
String procInsId = instance.getProcessInstanceId();
|
||||||
Task task = taskService.createTaskQuery().processInstanceId(procInsId).singleResult();
|
Task task = taskService.createTaskQuery().processInstanceId(procInsId).singleResult();
|
||||||
|
|
Loading…
Reference in New Issue