|
|
|
@ -740,6 +740,16 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
|
|
|
|
|
taskChildPictureVo.setHigh(dimensions[1]);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if((taskChildPictureVo.getStates()==3 || taskChildPictureVo.getStates()==5)&& taskChildPictureVo.getHistoryStates()==null){
|
|
|
|
|
int historyStates = 1;
|
|
|
|
|
if(taskChildPictureVo.getStates()==3){
|
|
|
|
|
historyStates = 2;
|
|
|
|
|
}else if(taskChildPictureVo.getStates()==5){
|
|
|
|
|
historyStates = 3;
|
|
|
|
|
}
|
|
|
|
|
taskChildPictureVo.setHistoryStates(historyStates);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
objectPage.setRecords(collect);
|
|
|
|
|
objectPage.setTotal(taskChildPictures.size());
|
|
|
|
@ -751,7 +761,20 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
|
|
|
|
|
@Override
|
|
|
|
|
public Page<OcrTaskChildPictureVo> getPackageSimilarityList(Integer pageNo, Integer pageSize, String oderType, String oderName, String checkDuplicateId, String pictureId) {
|
|
|
|
|
Page<OcrTaskChildPictureVo> page = new Page<>(pageNo, pageSize);
|
|
|
|
|
return ocrtaskchildpicturemybatisdao.getPackageSimilarityList(page, checkDuplicateId, pictureId, oderType, oderName);
|
|
|
|
|
Page<OcrTaskChildPictureVo> result = ocrtaskchildpicturemybatisdao.getPackageSimilarityList(page, checkDuplicateId, pictureId, oderType, oderName);
|
|
|
|
|
//历史数据,因为没有审核记录所以需要填补最终状态.
|
|
|
|
|
for (OcrTaskChildPictureVo record : result.getRecords()) {
|
|
|
|
|
if((record.getStates()==3 || record.getStates()==5)&& record.getHistoryStates()==null){
|
|
|
|
|
int historyStates = 1;
|
|
|
|
|
if(record.getStates()==3){
|
|
|
|
|
historyStates = 2;
|
|
|
|
|
}else if(record.getStates()==5){
|
|
|
|
|
historyStates = 3;
|
|
|
|
|
}
|
|
|
|
|
record.setHistoryStates(historyStates);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|