fix: 解决系统排序等各种bug

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();

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<OcrCheckDuplicateM
 
         Page<OcrPicture> pageVO = new Page<OcrPicture>(pageNo, pageSize);
         pageVO.setRecords(collect);
-        pageVO.setTotal(records.size());
-
+        pageVO.setTotal(ocrCheckDuplicateResults.size());
         return pageVO;
     }
 

jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureMapper.xml

@@ -236,7 +236,7 @@
 		<if test="pictureId != null and pictureId != ''">
 			and t1.picture_id = #{pictureId}
 		</if>
-        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
     </select>
 

jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml

@@ -784,7 +784,7 @@
             and t1.picture_id != #{pictureId}
         </if>
         <if test="oderName == 'similarityScore'">
-            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
         </if>
         <if test="oderName == 'createdate'">
             order by t2.submit_date_timestamp ${oderType}