|
|
|
@ -741,7 +741,8 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if((taskChildPictureVo.getStates()==3 || taskChildPictureVo.getStates()==5)&& taskChildPictureVo.getHistoryStates()==null){
|
|
|
|
|
if((taskChildPictureVo.getStates()==3 || taskChildPictureVo.getStates()==5)&&
|
|
|
|
|
(taskChildPictureVo.getHistoryStates()==null || taskChildPictureVo.getHistoryStates()==1)){
|
|
|
|
|
int historyStates = 1;
|
|
|
|
|
if(taskChildPictureVo.getStates()==3){
|
|
|
|
|
historyStates = 2;
|
|
|
|
@ -764,7 +765,8 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
|
|
|
|
|
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){
|
|
|
|
|
if((record.getStates()==3 || record.getStates()==5)&&
|
|
|
|
|
(record.getHistoryStates()==null || record.getHistoryStates()==1)){
|
|
|
|
|
int historyStates = 1;
|
|
|
|
|
if(record.getStates()==3){
|
|
|
|
|
historyStates = 2;
|
|
|
|
|