退回

src/Hotline/Settings/TimeLimitDomain/ExpireTimeLimitBase.cs

@@ -78,12 +78,12 @@ public abstract class ExpireTimeLimitBase
 
     public virtual async Task<DateTime> WorkDay_ZG(DateTime date)
     {
-	    //一级部门退回中心的可退回时间为1个工作日(从派单组交办给部门就开始倒计时）；节假日派单组派给部门的工单，一级部门退回截止时间该为第2个工作日18: 00
-		var workTime = GetWorkTimes(SettingConstants.WorkTime);
-	    var (WorkBeginTime, WorkEndTime) = GetWorkTime(date, workTime);
-	    if (await IsWorkDay(date))
+	    date = date.AddDays(1);
+		if (await IsWorkDay(date))
 	    {
-		    if (date > WorkBeginTime && date < WorkEndTime)
+		    var workTime = GetWorkTimes(SettingConstants.WorkTime);
+		    var (WorkBeginTime, WorkEndTime) = GetWorkTime(date, workTime);
+			if (date > WorkBeginTime && date < WorkEndTime)
 		    {
 			    date = date.AddDays(1);
 		    }
@@ -94,7 +94,7 @@ public abstract class ExpireTimeLimitBase
 		    {
 			    date = date.AddDays(1);
 		    }
-			date = date.AddDays(1);
+			
 			date = DateTime.Parse(date.ToShortDateString() + "18:00");
 		}
 	    return date;