Merge pull request 'fix: 1.修改小结查重返回参数' (#24) from sunchenliang into test

Reviewed-on: #24

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;

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)