From b6c666d1079c10a6ce18d5f66b1badb27576b5f1 Mon Sep 17 00:00:00 2001 From: shanji <18996038927@163.com> Date: Sat, 16 Dec 2023 13:00:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=AE=A1=E6=97=B6=E8=A7=84?= =?UTF-8?q?=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BBWYB.Server.Business/TimeLimitTask/TimeLimitRules.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/BBWYB.Server.Business/TimeLimitTask/TimeLimitRules.cs b/BBWYB.Server.Business/TimeLimitTask/TimeLimitRules.cs index 5518d36..333142d 100644 --- a/BBWYB.Server.Business/TimeLimitTask/TimeLimitRules.cs +++ b/BBWYB.Server.Business/TimeLimitTask/TimeLimitRules.cs @@ -16,6 +16,8 @@ namespace BBWYB.Server.Business { { Enums.TimeLimitTaskType.采购任务, CalculateExpirationTimeFor8WorkHour }, { Enums.TimeLimitTaskType.合格证拟定任务, CalculateExpirationTimeFor8WorkHour }, + { Enums.TimeLimitTaskType.待核算任务, CalculateExpirationTimeFor8WorkHour }, + { Enums.TimeLimitTaskType.待议价任务, CalculateExpirationTimeFor8WorkHour }, { Enums.TimeLimitTaskType.合格证补充任务, CalculateExpirationTimeFor2WorkHour } }; } @@ -123,7 +125,7 @@ namespace BBWYB.Server.Business else if (startTime.Hour >= 9 && startTime.Hour < 12) { //计算从起点时间的9点开始到当前时间的时差 - var timeSpan = DateTime.Now - startTime.Date.AddHours(9); + var timeSpan = startTime - startTime.Date.AddHours(9); if (timeSpan.TotalHours <= 1) { addHour = 11; @@ -141,7 +143,7 @@ namespace BBWYB.Server.Business } else if (startTime.Hour >= 13 && startTime.Hour < 18) { - var timeSpan = DateTime.Now - startTime.Date.AddHours(13); + var timeSpan = startTime - startTime.Date.AddHours(13); if (timeSpan.TotalHours <= 3) { @@ -152,7 +154,7 @@ namespace BBWYB.Server.Business { addDay = CalculateAddDay(startTime.DayOfWeek); addHour = 9; - addSeconds = Convert.ToInt32(7200 - (startTime - startTime.Date.AddHours(15)).TotalSeconds); + addSeconds = Convert.ToInt32(7200 - (startTime - startTime.Date.AddHours(16)).TotalSeconds); } } else if (startTime.Hour >= 18)