fix: 修改全量接口、增量重置接口

增量接口: 任务状态：6、7合并至 ocr待审核状态，通过、不通过都允许重置。
 全量接口： 9、10 统一合并为不通过状态

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());

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;

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) {
+                        && (pictureSourceResult.getTaskStatus() == 6 || pictureSourceResult.getTaskStatus() == 7) && (taskchildPicture.getStates() == 5 && taskchildPicture.getStates()==3)) {
+                    if(taskchildPicture.getStates() == 5){
                         String result = ocrPictureService.getPictureApproveResult(ocrPicture.getId());
-                    ocrPictureService.deletePictureInfo(ocrPicture.getId());
                         pictureSourceResult.setComment(result);
+                    }else{
+                        pictureSourceResult.setComment("ocr审批全部通过，由无量云发起了重置审批流程的操作。");
+                    }
+                    ocrPictureService.deletePictureInfo(ocrPicture.getId());
                     pictureSourceResult.setId(ocrPicture.getId());
                 } else {
                     return true;