From cb4138e859756e7e2a702dbce574e9c769420337 Mon Sep 17 00:00:00 2001
From: shuliYao <1397940314@qq.com>
Date: Mon, 20 May 2024 15:28:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E5=85=A8=E9=87=8F?=
 =?UTF-8?q?=E6=8B=89=E5=8F=96=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xiaoyao/ocr/api/entity/PictureSourceAllPullMsg.java   | 8 ++++----
 .../ocr/api/thread/PullAllPictureSourceThread.java        | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/entity/PictureSourceAllPullMsg.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/entity/PictureSourceAllPullMsg.java
index b8d1de83..61ae256f 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/entity/PictureSourceAllPullMsg.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/entity/PictureSourceAllPullMsg.java
@@ -40,12 +40,12 @@ public class PictureSourceAllPullMsg {
     /**
      * 当前日期任务总数
      */
-    private Integer timeTaskCount = 0;
+    private int timeTaskCount = 0;
 
     /**
      * 已拉取任务总数
      */
-    private Integer pullTaskCount = 0;
+    private int pullTaskCount = 0;
 
     /**
      * 拉取开始日期
@@ -91,10 +91,10 @@ public class PictureSourceAllPullMsg {
         this.accountNo = null;
         this.beginDateTime = null;
         this.endDateTime = null;
-        this.pullTaskCount = null;
+        this.pullTaskCount = 0;
         this.timeStr = null;
         this.page = null;
-        this.timeTaskCount = null;
+        this.timeTaskCount = 0;
         this.lock = false;
         return true;
     }
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/thread/PullAllPictureSourceThread.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/thread/PullAllPictureSourceThread.java
index 34ff582a..eaefa460 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/thread/PullAllPictureSourceThread.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/thread/PullAllPictureSourceThread.java
@@ -165,6 +165,7 @@ public class PullAllPictureSourceThread implements Runnable{
                     logger.debug("全量拉取中...当前日期:{},页码:{},总数:{}", DateFormatUtils.format(startDate,"yyyy-MM-dd"),pageNo,apiPage.getTotal());
                 } catch (Exception e) {
                     logger.error("无量云全量拉取返回错误,error:",e.getMessage());
+                    continue;
                 }
 
             }