From c8e78e38d4a339599801a5cc97716053c4caea6d Mon Sep 17 00:00:00 2001
From: shuliYao <1397940314@qq.com>
Date: Thu, 23 May 2024 17:20:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=85=A8=E9=87=8F?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E3=80=81=E5=A2=9E=E9=87=8F=E9=87=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20=20=E5=A2=9E=E9=87=8F=E6=8E=A5=E5=8F=A3:?=
 =?UTF-8?q?=20=E4=BB=BB=E5=8A=A1=E7=8A=B6=E6=80=81=EF=BC=9A6=E3=80=817?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6=E8=87=B3=20ocr=E5=BE=85=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=EF=BC=8C=E9=80=9A=E8=BF=87=E3=80=81=E4=B8=8D?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87=E9=83=BD=E5=85=81=E8=AE=B8=E9=87=8D=E7=BD=AE?=
 =?UTF-8?q?=E3=80=82=20=20=E5=85=A8=E9=87=8F=E6=8E=A5=E5=8F=A3=EF=BC=9A=20?=
 =?UTF-8?q?9=E3=80=8110=20=E7=BB=9F=E4=B8=80=E5=90=88=E5=B9=B6=E4=B8=BA?=
 =?UTF-8?q?=E4=B8=8D=E9=80=9A=E8=BF=87=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocr/service/impl/OcrPictureServiceImpl.java        |  2 +-
 .../service/impl/OcrTaskchildPictureServiceImpl.java   |  2 +-
 .../java/cn/jyjz/xiaoyao/ocr/thread/TaskQueue.java     | 10 +++++++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java
index 70c29b32..13bfcf0e 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java
@@ -776,7 +776,7 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
                 saveBatch = this.saveOrUpdateBatch(ocrPictureList);
                 //通过与不通过的任务需要直接创建任务。
                 for (OcrPicture picture : ocrPictureList) {
-                    if("8".equals(picture.getTaskstatus()) || "9".equals(picture.getTaskstatus())){
+                    if("8".equals(picture.getTaskstatus()) || "9".equals(picture.getTaskstatus()) || "10".equals(picture.getTaskstatus())){
                        boolean taskSaveResult= ocrTaskchildPictureService.createTaskOldPicture(picture);
                        if(!taskSaveResult){
                          log.error("旧数据创建任务失败,任务id:{}",picture.getTaskId());
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 b9a72a50..0237501c 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
@@ -823,7 +823,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
         int states = 0;
         if("8".equals(picture.getTaskstatus())){
             states = 3;
-        }else if ("9".equals(picture.getTaskstatus())){
+        }else if ("9".equals(picture.getTaskstatus()) || "10".equals(picture.getTaskstatus())){
             states= 5;
         }else{
             return false;
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/TaskQueue.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/TaskQueue.java
index d644d291..a16c266f 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/TaskQueue.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/TaskQueue.java
@@ -48,10 +48,14 @@ public class TaskQueue {
             if (ocrPicture != null) {
                 OcrTaskchildPicture taskchildPicture = ocrPictureService.getOcrTaskChildPictureByPictureId(ocrPicture.getId().toString());
                 if (taskchildPicture != null && pictureSourceResult.getTaskStatus() != null
-                        && pictureSourceResult.getTaskStatus() == 6 && taskchildPicture.getStates() == 5) {
-                    String result = ocrPictureService.getPictureApproveResult(ocrPicture.getId());
+                        && (pictureSourceResult.getTaskStatus() == 6 || pictureSourceResult.getTaskStatus() == 7) && (taskchildPicture.getStates() == 5 && taskchildPicture.getStates()==3)) {
+                    if(taskchildPicture.getStates() == 5){
+                        String result = ocrPictureService.getPictureApproveResult(ocrPicture.getId());
+                        pictureSourceResult.setComment(result);
+                    }else{
+                        pictureSourceResult.setComment("ocr审批全部通过，由无量云发起了重置审批流程的操作。");
+                    }
                     ocrPictureService.deletePictureInfo(ocrPicture.getId());
-                    pictureSourceResult.setComment(result);
                     pictureSourceResult.setId(ocrPicture.getId());
                 } else {
                     return true;