|
|
@ -365,6 +365,18 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl<OcrSearchHistoryMap
|
|
|
|
if(pictureIds.size()!=0){
|
|
|
|
if(pictureIds.size()!=0){
|
|
|
|
List<OcrTaskChildPictureVo> failedPictureIds = taskchildPictureMybatisDao.getSimilarityList(pictureIds);
|
|
|
|
List<OcrTaskChildPictureVo> failedPictureIds = taskchildPictureMybatisDao.getSimilarityList(pictureIds);
|
|
|
|
for (OcrTaskChildPictureVo picture : failedPictureIds) {
|
|
|
|
for (OcrTaskChildPictureVo picture : failedPictureIds) {
|
|
|
|
|
|
|
|
//判断是否是历史任务,历史任务没有审批记录,最终状态就是当前任务的状态。
|
|
|
|
|
|
|
|
if((picture.getStates()==3 || picture.getStates()==5)&&
|
|
|
|
|
|
|
|
(picture.getHistoryStates()==null || picture.getHistoryStates()==1)){
|
|
|
|
|
|
|
|
int historyStates = 1;
|
|
|
|
|
|
|
|
if(picture.getStates()==3){
|
|
|
|
|
|
|
|
historyStates = 2;
|
|
|
|
|
|
|
|
}else if(picture.getStates()==5){
|
|
|
|
|
|
|
|
historyStates = 3;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
picture.setHistoryStates(historyStates);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (picture.getHistoryStates() == 3) {
|
|
|
|
if (picture.getHistoryStates() == 3) {
|
|
|
|
failedList.add(picture.getId());
|
|
|
|
failedList.add(picture.getId());
|
|
|
|
} else if (picture.getHistoryStates() == 1) {
|
|
|
|
} else if (picture.getHistoryStates() == 1) {
|
|
|
|