完善计时规则

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)