From 0eb8d22f0e8d004b1e721cdd24b8e663bc80b6a2 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 24 十月 2022 16:18:23 +0800
Subject: [PATCH] 修改选择项部门权限显示 bug
---
flower_city/src/main/java/com/dg/core/util/TestDate.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 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 c80684f..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;
@@ -112,7 +113,7 @@
}
/**
- * 判断改日期是否为工作日
+ * 判断该日期是否为工作日
*
* @param dateTime
* @return
@@ -130,4 +131,24 @@
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