From 48a62ed1badc7b68a81e253240672b15d4c3d74a Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期二, 18 十月 2022 18:31:01 +0800
Subject: [PATCH] 修改获取节假日依赖及代码
---
flower_city/src/main/java/com/dg/core/util/TestDate.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/util/TestDate.java b/flower_city/src/main/java/com/dg/core/util/TestDate.java
index 0c31040..1a13a9a 100644
--- a/flower_city/src/main/java/com/dg/core/util/TestDate.java
+++ b/flower_city/src/main/java/com/dg/core/util/TestDate.java
@@ -3,6 +3,7 @@
import cn.hutool.core.date.DateTime;
import com.alibaba.fastjson.JSONObject;
+import com.iceyyy.workday.WorkUtils;
import com.squareup.okhttp.OkHttpClient;
import com.squareup.okhttp.Request;
import com.squareup.okhttp.Response;
@@ -137,12 +138,13 @@
* @return
*/
public DateTime nextWeekDay(DateTime dateTime){
- TestDate td=new TestDate();
Calendar calendar = Calendar.getInstance();
calendar.setTime(dateTime);
while (true){
calendar.add(calendar.DATE,1);
- if (td.isWeekday(new DateTime(calendar))){
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+ String dateTimeToday = sdf.format(calendar.getTime());
+ if (!WorkUtils.isWorkendDay(dateTimeToday)){
return new DateTime(calendar);//返回日期
}
}
--
Gitblit v1.7.1