From 1164d3be201b04c25b7dc84a10a7249fe36541ff Mon Sep 17 00:00:00 2001
From: YXY <932687738@qq.com>
Date: Sat, 23 Sep 2023 18:50:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=A8=E6=9C=88=E5=88=A0=E9=99=A4=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=A6=82=E6=9E=9C=E5=9C=A8=E4=B8=83=E5=A4=A9=E4=BB=A5?=
 =?UTF-8?q?=E5=86=85=E5=88=99=E4=BB=8E=E6=9C=88=E5=88=9D=E5=BC=80=E5=A7=8B?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ruoyi/common/utils/DateUtils.java     | 6 ++++++
 .../com/ruoyi/quartz/task/CJT/SyncAccountsJobAbstract.java  | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
index 9c5e9c9..c9b2554 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
@@ -5,6 +5,7 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.*;
 import java.time.format.DateTimeFormatter;
+import java.time.temporal.TemporalAdjusters;
 import java.util.Date;
 
 import org.apache.commons.lang3.time.DateFormatUtils;
@@ -198,4 +199,9 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
         Instant instant = time.atZone(zone).toInstant();
         return instant.toEpochMilli();
     }
+
+    public static String firstDayOfMonthToString(){
+        LocalDate firstDayOfMonth = LocalDate.now().with(TemporalAdjusters.firstDayOfMonth());
+        return firstDayOfMonth.toString();
+    }
 }
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/SyncAccountsJobAbstract.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/SyncAccountsJobAbstract.java
index 9ea51ae..4878b1c 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/SyncAccountsJobAbstract.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/SyncAccountsJobAbstract.java
@@ -200,7 +200,8 @@ public abstract class SyncAccountsJobAbstract {
             LarkCompanyRelation companyRelation = context.getCompanyRelation();
             LarkTableRelation tableRelation = context.getTableRelation();
             LarkTableRequest request = new LarkTableRequest(companyRelation.getAppId(), companyRelation.getSecret(), tableRelation.getToAppToken(), tableRelation.getToTableId());
-            String date = DateUtils.ldt2str(now.minusDays(7L), DateUtils.YYYY_MM_DD);
+            int dayOfMonth = now.getDayOfMonth();
+            String date = dayOfMonth > 7 ? DateUtils.ldt2str(now.minusDays(7L), DateUtils.YYYY_MM_DD) : DateUtils.firstDayOfMonthToString();
             List<String> recordList = erpLarkRelationMapper.queryWaitDeleteRecordList(date, getRequestUrl(), cjt);
             List<String> waitDeleteList = new ArrayList<>();
             for (String record : recordList) {