|
@@ -96,6 +96,7 @@ public abstract class ActivitiBaseServiceAbstract implements ActivitiBaseService
|
|
ProcessInstance instance = null;
|
|
ProcessInstance instance = null;
|
|
if (StringUtils.isBlank(actAuditRequest.getProcessInstanceId())) {
|
|
if (StringUtils.isBlank(actAuditRequest.getProcessInstanceId())) {
|
|
instance = runtimeService.startProcessInstanceByKey(ActApplyEnum.SB_INFO_SCRAP.getKey(), actAuditRequest.getId(), map);
|
|
instance = runtimeService.startProcessInstanceByKey(ActApplyEnum.SB_INFO_SCRAP.getKey(), actAuditRequest.getId(), map);
|
|
|
|
+ actAuditRequest.setProcessInstanceId(instance.getId());
|
|
} else { // 再次提交审批的,之前被拒绝的
|
|
} else { // 再次提交审批的,之前被拒绝的
|
|
ProcessInstance instanceExsit = runtimeService.createProcessInstanceQuery()
|
|
ProcessInstance instanceExsit = runtimeService.createProcessInstanceQuery()
|
|
.processInstanceId(actAuditRequest.getProcessInstanceId()).singleResult();
|
|
.processInstanceId(actAuditRequest.getProcessInstanceId()).singleResult();
|
|
@@ -108,7 +109,7 @@ public abstract class ActivitiBaseServiceAbstract implements ActivitiBaseService
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
- // 第一个审批人为发起人,为自动审批。
|
|
|
|
|
|
+ // 第一个审批人为发起人,为自动审批。557501
|
|
// 设置审批对象,保存到task实例中,每次审核都要更新追加这个对象
|
|
// 设置审批对象,保存到task实例中,每次审核都要更新追加这个对象
|
|
Task task = taskService.createTaskQuery().processInstanceId(actAuditRequest.getProcessInstanceId()).orderByTaskCreateTime().desc().singleResult();
|
|
Task task = taskService.createTaskQuery().processInstanceId(actAuditRequest.getProcessInstanceId()).orderByTaskCreateTime().desc().singleResult();
|
|
|
|
|