From 9f77cb67284c1dc705df6096cd23c528ef10ea4f Mon Sep 17 00:00:00 2001
From: sunchenliang <2532527871@qq.com>
Date: Sun, 14 Apr 2024 18:28:20 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8C=85=E4=B8=BB=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OcrTaskchildPictureMybatisDao.java        |  3 ++
 .../impl/OcrSearchHistoryServiceImpl.java     |  3 +-
 .../resources/mapper/oa/OcrPictureMapper.xml  | 33 ++++++------
 .../mapper/oa/OcrTaskchildPictureMapper.xml   | 50 +++++++++++++++++++
 4 files changed, 73 insertions(+), 16 deletions(-)

diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrTaskchildPictureMybatisDao.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrTaskchildPictureMybatisDao.java
index 0a900be9..de555ec9 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrTaskchildPictureMybatisDao.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrTaskchildPictureMybatisDao.java
@@ -57,4 +57,7 @@ public interface OcrTaskchildPictureMybatisDao extends BaseMapper<OcrTaskchildPi
     PictureDetailVo getPictureDetail(String pictureId);
 
     Page<OcrTaskChildPictureVo> getPackageSimilarityList(Page<OcrTaskChildPictureVo> page, @Param("checkDuplicateId") String checkDuplicateId, @Param("pictureId") String pictureId, @Param("oderType") String oderType, @Param("oderName") String oderName);
+
+    List<OcrTaskChildPictureVo> getSimilarityList(@Param("pictureIds") List<String> pictureIds);
+
 }
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java
index a65dbec1..773a25cf 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java
@@ -211,8 +211,7 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl<OcrSearchHistoryMap
         List<String> approvedList = new ArrayList<>(); // 存储通过的pictureId集合
         List<String> failedList = new ArrayList<>(); // 存储不通过的pictureId集合
         if(pictureIds.size()!=0){
-            String userNodeType = ProcessConstant.userNodeType.getOrDefault(nodeType, "一级审批");
-            List<OcrTaskChildPictureVo> failedPictureIds = taskchildPictureMybatisDao.getPictureHistoryList(pictureIds, userNodeType);
+            List<OcrTaskChildPictureVo> failedPictureIds = taskchildPictureMybatisDao.getSimilarityList(pictureIds);
             for (OcrTaskChildPictureVo picture : failedPictureIds) {
                 if (picture.getHistoryStates() == 3) {
                     failedList.add(picture.getId());
diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureMapper.xml
index b3a3f5f7..7c9805ca 100644
--- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureMapper.xml
+++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureMapper.xml
@@ -226,23 +226,28 @@
 	</sql>
 
 	<select id="getPackagePictureInfo" resultMap="BaseResultMap">
-        SELECT t2.*,t3.*,t4.STATES,t4.TASKID,t4.ID taskchildId,
-		COALESCE(
-		(SELECT t5.STATSHIS
-		FROM oa_userapprove_t t5
-		WHERE t5.FORMID = t4.ID
-		ORDER BY t5.CREATEDATE DESC
-		LIMIT 1),
-		1) AS historyStates
+        SELECT t2.*,
+               t3.*,
+               t4.STATES,
+               t4.TASKID,
+               t4.ID         taskchildId,
+               COALESCE(
+                       (SELECT t5.STATSHIS
+                        FROM oa_userapprove_t t5
+                        WHERE t5.FORMID = t4.ID
+                        ORDER BY t5.CREATEDATE DESC
+                        LIMIT 1),
+                       1) AS historyStates
         FROM ocr_check_duplicate_result t1
                  LEFT JOIN ocr_picture t2 ON t1.picture_id = t2.ID
-		left join ocr_picture_info t3 on t2.ID=t3.picture_id
-		left join ocr_taskchild_picture t4 on t2.ID=t4.PICTUREID
+                 left join ocr_picture_info t3 on t2.ID = t3.picture_id
+                 left join ocr_taskchild_picture t4 on t2.ID = t4.PICTUREID
         where t1.check_duplicate_id = #{packageId}
-		<if test="pictureId != null and pictureId != ''">
-			and t1.picture_id = #{pictureId}
-		</if>
-        ORDER BY t1.max_similarity desc,t1.similarity_group_order asc, t2.submit_date_timestamp asc
+          and t2.suspiciousfile = 0
+        <if test="pictureId != null and pictureId != ''">
+            and t1.picture_id = #{pictureId}
+        </if>
+        ORDER BY t1.max_similarity desc, t1.similarity_group_order asc, t2.submit_date_timestamp asc
         LIMIT 1
     </select>
 
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 64830cc4..4cda92de 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
@@ -980,4 +980,54 @@
             limit ${page.start}, ${page.Pagesize}
         </if>
     </select>
+
+    <select id="getSimilarityList" resultType="cn.jyjz.xiaoyao.ocr.vo.OcrTaskChildPictureVo">
+        SELECT distinct t3.ID                    id,
+        t3.PICTUREID             pictureId,
+        t3.STATES                states,
+        t3.PROCESSINSTANCEID     processInstanceId,
+        t3.PROCESSDEFINITIONID   processDefinitionId,
+        t3.DEPLOYMENTID          deploymentId,
+        t3.ASSIGNEENAME          assigneeName,
+        t3.ASSIGNEE              assignee,
+        t3.FILEANNEX             fileAnnex,
+        t3.GUIDANG               guiDang,
+        t3.CREATEUSER            createUser,
+        t3.CREATEUSERNAME        createUserName,
+        t3.CREATEDATE            createDate,
+        t3.USERID                userId,
+        t3.USERNAME              userName,
+        t3.FROMTASKID            fromTaskId,
+        t3.FROMTASKNAME          fromTaskName,
+        t3.FROMUSERID            fromUserId,
+        t3.FROMPROJECTID         fromProjectId,
+        t3.FROMPLANID            fromPlanId,
+        t3.FROMUPTIME            fromupTime,
+        t3.FROMSOURCEID          fromSourceId,
+        t3.HAVEPOINTS            havePoints,
+        t3.TASKNAME              taskName,
+        t3.FROMUSERNAME          fromUserName,
+        t3.FROMPROJECTNAME       fromProjectName,
+        t3.FINISHTIME            finishTime,
+        t3.TASKID                taskId,
+        t2.imgUrl,
+        t2.submit_date_timestamp submitDateTimestamp,
+        t2.photo_date_timestamp  photoDateTimestamp,
+        t2.server_thumbnail_url  serverThumbnailUrl,
+        t2.similarity_score        maxSimilarity,
+        COALESCE(
+        (SELECT t4.STATSHIS
+        FROM oa_userapprove_t t4
+        WHERE t4.FORMID = t3.ID
+        ORDER BY t4.CREATEDATE DESC
+        LIMIT 1), 1) AS historyStates
+        from ocr_picture t2
+        LEFT JOIN ocr_taskchild_picture t3 ON t2.ID = t3.PICTUREID
+        left join ocr_picture_info t5 on t2.ID = t5.picture_id
+        WHERE t2.suspiciousfile = 0
+        and t2.ID in
+        <foreach collection="pictureIds" open="(" close=")" item="item" separator="," index="index">
+            #{item}
+        </foreach>
+    </select>
 </mapper>