From 229e1640461d23fcc70654c038adbb33018f978d Mon Sep 17 00:00:00 2001
From: sunchenliang <2532527871@qq.com>
Date: Tue, 2 Apr 2024 19:53:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E7=BB=88=E5=AE=A1?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=BF=94=E5=9B=9E=E5=8F=8A=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/jyjz/flowable/controller/FlowTaskController.java  | 4 ++++
 .../src/main/resources/mapper/oa/FlowableccMapper.xml         | 2 +-
 .../main/resources/mapper/oa/OcrTaskchildPictureMapper.xml    | 4 +++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java
index f9502c2f..b523fdf5 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java
@@ -375,6 +375,7 @@ public class FlowTaskController extends BaseController {
     @ResponseBody
     public ResultVo<OcrTaskchildPicture> listFinalData(PageUtils<OcrTaskchildPicture> pageUtils,
                                                        @RequestParam(name = "izupuser", defaultValue = "", required = false) String izupuser,
+                                                       @RequestParam(name = "taskName", defaultValue = "", required = false) String taskName,
                                                        @RequestParam(name = "izproject", defaultValue = "", required = false) String izproject,
                                                        @RequestParam(name = "izplan", defaultValue = "", required = false) String izplan,
                                                        @RequestParam(name = "izstatus", defaultValue = "", required = false) String izstatus,
@@ -392,6 +393,9 @@ public class FlowTaskController extends BaseController {
                 searchQuery.addEqual("fromuserid", izupuser);
             }
         }
+        if(StringUtils.isNotBlank(taskName)){
+            searchQuery.addLike("fromtaskname",taskName);
+        }
         if (org.springframework.util.StringUtils.hasText(izproject)) {
             if (izproject.contains(",")) {
                 String[] projectIds = izproject.split(","); // 以逗号拆分字符串
diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/FlowableccMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/FlowableccMapper.xml
index 2b03280b..7822a540 100644
--- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/FlowableccMapper.xml
+++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/FlowableccMapper.xml
@@ -224,7 +224,7 @@
     </select>
 
 	<select id="repetitionTaskList" resultType="cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPicture">
-        SELECT t2.*
+        SELECT t2.*,t3.similarity_score similarityScore
         FROM oa_userfinal_t t1
                  LEFT JOIN ocr_taskchild_picture t2 ON t2.ID = t1.FORMID
                  LEFT JOIN ocr_picture t3 ON t2.PICTUREID = t3.ID
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 d8e77a62..7f4870f4 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
@@ -497,9 +497,11 @@
         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
         <include refid="Base_Where_union">
+
         </include>
+        and pic.suspiciousfile = 0
         <if test="fromuptimeStart != null">
             and tcp.fromuptime &gt;= ${fromuptimeStart}
         </if>