Merge branch 'dev_20231201_feizhi' into 'master'
Dev 20231201 feizhi See merge request laws-foton-slrs/foton-wkflow-rest!69
This commit is contained in:
@@ -651,6 +651,8 @@ public class TodoTaskController extends BaseAction {
|
||||
logger.error(e.toString());
|
||||
}
|
||||
taskService.complete(busMes.getTaskId());
|
||||
} else {
|
||||
return WrapMapper.error("当前任务不存在");
|
||||
}
|
||||
return WrapMapper.ok(task.getProcessInstanceId());
|
||||
} else {
|
||||
@@ -681,6 +683,8 @@ public class TodoTaskController extends BaseAction {
|
||||
logger.error(e.toString());
|
||||
}
|
||||
taskService.complete(taskId);
|
||||
} else {
|
||||
return WrapMapper.error("当前任务不存在");
|
||||
}
|
||||
}
|
||||
return WrapMapper.ok(prcid);
|
||||
|
||||
@@ -92,7 +92,7 @@ public class ProcessStep6After implements TaskListener {
|
||||
sendToBeReadBpn.setId(UUID.randomUUID().toString().substring(0, 20));
|
||||
sendToBeReadBpn.setTaskId(delegateTask.getId());
|
||||
sendToBeReadBpn.setTaskInfo(delegateTask.getName());
|
||||
sendToBeReadBpn.setLink("Aboliish7?prcType=24" +
|
||||
sendToBeReadBpn.setLink("qbfzStep7?prcType=24" +
|
||||
"&taskDefinitionKey=Aboliish7" +
|
||||
"&operate=view"
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user