From 383d28870ec593f32d2f7170c00dee5301981dce Mon Sep 17 00:00:00 2001
From: LILI <707464720@qq.com>
Date: Sat, 30 Mar 2024 22:03:14 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:1.=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/oa/OcrTaskPackageMapper.xml      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskPackageMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskPackageMapper.xml
index ffc46f8..99d4747 100644
--- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskPackageMapper.xml
+++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskPackageMapper.xml
@@ -11,8 +11,9 @@
         <where>
             t1.tenant_id = #{tenantId}
             <if test="packageName != null and packageName != ''">
-                and t1.name like concat('%', #{packageName}, '%') or T3.USERNAME like concat('%', #{packageName}, '%')
+                and (t1.name like concat('%', #{packageName}, '%') or T3.USERNAME like concat('%', #{packageName}, '%'))
             </if>
         </where>
+        ORDER BY T1.create_time desc
     </select>
 </mapper>
\ No newline at end of file

From 0ccbf8bbfc184a0e8d6ff70f0bfcb941acf16e16 Mon Sep 17 00:00:00 2001
From: DELL <haox0404@outlook.com>
Date: Sat, 30 Mar 2024 23:28:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9ai=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E6=8E=A5=E5=8F=A3=EF=BC=8C=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=A1=A8=E5=92=8C=E8=BF=94=E5=9B=9E=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/OcrSearchHistoryServiceImpl.java     |  4 ++--
 .../mapper/oa/OcrSearchHistoryMapper.xml      | 23 +++++++++++++++----
 2 files changed, 20 insertions(+), 7 deletions(-)

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 ac60881..23bb0b3 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
@@ -87,7 +87,7 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl<OcrSearchHistoryMap
         List<OcrPicture> saveList = new ArrayList<>();
         int i=0;
         for (String childpictureid : cps) {
-            if (childpictureid.equals("100.00")){
+            if (childpictureid.equals("100")){
                 i++;
             }
         }
@@ -97,7 +97,7 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl<OcrSearchHistoryMap
         map.put("tenantusername",selectaiuser);
         map.put("packagename",selectaisp.get("packagename"));
         map.put("tasks","基线任务");
-        map.put("similarcount",selectaisp.get("similarcount"));
+//        map.put("similarcount",selectaisp.get("similarcount"));
         map.put("createtime",selectaisp.get("createtime"));
         map.put("similarComplete",i);
 
diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml
index 4468403..6ea6dd2 100644
--- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml
+++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml
@@ -66,14 +66,27 @@
             (SELECT COUNT(*) FROM ocr_taskchild_picture WHERE TENANTID = ""#{tenantid}"" AND STATES = '3') as approved
     </select>
 
+<!--    <select id="selectaisp" resultType="map">-->
+<!--        SELECT-->
+<!--            rw.ID as id,rw.OCPICTUREID as ocpictureid,t.packagename,rw.PICTURERESULT as pictureresult,count(length(rw.PICTURERESULT)-length(replace(rw.PICTURERESULT,',',''))+1) as similarcount,t.create_time as createtime-->
+<!--        FROM-->
+<!--            ocr_taskchild_picture rw-->
+<!--            LEFT JOIN ocr_packagetask t ON rw.PACKAGEID = t.ID-->
+
+<!--        WHERE t.ID = #{id}-->
+<!--    </select>-->
+
     <select id="selectaisp" resultType="map">
         SELECT
-            rw.ID as id,rw.OCPICTUREID as ocpictureid,t.packagename,rw.PICTURERESULT as pictureresult,count(length(rw.PICTURERESULT)-length(replace(rw.PICTURERESULT,',',''))+1) as similarcount,t.create_time as createtime
+            tp.id as id,
+            tp.name as packagename,
+            GROUP_CONCAT(IFNULL(cdr.max_similarity, 0)) as pictureresult,
+            tp.create_time as createtime
         FROM
-            ocr_taskchild_picture rw
-            LEFT JOIN ocr_packagetask t ON rw.PACKAGEID = t.ID
-
-        WHERE t.ID = #{id}
+            ocr_task_package tp
+            LEFT JOIN ocr_check_duplicate_result cdr ON tp.check_duplicate_id = cdr.check_duplicate_id
+        WHERE
+            tp.ID = #{id}
     </select>
 
     <select id="selectaiuser" resultType="String">