From cd9509bec2feeb5ef8881ff96c937b63cbd78624 Mon Sep 17 00:00:00 2001
From: shuliYao <1397940314@qq.com>
Date: Thu, 9 May 2024 10:46:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E6=9F=A5=E9=87=8D?=
 =?UTF-8?q?=E6=97=B6=E6=B2=A1=E5=8A=A0=E7=8A=B6=E6=80=81=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/OcrCheckDuplicateController.java    | 14 ++++++++++++++
 .../ocr/controller/OcrPictureController.java       |  4 +++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrCheckDuplicateController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrCheckDuplicateController.java
index a3164ecb..7378cc89 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrCheckDuplicateController.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrCheckDuplicateController.java
@@ -79,6 +79,7 @@ public class OcrCheckDuplicateController {
                 paraMap.put(config.getMeaning(), searchvalue);
             }
         }
+
         //调用查询参数解析方法，解析为queryWrapper
         queryWrapper = SearchParaFormatting.searchParaParse(queryWrapper, paraMap);
         //提报人模糊搜索
@@ -86,6 +87,19 @@ public class OcrCheckDuplicateController {
         if(StringUtils.isNotBlank(upUserName)){
             queryWrapper.like("upName",upUserName);
         }
+
+        //任务状态搜索
+        String iztaskstatus = req.getParameter("iztaskstatus");
+        if (StringUtils.isNotBlank(iztaskstatus)) {
+            if(iztaskstatus.indexOf("1")!=-1){
+                //包含未提交的情况
+                queryWrapper.apply("(id IN (SELECT PICTUREID FROM ocr_taskchild_picture WHERE STATES in ("+iztaskstatus+")) or similarity_score is null)");
+            }else{
+                queryWrapper.apply("id IN (SELECT PICTUREID FROM ocr_taskchild_picture WHERE STATES in ("+iztaskstatus+"))");
+            }
+
+        }
+
         queryWrapper.eq("tenant_id", tenantId);
         queryWrapper.eq("suspiciousfile", "0");
         queryWrapper.orderBy(true,true,"submit_date_timestamp");
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java
index 61d64ffa..51e555ab 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java
@@ -273,7 +273,7 @@ public class OcrPictureController extends BaseController {
 
         String search_month = req.getParameter("search_month");
         String ordertype = req.getParameter("ordertype");
-        queryWrapper.eq("suspiciousfile", "0");
+
         if (StringUtils.isNotBlank(ordertype)) {
             if (ordertype.equals("asc")) {
                 queryWrapper.orderByAsc("similarity_score");
@@ -328,7 +328,9 @@ public class OcrPictureController extends BaseController {
         queryWrapper = SearchParaFormatting.searchParaParse(queryWrapper, paraMap);
 
         queryWrapper.eq("tenant_id", tenantId);
+        queryWrapper.eq("suspiciousfile", "0");
         queryWrapper.isNotNull("local_pictrue_url");
+
         Page<OcrPicture> page = new Page<OcrPicture>(pageNo, pageSize);
         IPage<OcrPicture> pageList = ocrPictureService.page(page, queryWrapper);
         List<OcrPicture> ocrPictures = pageList.getRecords();