From 254fb381347c8794775657b67192270e3de9e862 Mon Sep 17 00:00:00 2001
From: o2sword <171715986@qq.com>
Date: Fri, 19 Aug 2022 16:10:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BD=AC=E4=BA=A4=E6=84=8F?=
 =?UTF-8?q?=E8=A7=81=E6=9C=AA=E4=BF=9D=E5=AD=98=E5=88=B0=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=B8=AD=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assemble/surface/jaxrs/task/V2Reset.java  | 29 ++++++++++++++-----
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/V2Reset.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/V2Reset.java
index 1ed3622dc5..4d0927b37e 100644
--- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/V2Reset.java
+++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/V2Reset.java
@@ -52,23 +52,37 @@ public class V2Reset extends BaseAction {
 
 	private static final Logger LOGGER = LoggerFactory.getLogger(V2Reset.class);
 
-	// 当前的待办
+	/**
+	 * 当前的待办
+	 */
 	private Task task;
-	// 添加的身份
+	/**
+	 * 添加的身份
+	 */
 	private List<String> identities;
-	// 当前的workLog,产生record必须
+	/**
+	 * 当前的workLog,产生record必须
+	 */
 	private WorkLog workLog;
-	// 当前的work
+	/**
+	 * 当前的work
+	 */
 	private Work work;
-	// work活动
+	/**
+	 * work活动
+	 */
 	private Manual manual;
-	// 如果在待办身份矩阵中删除自己,那么先把自己的待办转为不参与流程的已办
+	/**
+	 * 如果在待办身份矩阵中删除自己,那么先把自己的待办转为不参与流程的已办
+	 */
 	private List<TaskCompleted> taskCompleteds;
 	private final String series = StringTools.uniqueToken();
 	private String taskCompletedId;
 	private Wi wi;
 	private EffectivePerson effectivePerson;
-	// 返回的ManualTaskIdentityMatrix
+	/**
+	 * 返回的ManualTaskIdentityMatrix
+	 */
 	private ManualTaskIdentityMatrix manualTaskIdentityMatrix;
 
 	ActionResult<Wo> execute(EffectivePerson effectivePerson, String id, JsonElement jsonElement) throws Exception {
@@ -107,6 +121,7 @@ public class V2Reset extends BaseAction {
 		}
 
 		Record rec = RecordBuilder.ofWorkProcessing(Record.TYPE_RESET, workLog, effectivePerson, manual, newTaskIds);
+		rec.getProperties().setOpinion(wi.getOpinion());
 		RecordBuilder.processing(rec);
 
 		if (StringUtils.isNotEmpty(this.taskCompletedId)) {
-- 
GitLab