fix: 解决一件查重相似度排序、分组排序问题

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java

@@ -274,10 +274,10 @@ public class OcrPictureController extends BaseController {
         if (StringUtils.isNotBlank(ordertype)) {
             if (ordertype.equals("asc")) {
                 queryWrapper.orderByAsc("similarity_score");
-                queryWrapper.orderByDesc("classificationid");
+                queryWrapper.orderByDesc("complete_similar_group_id");
             } else {
                 queryWrapper.orderByDesc("similarity_score");
-                queryWrapper.orderByDesc("classificationid");
+                queryWrapper.orderByDesc("complete_similar_group_id");
             }
         }
 
@@ -322,7 +322,6 @@ public class OcrPictureController extends BaseController {
         queryWrapper.eq("tenant_id", tenantId);
         queryWrapper.isNotNull("local_pictrue_url");
         Page<OcrPicture> page = new Page<OcrPicture>(pageNo, pageSize);
-        queryWrapper.orderByAsc("complete_similar_group_id");
         IPage<OcrPicture> pageList = ocrPictureService.page(page, queryWrapper);
         List<OcrPicture> ocrPictures = pageList.getRecords();
         List<OcrPicture> ocrPicturesNew = new ArrayList<>();

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/OcrTaskchildPictureApproVo.java

@@ -1,8 +1,6 @@
 package cn.jyjz.xiaoyao.ocr.vo;
 
-import cn.jyjz.flowable.domain.dto.HistoricTaskInstanceDto;
 import cn.jyjz.xiaoyao.common.base.jsonDomain.DateSerializer;
-import cn.jyjz.xiaoyao.oa.from.dataobject.Category;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiModel;
@@ -12,9 +10,6 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.Date;
-import java.util.List;
-
 
 @Data
 @Builder