提交 1451e68c 编写于 作者: O o2sword

修复已完成文档回溯后表单不对的问题

上级 9a6a4b45
......@@ -66,6 +66,7 @@ class ActionRollback extends BaseAction {
}
Callable<String> callable = new Callable<String>() {
@Override
public String call() throws Exception {
try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
......@@ -116,7 +117,7 @@ class ActionRollback extends BaseAction {
emc.beginTransaction(ReadCompleted.class);
emc.beginTransaction(Review.class);
Work work = createWork(workCompleted, workLog);
Work work = createWork(business, workCompleted, workLog);
emc.persist(work, CheckPersistType.all);
disconnectWorkLog(work, workLog);
......@@ -157,7 +158,7 @@ class ActionRollback extends BaseAction {
return result;
}
private Work createWork(WorkCompleted workCompleted, WorkLog workLog) throws Exception {
private Work createWork(Business business, WorkCompleted workCompleted, WorkLog workLog) throws Exception {
Work work = new Work(workCompleted);
work.setSplitting(false);
work.setActivityName(workLog.getFromActivityName());
......@@ -167,6 +168,7 @@ class ActionRollback extends BaseAction {
work.setActivityDescription("");
work.setActivityToken(workLog.getFromActivityToken());
work.setActivityType(workLog.getFromActivityType());
work.setForm(business.element().lookupSuitableForm(work.getProcess(), work.getActivity()));
// work.setErrorRetry(0);
work.setWorkStatus(WorkStatus.processing);
// 因为workCompleted没有workCreateType属性,回溯到任何环节都必须要有待办,默认置为assign
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册