From 718ba4324c04d0af8f1af0248e3842b043526893 Mon Sep 17 00:00:00 2001
From: sunchenliang <2532527871@qq.com>
Date: Tue, 2 Apr 2024 23:55:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E7=9B=B8=E4=BC=BC?=
 =?UTF-8?q?=E5=BA=A6=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/oa/OcrTaskchildPictureMapper.xml   | 68 +++++++++----------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml
index f911754b..f2e289fa 100644
--- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml
+++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml
@@ -626,40 +626,40 @@
     </select>
 
     <select id="getPictureHistoryList" resultType="cn.jyjz.xiaoyao.ocr.vo.OcrTaskChildPictureVo">
-        SELECT t2.ID                    id,
-               t2.PICTUREID             pictureId,
-               t2.STATES                states,
-               t2.PROCESSINSTANCEID     processInstanceId,
-               t2.PROCESSDEFINITIONID   processDefinitionId,
-               t2.DEPLOYMENTID          deploymentId,
-               t2.ASSIGNEENAME          assigneeName,
-               t2.ASSIGNEE              assignee,
-               t2.FILEANNEX             fileAnnex,
-               t2.GUIDANG               guiDang,
-               t2.CREATEUSER            createUser,
-               t2.CREATEUSERNAME        createUserName,
-               t2.CREATEDATE            createDate,
-               t2.USERID                userId,
-               t2.USERNAME              userName,
-               t2.FROMTASKID            fromTaskId,
-               t2.FROMTASKNAME          fromTaskName,
-               t2.FROMUSERID            fromUserId,
-               t2.FROMPROJECTID         fromProjectId,
-               t2.FROMPLANID            fromPlanId,
-               t2.FROMUPTIME            fromupTime,
-               t2.FROMSOURCEID          fromSourceId,
-               t2.HAVEPOINTS            havePoints,
-               t2.TASKNAME              taskName,
-               t2.TASKID                taskId,
-               t2.FROMUSERNAME          fromUserName,
-               t2.FROMPROJECTNAME       fromProjectName,
-               t2.FINISHTIME            finishTime,
-               t1.imgUrl,
-               ifnull(t3.STATSHIS, 1)   historyStates,
-               t1.submit_date_timestamp submitDateTimestamp,
-               t1.photo_date_timestamp  photoDateTimestamp,
-               t1.similarity_score      similarityScore,
-               t1.server_thumbnail_url  serverThumbnailUrl
+        SELECT distinct t2.ID                    id,
+                        t2.PICTUREID             pictureId,
+                        t2.STATES                states,
+                        t2.PROCESSINSTANCEID     processInstanceId,
+                        t2.PROCESSDEFINITIONID   processDefinitionId,
+                        t2.DEPLOYMENTID          deploymentId,
+                        t2.ASSIGNEENAME          assigneeName,
+                        t2.ASSIGNEE              assignee,
+                        t2.FILEANNEX             fileAnnex,
+                        t2.GUIDANG               guiDang,
+                        t2.CREATEUSER            createUser,
+                        t2.CREATEUSERNAME        createUserName,
+                        t2.CREATEDATE            createDate,
+                        t2.USERID                userId,
+                        t2.USERNAME              userName,
+                        t2.FROMTASKID            fromTaskId,
+                        t2.FROMTASKNAME          fromTaskName,
+                        t2.FROMUSERID            fromUserId,
+                        t2.FROMPROJECTID         fromProjectId,
+                        t2.FROMPLANID            fromPlanId,
+                        t2.FROMUPTIME            fromupTime,
+                        t2.FROMSOURCEID          fromSourceId,
+                        t2.HAVEPOINTS            havePoints,
+                        t2.TASKNAME              taskName,
+                        t2.TASKID                taskId,
+                        t2.FROMUSERNAME          fromUserName,
+                        t2.FROMPROJECTNAME       fromProjectName,
+                        t2.FINISHTIME            finishTime,
+                        t1.imgUrl,
+                        ifnull(t3.STATSHIS, 1)   historyStates,
+                        t1.submit_date_timestamp submitDateTimestamp,
+                        t1.photo_date_timestamp  photoDateTimestamp,
+                        t1.similarity_score      similarityScore,
+                        t1.server_thumbnail_url  serverThumbnailUrl
         FROM ocr_picture t1
                  LEFT JOIN ocr_taskchild_picture t2
                            on t1.ID = t2.PICTUREID