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/service/impl/GuideRepairOrderServiceImpl.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
index 15a91a7..69b31a4 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
@@ -12,6 +12,7 @@
import com.dg.core.util.Snowflake;
import com.dg.core.util.TestDate;
import com.dg.core.util.WxUtil;
+import com.iceyyy.workday.WorkUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -278,7 +279,9 @@
LocalDateTime endTime = LocalDate.now().atTime(23, 59, 59);//今天结束时间
TestDate td = new TestDate();
DateTime dateTimeUser= DateTime.now();
- if (td.isWeekday(dateTimeUser)){
+ String format="YYYYMMdd";
+ String dateTimeToday=dateTimeUser.toString(format);
+ if (!WorkUtils.isWorkendDay(dateTimeToday)){
if ( LocalDateTime.now().isAfter(startTime)&&LocalDateTime.now().isBefore(morningStartTime)){//提交时间是上午上班前
guideRepairOrder.setTimeoutTime(LocalDate.now().
atTime(9+automessageSysSettings.getTimeoutNotificationNum(),0,0));
--
Gitblit v1.7.1