|
|
@@ -1329,9 +1329,7 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
|
|
|
executeWorkflowUpdateDto.setFormData(thisFormData);
|
|
|
variableMap.putValue(formConfig.getKey(), thisFormData);
|
|
|
|
|
|
- System.out.println("newLaunch start 0");
|
|
|
Triple<Session, Boolean, Long> sessionLongLongTriple = formExecuteService.workflowAddOrUpdate(executeWorkflowUpdateDto);
|
|
|
- System.out.println("newLaunch start 1");
|
|
|
|
|
|
WorkflowFormRelation formRelation = new WorkflowFormRelation();
|
|
|
formRelation.setFormId(formConfig.getFormId());
|
|
|
@@ -3845,11 +3843,6 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
|
|
|
if (historicProcessInstance.getEndTime() != null) {
|
|
|
throw new MyException("流程已经结束 无法撤回！");
|
|
|
}
|
|
|
- //如果是简单流程 无多实例 无网关等组件 默认可以根据审批时间
|
|
|
-
|
|
|
- //获取到当前活动的实例
|
|
|
-// ActivityInstance activityInstance = runtimeService.getActivityInstance(dto.getProcessId());
|
|
|
-
|
|
|
//获取当前活动的任务信息
|
|
|
List<WorkflowExtra> workflowExtras = workflowExtraMapper.selectList(Wrappers.lambdaQuery(WorkflowExtra.class).in(WorkflowExtra::getProcessId, dto.getProcessId()));
|
|
|
//找到当前流程的 任务开始时间 最大值 为当前审批节点
|
|
|
@@ -3902,11 +3895,10 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
|
|
|
|
|
|
thisFormData.ifPresent(data -> {
|
|
|
Map<String, Object> formData = Convert.toMap(String.class, Object.class, data.getValue());
|
|
|
+ formData.remove("id");
|
|
|
WorkflowDraft draft = new WorkflowDraft();
|
|
|
draft.setSchemaId(workflowSchema.getId());
|
|
|
- draft.setDataId(formData.get("id").toString());
|
|
|
draft.setFormData(JSONUtil.toJsonStr(formData));
|
|
|
- draft.setTaskId(workflowExtra.getTaskId());
|
|
|
workflowDraftService.save(draft);
|
|
|
});
|
|
|
}
|
brealinxx