From 1f0acd7603a08e15879f26487058ee0bbb1ed63a Mon Sep 17 00:00:00 2001
From: ljt <18301674552@163.com>
Date: Thu, 21 Mar 2024 21:09:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E6=96=87=E6=A3=80=E7=B4=A2bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocr/dataDao/OcrSearchHistoryMapper.java   |  6 +++---
 .../impl/OcrSearchHistoryServiceImpl.java     | 18 ++++++++++++++---
 .../mapper/oa/OcrSearchHistoryMapper.xml      | 20 ++++++-------------
 3 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrSearchHistoryMapper.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrSearchHistoryMapper.java
index 4a702bb0..e0cb2e38 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrSearchHistoryMapper.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrSearchHistoryMapper.java
@@ -19,11 +19,11 @@ import java.util.Map;
  */
 @Mapper
 public interface OcrSearchHistoryMapper extends BaseMapper<OcrSearchHistory> {
-        List<Map<String,String>> selectsearch1(@Param("search")String search);
+        List<Map<String,String>> selectsearch1(@Param("userid")String userid,@Param("search")String search);
 
-        List<Map<String,String>> selectsearch2(@Param("search")String search);
+        List<Map<String,String>> selectsearch2(@Param("userid")String userid,@Param("search")String search);
 
-        List<Map<String,String>> selectsearch3(@Param("search")String search);
+        List<Map<String,String>> selectsearch3(@Param("userid")String userid,@Param("search")String search);
 
 
 
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 cc882730..da8232e5 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
@@ -15,6 +15,7 @@ import cn.jyjz.xiaoyao.ocr.dataDao.OcrSearchHistoryMapper;
 
 import javax.annotation.Resource;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -38,9 +39,12 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl<OcrSearchHistoryMap
 
     @Override
     public Map<Object, List<Map<String,String>>> selectsearch(String search, String assignee) {
-        List<Map<String,String>> strings1 = ocrsearchhistorymapper.selectsearch1(search);
-        List<Map<String,String>> strings2 = ocrsearchhistorymapper.selectsearch2(search);
-        List<Map<String,String>> strings3 = ocrsearchhistorymapper.selectsearch3(search);
+
+
+
+        List<Map<String,String>> strings1 = ocrsearchhistorymapper.selectsearch1(assignee,search);
+        List<Map<String,String>> strings2 = ocrsearchhistorymapper.selectsearch2(assignee,search);
+        List<Map<String,String>> strings3 = ocrsearchhistorymapper.selectsearch3(assignee,search);
 
 
 //        List<Map<Object,List<Map<String,String>>>> list = new ArrayList<>();
@@ -119,6 +123,14 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl<OcrSearchHistoryMap
 
         }
 
+//        List<OcrPicture> collect = Arrays.stream(cps)
+//                .map(Long::parseLong)
+//                .map(childpictureid -> this.ocrPictureService.selectDtoById(childpictureid))
+//                .filter(ocrPicture->ocrPicture.getSimilarityscore() >= 90)
+//
+//                .collect(Collectors.toList());
+
+
         return this.ocrPictureService.updateBatchById(saveList) ? ResultVoUtil.success() : ResultVoUtil.error();
     }
 }
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 7c5aee47..bbbc2634 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
@@ -16,23 +16,11 @@
     </sql>
 
     <select id="selectsearch1" resultType="map">
-        SELECT
-            r.ID as id,CONCAT_WS( "-", img.taskName, img.planName ) AS name
-        FROM
-            ocr_taskchild_picture r
-                LEFT JOIN ocr_packagetask t ON r.PACKAGEID = t.ID
-                LEFT JOIN ocr_picture img ON FIND_IN_SET(img.ID,r.OCPICTUREID)
 
-        WHERE
-           (r.PACKAGEID LIKE "%"#{search}"%"
-            OR img.taskName LIKE "%"#{search}"%"
-            OR img.field1 LIKE "%"#{search}"%"
-            OR img.field3 LIKE "%"#{search}"%")
-        ORDER BY
-            r.CREATEDATE DESC
-            LIMIT 3
+        SELECT ID as id,packagename as name FROM ocr_packagetask WHERE create_by=#{userid} AND packagename like "%"#{search}"%"
 
     </select>
+
     <select id="selectsearch2" resultType="map">
         SELECT
             r.ID  as id,CONCAT_WS( "-", img.taskName, img.planName ) AS name
@@ -42,6 +30,8 @@
                 LEFT JOIN ocr_picture img ON FIND_IN_SET(img.ID,r.OCPICTUREID)
 
         WHERE
+            r.ASSIGNEE = #{userid} AND
+            r.STATES IN ('1','2') AND
            r.taskName IN ( '一级审批', '二级审批' )
           AND (r.PACKAGEID LIKE "%"#{search}"%"
             OR img.taskName LIKE "%"#{search}"%"
@@ -60,6 +50,8 @@
                 LEFT JOIN ocr_picture img ON FIND_IN_SET(img.ID,r.OCPICTUREID)
 
         WHERE
+            r.ASSIGNEE = #{userid} AND
+            r.STATES = '3' AND
            r.taskName  = '最终审批'
           AND (r.PACKAGEID LIKE "%"#{search}"%"
             OR img.taskName LIKE "%"#{search}"%"