fix: ai审批列表及相似度列表返回查重信息 #50

Merged
sunchenliang merged 1 commits from sunchenliang into test 1 year ago

@ -41,8 +41,10 @@ public class OcrTaskchildDubiousFileServiceImpl extends ServiceImpl<OcrTaskchild
@Resource @Resource
private OcrTaskchildPictureService ocrTaskchildPictureService; private OcrTaskchildPictureService ocrTaskchildPictureService;
/** /**
* , * ,
*
* @param pageNo * @param pageNo
* @param pageSize * @param pageSize
* @param orderbyname * @param orderbyname
@ -53,14 +55,14 @@ public class OcrTaskchildDubiousFileServiceImpl extends ServiceImpl<OcrTaskchild
@Override @Override
public Page<OcrTaskChildPictureVo> dubiousfilelist(Integer pageNo, Integer pageSize, String orderbyname, UserToken userToken, String tenantId) { public Page<OcrTaskChildPictureVo> dubiousfilelist(Integer pageNo, Integer pageSize, String orderbyname, UserToken userToken, String tenantId) {
Page<OcrTaskChildPictureVo> objectPage = new Page<>(Integer.valueOf(pageNo),Integer.valueOf(pageSize)); Page<OcrTaskChildPictureVo> objectPage = new Page<>(Integer.valueOf(pageNo), Integer.valueOf(pageSize));
//获取可疑文件图片列表 //获取可疑文件图片列表
QueryWrapper<OcrTaskchildDubiousFile> dubiouswrapper = new QueryWrapper<>(); QueryWrapper<OcrTaskchildDubiousFile> dubiouswrapper = new QueryWrapper<>();
dubiouswrapper.eq("userid",userToken.getUserid()); dubiouswrapper.eq("userid", userToken.getUserid());
dubiouswrapper.eq("tenantid",tenantId); dubiouswrapper.eq("tenantid", tenantId);
List<OcrTaskchildDubiousFile> list = this.list(dubiouswrapper); List<OcrTaskchildDubiousFile> list = this.list(dubiouswrapper);
if(list.size()==0){ if (list.size() == 0) {
return objectPage; return objectPage;
} }
@ -71,17 +73,18 @@ public class OcrTaskchildDubiousFileServiceImpl extends ServiceImpl<OcrTaskchild
String userNodeType = ProcessConstant.userNodeType.getOrDefault(userToken.getNodeType(), "一级审批"); String userNodeType = ProcessConstant.userNodeType.getOrDefault(userToken.getNodeType(), "一级审批");
List<OcrTaskChildPictureVo> taskChildPictures = ocrTaskchildPictureService.getDubiousfileList(new ArrayList<>(pictureIdList), userNodeType); List<OcrTaskChildPictureVo> taskChildPictures = ocrTaskchildPictureService.getDubiousfileList(new ArrayList<>(pictureIdList), userNodeType);
if(CollUtil.isNotEmpty(taskChildPictures)){ if (CollUtil.isNotEmpty(taskChildPictures)) {
//按时间字段排序 //按时间字段排序
if("desc".equals(orderbyname)){ if ("desc".equals(orderbyname)) {
taskChildPictures.sort(Comparator.comparing(OcrTaskChildPictureVo::getSubmitDateTimestamp).reversed()); taskChildPictures.sort(Comparator.comparing(OcrTaskChildPictureVo::getSubmitDateTimestamp).reversed());
}else{ } else {
taskChildPictures.sort(Comparator.comparing(OcrTaskChildPictureVo::getSubmitDateTimestamp)); taskChildPictures.sort(Comparator.comparing(OcrTaskChildPictureVo::getSubmitDateTimestamp));
} }
List<OcrTaskChildPictureVo> records = taskChildPictures.stream().skip((pageNo - 1) * pageSize).limit(pageSize).collect(Collectors.toList()); List<OcrTaskChildPictureVo> records = taskChildPictures.stream().skip((pageNo - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
objectPage.setRecords(records); objectPage.setRecords(records);
objectPage.setTotal(taskChildPictures.size()); objectPage.setTotal(taskChildPictures.size());
}
return objectPage; return objectPage;
} }
} }

Loading…
Cancel
Save