From 1680322a645ce4091001aa48a8cc42ef0a138bb6 Mon Sep 17 00:00:00 2001
From: sunchenliang <2532527871@qq.com>
Date: Tue, 2 Apr 2024 21:12:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BB=88=E5=AE=A1=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/oa/OcrTaskchildPictureMapper.xml   | 80 ++++++++++---------
 1 file changed, 43 insertions(+), 37 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 7f4870f4..db685b07 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
@@ -185,6 +185,7 @@
                 <if test="ocpictureid != null">
 
 
+
                      and OCPICTUREID ${ocpictureid.dataOp} ${ocpictureid.likestar}#{ocpictureid.value}${ocpictureid.likeend}
                 </if>
                 <if test="pictureresult != null">
@@ -307,6 +308,7 @@
                 <if test="ocpictureid != null">
 
 
+
                      and tcp.OCPICTUREID ${ocpictureid.dataOp} ${ocpictureid.likestar}#{ocpictureid.value}${ocpictureid.likeend}
                 </if>
                 <if test="pictureresult != null">
@@ -499,7 +501,6 @@
             left join ocr_picture pic
                       on tcp.PICTUREID = pic.ID
         <include refid="Base_Where_union">
-
         </include>
         and pic.suspiciousfile = 0
         <if test="fromuptimeStart != null">
@@ -510,7 +511,12 @@
         </if>
         <if test="page != null">
             <if test="page.sortname != null">
-                order by tcp.${page.sortname} ${page.sortorder}
+                <if test="page.sortname == 'states'">
+                    order by tcp.${page.sortname} ${page.sortorder}
+                </if>
+                <if test="page.sortname != 'states'">
+                    order by pic.${page.sortname} ${page.sortorder}
+                </if>
             </if>
             limit ${page.start}, ${page.Pagesize}
         </if>
@@ -774,42 +780,42 @@
 
     <select id="getDubiousfileList" 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
+               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
         FROM ocr_picture t1
-        LEFT JOIN ocr_taskchild_picture t2
-        on t1.ID = t2.PICTUREID
-        LEFT JOIN oa_userapprove_t t3 on t2.ID = t3.FORMID and t3.TASKNAME = '${taskname}'
+                 LEFT JOIN ocr_taskchild_picture t2
+                           on t1.ID = t2.PICTUREID
+                 LEFT JOIN oa_userapprove_t t3 on t2.ID = t3.FORMID and t3.TASKNAME = '${taskname}'
         where t1.ID in
         <foreach collection="pictureIds" open="(" close=")" item="item" separator="," index="index">
             #{item}