From 01e45371334efcf7f4ccf2fbf8343ec063aa1ff2 Mon Sep 17 00:00:00 2001
From: dy <dingyang@lnfxkj.tech>
Date: 星期六, 19 四月 2025 11:14:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobServiceImpl.java |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobServiceImpl.java b/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobServiceImpl.java
index 730bba1..8f1ad5b 100644
--- a/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobServiceImpl.java
+++ b/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobServiceImpl.java
@@ -152,14 +152,13 @@
         LocalDate yesterday = LocalDate.now().minusDays(1);
         LocalDateTime yesterdayMidnight = yesterday.atStartOfDay();
         boolean continueFlag = true;
-        Integer currentPage = 49;
+        Integer currentPage = 1;
         ApsWorkOrderJobParam param=new ApsWorkOrderJobParam();
         param.setPageIndex(currentPage);
         param.setDocState(Arrays.asList(0,1,2,4));
         param.setBeginDate(yesterdayMidnight.format(formatter));
         param.setEndDate(today.format(formatter));
         param.setPageSize(1000);
-        batchSaveByPager(param);
         while (continueFlag){
             param.setPageIndex(currentPage);
             continueFlag= batchSaveByPager(param);
@@ -191,7 +190,7 @@
                     int ct= batchInsertApsWorkOrderJob(param, result);
                     jobLog.setResult("ok save "+ct);
                     jobLogMapper.updateApsWorkOrderJobLog(jobLog);
-                    return false;
+                    return true;
                 }else {
                     jobLog.setResult("ok receive 0");
                     jobLogMapper.updateApsWorkOrderJobLog(jobLog);

--
Gitblit v1.9.3