diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java index 47996215..2a92d558 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java @@ -740,6 +740,16 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl getPackageSimilarityList(Integer pageNo, Integer pageSize, String oderType, String oderName, String checkDuplicateId, String pictureId) { Page page = new Page<>(pageNo, pageSize); - return ocrtaskchildpicturemybatisdao.getPackageSimilarityList(page, checkDuplicateId, pictureId, oderType, oderName); + Page 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