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 recordList = erpLarkRelationMapper.queryWaitDeleteRecordList(date, getRequestUrl(), cjt); List waitDeleteList = new ArrayList<>(); for (String record : recordList) {