From 8e530be0355bc0d353a9d3a54680d113647bd485 Mon Sep 17 00:00:00 2001 From: o2null Date: Wed, 2 Dec 2020 16:08:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=9B=9E=E8=80=81=E7=89=88=E6=9C=ACge?= =?UTF-8?q?tWorkOrWorkCompleted=E7=9A=84work=E8=BF=94=E5=9B=9E=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../surface/jaxrs/work/ActionGetWithWorkOrWorkCompleted.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionGetWithWorkOrWorkCompleted.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionGetWithWorkOrWorkCompleted.java index 2407b746e0..f9d9744daa 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionGetWithWorkOrWorkCompleted.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionGetWithWorkOrWorkCompleted.java @@ -64,12 +64,14 @@ class ActionGetWithWorkOrWorkCompleted extends BaseAction { wo.setReadList(readFuture.get(10, TimeUnit.SECONDS)); this.setCurrentReadIndex(effectivePerson, wo); this.setCurrentTaskIndex(effectivePerson, wo); + wo.setWork(gson.toJsonTree(work)); } else if (null != workCompleted) { CompletableFuture dataFuture = this.dataFuture(workCompleted); CompletableFuture> readFuture = this.readFuture(workCompleted.getJob()); wo.setData(dataFuture.get(10, TimeUnit.SECONDS)); wo.setReadList(readFuture.get(10, TimeUnit.SECONDS)); this.setCurrentReadIndex(effectivePerson, wo); + wo.setWork(gson.toJsonTree(workCompleted)); } if (BooleanUtils.isFalse(checkControlFuture.get(10, TimeUnit.SECONDS))) { -- GitLab