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 c1e01598..8f662cb9 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
@@ -39,6 +39,51 @@
         <result column="HAVEPOINTS" property="havepoints" jdbcType="INTEGER"/>
         <result column="TASKNAME" property="taskname" jdbcType="VARCHAR"/>
     </resultMap>
+    <resultMap id="taskResultMap" type="cn.jyjz.xiaoyao.ocr.vo.OcrTaskChildPictureVo">
+        <result column="assigneeName" property="assigneeName"/>
+        <result column="createDate" property="createDate"/>
+        <result column="createUser" property="createUser"/>
+        <result column="createUserName" property="createUserName"/>
+        <result column="deploymentId" property="deploymentId"/>
+        <result column="fileAnnex" property="fileAnnex"/>
+        <result column="finishTime" property="finishTime"/>
+        <result column="fromPlanId" property="fromPlanId"/>
+        <result column="fromProjectId" property="fromProjectId"/>
+        <result column="fromProjectName" property="fromProjectName"/>
+        <result column="fromSourceId" property="fromSourceId"/>
+        <result column="fromTaskId" property="fromTaskId"/>
+        <result column="fromTaskName" property="fromTaskName"/>
+        <result column="fromUserId" property="fromUserId"/>
+        <result column="fromUserName" property="fromUserName"/>
+        <result column="fromupTime" property="fromupTime"/>
+        <result column="guiDang" property="guiDang"/>
+        <result column="havePoints" property="havePoints"/>
+        <result column="historyStates" property="historyStates"/>
+        <result column="imgUrl" property="imgUrl"/>
+        <result column="maxSimilarity" property="maxSimilarity"/>
+        <result column="photoDateTimestamp" property="photoDateTimestamp"/>
+        <result column="pictureId" property="pictureId"/>
+        <result column="processDefinitionId" property="processDefinitionId"/>
+        <result column="processInstanceId" property="processInstanceId"/>
+        <result column="serverThumbnailUrl" property="serverThumbnailUrl"/>
+        <result column="submitDateTimestamp" property="submitDateTimestamp"/>
+        <result column="taskId" property="taskId"/>
+        <result column="taskName" property="taskName"/>
+        <result column="userId" property="userId"/>
+        <result column="userName" property="userName"/>
+        <association property="pictureInfo" javaType="cn.jyjz.xiaoyao.ocr.dataobject.OcrPictureInfo">
+            <result column="picture_id" property="pictureId"/>
+            <result column="img_size" property="imgSize"/>
+            <result column="img_name" property="imgName"/>
+            <result column="img_format" property="imgFormat"/>
+            <result column="img_measure" property="imgMeasure"/>
+            <result column="upload_time" property="uploadTime"/>
+            <result column="create_time" property="createTime"/>
+            <result column="img_space" property="imgSpace"/>
+            <result column="tag_time" property="tagTime"/>
+            <result column="source" property="source"/>
+        </association>
+    </resultMap>
     <resultMap id="PictureResultMap" type="cn.jyjz.xiaoyao.ocr.vo.PictureDetailVo">
         <result column="picture_id" property="pictureId"/>
         <result column="taskChildId" property="taskChildId"/>
@@ -139,6 +184,7 @@
                 </if>
                 <if test="ocpictureid != null">
 
+
                      and OCPICTUREID ${ocpictureid.dataOp} ${ocpictureid.likestar}#{ocpictureid.value}${ocpictureid.likeend}
                 </if>
                 <if test="pictureresult != null">
@@ -260,6 +306,7 @@
                 </if>
                 <if test="ocpictureid != null">
 
+
                      and tcp.OCPICTUREID ${ocpictureid.dataOp} ${ocpictureid.likestar}#{ocpictureid.value}${ocpictureid.likeend}
                 </if>
                 <if test="pictureresult != null">
@@ -450,7 +497,7 @@
         where tc.STATES = 5
         ) as tcp
             left join ocr_picture pic
-                      on tcp.PICTUREID = pic.ID and pic.suspiciousfile =0
+                      on tcp.PICTUREID = pic.ID and pic.suspiciousfile = 0
         <include refid="Base_Where_union">
         </include>
         <if test="fromuptimeStart != null">
@@ -472,15 +519,16 @@
         from ocr_taskchild_picture tc,
              OA_USERFINAL_T uf,
              ocr_picture p
-        where tc.ID = uf.FORMID  and p.ID = tc.PICTUREID and p.suspiciousfile =0
+        where tc.ID = uf.FORMID
+          and p.ID = tc.PICTUREID
+          and p.suspiciousfile = 0
         <if test="thisLoginUserid != null">
             and uf.USERID ${thisLoginUserid.dataOp} ${thisLoginUserid.likestar}#{thisLoginUserid.value}${thisLoginUserid.likeend}
         </if>
         UNION
         select
             tc.*
-        from ocr_taskchild_picture tc,
-        ocr_picture p
+        from ocr_taskchild_picture tc, ocr_picture p
         where tc.STATES = 5 and p.suspiciousfile =0
         ) as tcp
         <include refid="Base_Where_union">
@@ -498,7 +546,7 @@
                uf.TASKNO
         from ocr_taskchild_picture tc
                  LEFT JOIN OA_USERAPPROVE_T uf ON tc.ID = uf.ID
-        left join ocr_picture op on tc.PICTUREID = op.ID and op.suspiciousfile =0
+                 left join ocr_picture op on tc.PICTUREID = op.ID and op.suspiciousfile = 0
         where tc.ASSIGNEE = #{searchassignee}
           and tc.TENANTID = #{searchtenantid}
           and tc.STATES = 2
@@ -511,8 +559,10 @@
                uf.TASKNO
         from ocr_taskchild_picture tc,
              OA_USERAPPROVE_T uf,
-        ocr_picture op
-        where tc.ID = uf.FORMID and  tc.PICTUREID = op.ID and op.suspiciousfile =0
+             ocr_picture op
+        where tc.ID = uf.FORMID
+          and tc.PICTUREID = op.ID
+          and op.suspiciousfile = 0
           and tc.TENANTID = #{searchtenantid}
         <if test="thisLoginUserid != null">
             and uf.USERID = #{thisLoginUserid}
@@ -591,12 +641,13 @@
                ifnull(t3.STATSHIS, 1)   historyStates,
                t1.submit_date_timestamp submitDateTimestamp,
                t1.photo_date_timestamp  photoDateTimestamp,
-               t1.similarity_score similarityScore
+               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}'
-        where t1.suspiciousfile = 0 and t1.ID in
+        where t1.suspiciousfile = 0
+          and t1.ID in
         <foreach collection="pictureIds" open="(" close=")" item="item" separator="," index="index">
             #{item}
         </foreach>
@@ -660,10 +711,11 @@
                  LEFT JOIN ocr_picture_info t2 on t1.ID = t2.picture_id
                  LEFT JOIN ocr_taskchild_picture t3 on t1.ID = t3.PICTUREID
                  LEFT JOIN oa_userapprove_t t4 on t4.FORMID = t3.ID
-        where t1.ID = #{pictureId} and t1.suspiciousfile = 0
+        where t1.ID = #{pictureId}
+          and t1.suspiciousfile = 0
     </select>
 
-    <select id="getPackageSimilarityList" resultType="cn.jyjz.xiaoyao.ocr.vo.OcrTaskChildPictureVo">
+    <select id="getPackageSimilarityList" resultMap="taskResultMap">
         SELECT t3.ID                    id,
                t3.PICTUREID             pictureId,
                t3.STATES                states,
@@ -697,12 +749,15 @@
                t2.photo_date_timestamp  photoDateTimestamp,
                t2.server_thumbnail_url  serverThumbnailUrl,
                t1.max_similarity        maxSimilarity,
-               ifnull(t4.STATSHIS, 1)   historyStates
+               ifnull(t4.STATSHIS, 1)   historyStates,
+               t5.*
         FROM ocr_check_duplicate_result t1
                  LEFT JOIN ocr_picture t2 ON t1.picture_id = t2.ID
                  LEFT JOIN ocr_taskchild_picture t3 ON t2.ID = t3.PICTUREID
                  LEFT JOIN oa_userapprove_t t4 ON t3.ID = t4.FORMID and t4.TASKNAME = '${taskname}'
-        WHERE t1.check_duplicate_id = #{checkDuplicateId} and t2.suspiciousfile = 0
+                 left join ocr_picture_info t5 on t2.ID = t5.picture_id
+        WHERE t1.check_duplicate_id = #{checkDuplicateId}
+          and t2.suspiciousfile = 0
         <if test="pictureId != null and pictureId != ''">
             and t1.picture_id != #{pictureId}
         </if>