Merge pull request 'fix/userSearch_0402' (#58) from fix/userSearch_0402 into test

Reviewed-on: #58

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

@@ -283,9 +283,9 @@ public class OcrPictureController extends BaseController {
         String orderByTime = req.getParameter("orderByTime");
         if (StringUtils.isNotBlank(orderByTime)) {
             if (orderByTime.equals("asc")) {
-                queryWrapper.orderByAsc("create_time");
+                queryWrapper.orderByAsc("submit_date_timestamp");
             } else {
-                queryWrapper.orderByDesc("create_time");
+                queryWrapper.orderByDesc("submit_date_timestamp");
             }
         }
 

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

@@ -1,5 +1,6 @@
 package cn.jyjz.xiaoyao.ocr.controller;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.jyjz.xiaoyao.common.base.service.UserTokenService;
 import cn.jyjz.xiaoyao.common.base.util.RequestBaseUtil;
 import cn.jyjz.xiaoyao.common.base.vo.ResultVo;
@@ -127,16 +128,24 @@ public class OcrTaskchildDubiousFileController  {
 
             QueryWrapper<OcrTaskchildDubiousFile> dubiouswrapper = new QueryWrapper<>();
             dubiouswrapper.eq("userid",userToken.getUserid()).eq("picture_id",childpictureid);
+
+
             OcrTaskchildDubiousFile one = ocrTaskchildDubiousFileService.getOne(dubiouswrapper);
-            fileList.add(one);
+            if(one != null){
+                fileList.add(one);
+            }
         }
 
+        //无对应图片信息
+        if(CollUtil.isEmpty(saveList)){
+            return ResultVoUtil.error("可疑文件不存在！");
+        }
         ocrpictureservice.updateBatchById(saveList);
 
 
         //根据具体情况 判断 是否需要 进行数据返回， 默认不返回数据
 
-        return ocrTaskchildDubiousFileService.removeByIds(fileList)?ResultVoUtil.success():ResultVoUtil.error();
+        return ocrTaskchildDubiousFileService.removeByIds(fileList)?ResultVoUtil.success():ResultVoUtil.error("可疑文件不存在！");
     }
     /**
      * 添加

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrCheckDuplicateServiceImpl.java

@@ -450,9 +450,12 @@ public class OcrCheckDuplicateServiceImpl extends ServiceImpl<OcrCheckDuplicateM
         List<OcrCheckDuplicateResult> ocrCheckDuplicateResults = checkDuplicateResultService.selectListByCheckDuplicateNo(checkDuplicateNo, tenantId);
         //调用查询参数解析方法，解析为queryWrapper
         List<Long> picIdList = new ArrayList<>();
+
+        Map<Long,Double> picMaxScoreMap = new HashMap<>();
         if(CollUtil.isNotEmpty(ocrCheckDuplicateResults)){
             for (OcrCheckDuplicateResult ocrCheckDuplicateResult : ocrCheckDuplicateResults) {
                 picIdList.add(ocrCheckDuplicateResult.getPictureId());
+                picMaxScoreMap.put(ocrCheckDuplicateResult.getPictureId(),ocrCheckDuplicateResult.getMaxSimilarity());
             }
         }
         if(CollUtil.isEmpty(picIdList)){
@@ -467,7 +470,17 @@ public class OcrCheckDuplicateServiceImpl extends ServiceImpl<OcrCheckDuplicateM
         Page<OcrPicture> page = new Page<OcrPicture>(pageNo, pageSize);
         IPage<OcrPicture> pageList = pictureService.page(page, queryWrapper);
 
-        return pageList;
+
+        List<OcrPicture> records = pageList.getRecords();
+        records.forEach(picture ->picture.setSimilarityscore(picMaxScoreMap.get(picture.getId()).intValue()));
+        List<OcrPicture> collect = records.stream().sorted(Comparator.comparing(OcrPicture::getSimilarityscore).reversed()).collect(Collectors.toList());
+
+
+        Page<OcrPicture> pageVO = new Page<OcrPicture>(pageNo, pageSize);
+        pageVO.setRecords(collect);
+        pageVO.setTotal(records.size());
+
+        return pageVO;
     }
 
 }