From a6d17fbdc49874c93dfa891d51b62fb12315b781 Mon Sep 17 00:00:00 2001 From: shuliYao <1397940314@qq.com> Date: Wed, 3 Apr 2024 01:49:57 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E7=AD=89=E5=90=84=E7=A7=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xiaoyao/ocr/controller/OcrCheckDuplicateController.java | 3 +++ .../xiaoyao/ocr/service/impl/OcrCheckDuplicateServiceImpl.java | 3 +-- .../src/main/resources/mapper/oa/OcrPictureMapper.xml | 2 +- .../src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) 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 4f4b9dcd..dc18b926 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 @@ -114,6 +114,9 @@ public class OcrCheckDuplicateController { OcrCheckDuplicate dto = this.ocrCheckDuplicateService.getCheckDuplicateStatus(checkDuplicateNo); if (null != dto) { + if(dto.getStatus()==2){ + return ResultVoUtil.success("查重任务执行完毕",dto); + } return ResultVoUtil.success(dto); } else { return ResultVoUtil.error(); 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 d4b694cf..c6dec878 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 @@ -478,8 +478,7 @@ public class OcrCheckDuplicateServiceImpl extends ServiceImpl pageVO = new Page(pageNo, pageSize); pageVO.setRecords(collect); - pageVO.setTotal(records.size()); - + pageVO.setTotal(ocrCheckDuplicateResults.size()); return pageVO; } diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureMapper.xml index 8a057969..3f436d16 100644 --- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureMapper.xml +++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureMapper.xml @@ -236,7 +236,7 @@ and t1.picture_id = #{pictureId} - ORDER BY t1.max_similarity desc,t1.similarity_group_order asc, t2.submit_date_timestamp DESC + ORDER BY t1.max_similarity desc,t1.similarity_group_order asc, t2.submit_date_timestamp asc LIMIT 1 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 e35b417b..288928ab 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 @@ -784,7 +784,7 @@ and t1.picture_id != #{pictureId} - order by t1.max_similarity ${oderType},t1.similarity_group_order asc,t2.submit_date_timestamp ${oderType} + order by t1.max_similarity ${oderType},t1.similarity_group_order asc,t2.submit_date_timestamp asc order by t2.submit_date_timestamp ${oderType}