From 1fb23cbeeaaeda0a66cf8fe8977c3f5915743cc7 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期五, 21 十月 2022 15:13:10 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/util/TestDate.java | 41 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 41 insertions(+), 0 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 ee4f21f..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
@@ -1,7 +1,9 @@
package com.dg.core.util;
+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;
@@ -110,4 +112,43 @@
return dateList;
}
+ /**
+ * 判断该日期是否为工作日
+ *
+ * @param dateTime
+ * @return
+ */
+ public Boolean isWeekday(DateTime dateTime){
+ TestDate td=new TestDate();
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(dateTime);
+ Set<String> jjr = td.JJR(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH));
+ String strdate = dateTime.toString("yyyy-MM-dd");
+ for (String ans: jjr ) {
+ if (ans.equals(strdate))
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * 获取该日期的下个工作日是多少
+ *
+ * @param dateTime
+ * @return
+ */
+ public DateTime nextWeekDay(DateTime dateTime){
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(dateTime);
+ while (true){
+ calendar.add(calendar.DATE,1);
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+ String dateTimeToday = sdf.format(calendar.getTime());
+ if (!WorkUtils.isWorkendDay(dateTimeToday)){
+ return new DateTime(calendar);//返回日期
+ }
+ }
+
+ }
+
}
--
Gitblit v1.7.1