From 0f78a00c44f6d2fe02bc21e238f886fd976ff56d Mon Sep 17 00:00:00 2001
From: shuliYao <1397940314@qq.com>
Date: Mon, 6 May 2024 11:40:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E6=9F=A5=E9=87=8D=E4=BB=BB=E5=8A=A1=E7=BA=BF=E7=A8=8B=E4=B8=8D?=
 =?UTF-8?q?=E5=81=9C=E6=AD=A2=EF=BC=8C=E5=8F=AF=E4=BB=A5=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=A4=B9=E6=B2=A1=E6=9C=89=E5=90=AB=E6=9C=89=E7=BC=A9=E7=95=A5?=
 =?UTF-8?q?=E5=9B=BE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/OcrCheckDuplicateServiceImpl.java        | 15 ++++++++++++++-
 .../mapper/oa/OcrTaskchildPictureMapper.xml       |  1 +
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrCheckDuplicateServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrCheckDuplicateServiceImpl.java
index 422962f..ad62e84 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrCheckDuplicateServiceImpl.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrCheckDuplicateServiceImpl.java
@@ -189,8 +189,13 @@ public class OcrCheckDuplicateServiceImpl extends ServiceImpl<OcrCheckDuplicateM
             int  similarityGroupOrder = 1;
             //阈值分组map
             Map<String,Integer> similarityGroupOrderMap = new HashMap<>();
-            //1.开启比对任务
+            //1.开启比对任务s
             for (OcrPicture ocrPicture : ocrPictureList) {
+                //检查查重任务是否关闭
+                if(!this.isCheckDuplicateExist(checkDuplicateId)){
+                    logger.info("查重任务，已取消!");
+                    return;
+                }
 
                 // 添加相似度百分百分组id
                 if (ObjectUtils.isEmpty(ocrPicture.getCompleteSimilarGroupId())) {
@@ -330,6 +335,14 @@ public class OcrCheckDuplicateServiceImpl extends ServiceImpl<OcrCheckDuplicateM
 
     }
 
+    private boolean isCheckDuplicateExist(Long checkDuplicateId) {
+        OcrCheckDuplicate checkDuplicate =  baseMapper.selectById(checkDuplicateId);
+        if(checkDuplicate!=null && checkDuplicate.getIsDelete()!=1){
+            return true;
+        }
+        return  false;
+    }
+
     /**
      * 保存查重数据
      * @return
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 9b78dd4..7663891 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
@@ -986,6 +986,7 @@
                t2.FROMPROJECTNAME       fromProjectName,
                t2.FINISHTIME            finishTime,
                t1.imgUrl,
+               t1.server_thumbnail_url  serverThumbnailUrl,
                ifnull(t3.STATSHIS, 1)   historyStates,
                t1.submit_date_timestamp submitDateTimestamp,
                t1.photo_date_timestamp  photoDateTimestamp,