From cf53986d7c4cf517509af772f7591f1f22b69d89 Mon Sep 17 00:00:00 2001 From: shuliYao <1397940314@qq.com> Date: Sun, 19 May 2024 23:22:15 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3ai=E6=9F=A5=E9=87=8D?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=EF=BC=8C=E6=97=A0=E6=B3=95=E5=B0=86=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E4=BB=BB=E5=8A=A1=E6=8E=92=E9=99=A4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OcrSearchHistoryServiceImpl.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java index 7351d5e8..2637d560 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java @@ -365,6 +365,18 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl failedPictureIds = taskchildPictureMybatisDao.getSimilarityList(pictureIds); 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) { failedList.add(picture.getId()); } else if (picture.getHistoryStates() == 1) {