From 23ec8ab108072cc95e66edfd3fe035c121201b75 Mon Sep 17 00:00:00 2001
From: sunchenliang <2532527871@qq.com>
Date: Sat, 30 Mar 2024 23:55:35 +0800
Subject: [PATCH] =?UTF-8?q?fix:=201.=E4=BF=AE=E6=94=B9=E5=B0=8F=E7=BB=93?=
 =?UTF-8?q?=E6=9F=A5=E9=87=8D=E8=BF=94=E5=9B=9E=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/jyjz/xiaoyao/oa/from/vo/RepeatedTaskVo.java   |  4 ++++
 .../main/resources/mapper/oa/FlowableccMapper.xml    | 12 ++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/vo/RepeatedTaskVo.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/vo/RepeatedTaskVo.java
index aa28ba57..308a8e72 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/vo/RepeatedTaskVo.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/vo/RepeatedTaskVo.java
@@ -13,6 +13,10 @@ public class RepeatedTaskVo {
 
     private String taskId;
 
+    private String formId;
+
+    private String fromTaskId;
+
     private String taskName;
 
     private String nodeName;
diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/FlowableccMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/FlowableccMapper.xml
index 0858f68d..646c3b17 100644
--- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/FlowableccMapper.xml
+++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/FlowableccMapper.xml
@@ -205,11 +205,13 @@
                t1.imgUrl,
                t3.similarity_score similarityScore,
                t2.STATES,
-               t3.remark           taskId,
+               t3.remark           fromTaskId,
                t3.taskName,
                t2.TASKNAME         nodeName,
                t2.FROMUPTIME       fromTime,
-               t2.UPDATETIME       updateTime
+               t2.UPDATETIME       updateTime,
+			   t2.TASKID			taskId,
+			   t2.ID formId
         from (select count(field8) count, field8 content, ID id, imgUrl
               FROM ocr_picture
 			where ID in (select child.PICTUREID from oa_userfinal_t final left join ocr_taskchild_picture child on final.FORMID = child.ID)
@@ -226,11 +228,13 @@
 			t1.imgUrl,
 			t3.similarity_score similarityScore,
 			t2.STATES,
-			t3.remark           taskId,
+			t3.remark           fromTaskId,
 			t3.taskName,
 			t2.TASKNAME         nodeName,
 			t2.FROMUPTIME       fromTime,
-			t2.UPDATETIME       updateTime
+			t2.UPDATETIME       updateTime,
+			t2.TASKID			taskId,
+			t2.ID formId
 		from (select field8 content, ID id, imgUrl
 			  FROM ocr_picture
 			  where ID in (select child.PICTUREID from oa_userfinal_t final left join ocr_taskchild_picture child on final.FORMID = child.ID)