|
|
@ -294,7 +294,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
|
|
|
|
//用于标记相似度是否存在百分百的情况
|
|
|
|
//用于标记相似度是否存在百分百的情况
|
|
|
|
for (OcrPicture ocrPicture : ocrPictureList) {
|
|
|
|
for (OcrPicture ocrPicture : ocrPictureList) {
|
|
|
|
OcrTaskchildPicture one = this.getOne(new LambdaQueryWrapper<OcrTaskchildPicture>().eq(OcrTaskchildPicture::getPictureid, ocrPicture.getId()));
|
|
|
|
OcrTaskchildPicture one = this.getOne(new LambdaQueryWrapper<OcrTaskchildPicture>().eq(OcrTaskchildPicture::getPictureid, ocrPicture.getId()));
|
|
|
|
if(ObjectUtils.isNotEmpty(one)){
|
|
|
|
if (ObjectUtils.isNotEmpty(one)) {
|
|
|
|
continue;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//查询项目对象
|
|
|
|
//查询项目对象
|
|
|
@ -369,7 +369,9 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
|
|
|
|
ocrTaskchildPicture.setUserapproveList(userapproveDtos);
|
|
|
|
ocrTaskchildPicture.setUserapproveList(userapproveDtos);
|
|
|
|
if (null != userToken) {
|
|
|
|
if (null != userToken) {
|
|
|
|
Optional<Userapprove> first = list.stream().filter(userapprove -> userapprove.getUserid().toString().equals(userToken.getUserid())).findFirst();
|
|
|
|
Optional<Userapprove> first = list.stream().filter(userapprove -> userapprove.getUserid().toString().equals(userToken.getUserid())).findFirst();
|
|
|
|
ocrTaskchildPicture.setUserapprove(first.orElse(new Userapprove()));
|
|
|
|
Userapprove userapprove = new Userapprove();
|
|
|
|
|
|
|
|
userapprove.setStatshis(1);
|
|
|
|
|
|
|
|
ocrTaskchildPicture.setUserapprove(first.orElse(userapprove));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//查询图片对象
|
|
|
|
//查询图片对象
|
|
|
|
OcrPicture ocrPicture = this.ocrPictureService.selectDtoById(ocrTaskchildPicture.getPictureid());
|
|
|
|
OcrPicture ocrPicture = this.ocrPictureService.selectDtoById(ocrTaskchildPicture.getPictureid());
|
|
|
@ -627,7 +629,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public List<OcrTaskChildPictureVo> getPictureHistoryList(List<String> pictureIds, String taskname) {
|
|
|
|
public List<OcrTaskChildPictureVo> getPictureHistoryList(List<String> pictureIds, String taskname) {
|
|
|
|
return ocrtaskchildpicturemybatisdao.getPictureHistoryList(pictureIds,taskname);
|
|
|
|
return ocrtaskchildpicturemybatisdao.getPictureHistoryList(pictureIds, taskname);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
@ -680,8 +682,8 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public Page<OcrTaskChildPictureVo> getPackageSimilarityList(Integer pageNo, Integer pageSize, String oderType, String oderName, String checkDuplicateId, String pictureId) {
|
|
|
|
public Page<OcrTaskChildPictureVo> getPackageSimilarityList(Integer pageNo, Integer pageSize, String oderType, String oderName, String checkDuplicateId, String pictureId) {
|
|
|
|
Page<OcrTaskChildPictureVo> page = new Page<>(pageNo,pageSize);
|
|
|
|
Page<OcrTaskChildPictureVo> page = new Page<>(pageNo, pageSize);
|
|
|
|
|
|
|
|
|
|
|
|
return ocrtaskchildpicturemybatisdao.getPackageSimilarityList(page,checkDuplicateId,pictureId,oderType,oderName);
|
|
|
|
return ocrtaskchildpicturemybatisdao.getPackageSimilarityList(page, checkDuplicateId, pictureId, oderType, oderName);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|