|
@@ -122,6 +122,8 @@ namespace Hotline.Settings.TimeLimits
|
|
{
|
|
{
|
|
DateTime WorkBeginTime = DateTime.Parse(DateTime.Now.ToShortDateString() + " " + workTime.SettingValue[0] + ":00");
|
|
DateTime WorkBeginTime = DateTime.Parse(DateTime.Now.ToShortDateString() + " " + workTime.SettingValue[0] + ":00");
|
|
DateTime WorkEndTime = DateTime.Parse(DateTime.Now.ToShortDateString() + " " + workTime.SettingValue[1] + ":00");
|
|
DateTime WorkEndTime = DateTime.Parse(DateTime.Now.ToShortDateString() + " " + workTime.SettingValue[1] + ":00");
|
|
|
|
+
|
|
|
|
+ //处理开始时间
|
|
if (beginTime < WorkBeginTime)
|
|
if (beginTime < WorkBeginTime)
|
|
{
|
|
{
|
|
beginTime = WorkBeginTime;
|
|
beginTime = WorkBeginTime;
|
|
@@ -134,9 +136,20 @@ namespace Hotline.Settings.TimeLimits
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ int minutes = 0;
|
|
while (true)
|
|
while (true)
|
|
{
|
|
{
|
|
|
|
+ if (!IsWorkDay(beginTime))
|
|
|
|
+ {
|
|
|
|
|
|
|
|
+ }
|
|
|
|
+ else
|
|
|
|
+ {
|
|
|
|
+ beginTime = beginTime.AddDays(1);
|
|
|
|
+ WorkEndTime = WorkEndTime.AddDays(1);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|