Commit 8e7d5427 authored by 黄奎's avatar 黄奎

页面修改

parent 73cab111
...@@ -34,7 +34,7 @@ namespace Edu.WebApi.Timers ...@@ -34,7 +34,7 @@ namespace Edu.WebApi.Timers
} }
/// <summary> /// <summary>
/// 防止重 /// 防止重复提交
/// </summary> /// </summary>
private static int inTimer = 0; private static int inTimer = 0;
private static int inTimer2 = 0; private static int inTimer2 = 0;
...@@ -91,6 +91,7 @@ namespace Edu.WebApi.Timers ...@@ -91,6 +91,7 @@ namespace Edu.WebApi.Timers
/// <param name="e"></param> /// <param name="e"></param>
public static void DealDuty(object sender, System.Timers.ElapsedEventArgs e) public static void DealDuty(object sender, System.Timers.ElapsedEventArgs e)
{ {
double addhours = 1.5;
if (Interlocked.Exchange(ref inTimer2, 1) == 0) if (Interlocked.Exchange(ref inTimer2, 1) == 0)
{ {
var list = dutyPlanModule.GetDutyPlanPageModule(1, 20, out _, new Model.ViewModel.Duty.RB_Duty_Plan_ViewModel() var list = dutyPlanModule.GetDutyPlanPageModule(1, 20, out _, new Model.ViewModel.Duty.RB_Duty_Plan_ViewModel()
...@@ -104,8 +105,8 @@ namespace Edu.WebApi.Timers ...@@ -104,8 +105,8 @@ namespace Edu.WebApi.Timers
{ {
foreach (var subItem in item.PlanDetails) foreach (var subItem in item.PlanDetails)
{ {
var endTime = Convert.ToDateTime((Common.ConvertHelper.FormatDate(item.Date) + " " + subItem.EndTime)).AddHours(1.5); var endTime = Convert.ToDateTime((Common.ConvertHelper.FormatDate(item.Date) + " " + subItem.EndTime)).AddHours(addhours);
if (subItem.Status== Common.Enum.Duty.DutyStatusEnum.NoStart && endTime < DateTime.Now) if (subItem.Status == Common.Enum.Duty.DutyStatusEnum.NoStart && endTime < DateTime.Now)
{ {
dutyPlanModule.UpdateNoDutyModule(subItem.Id); dutyPlanModule.UpdateNoDutyModule(subItem.Id);
} }
...@@ -113,7 +114,7 @@ namespace Edu.WebApi.Timers ...@@ -113,7 +114,7 @@ namespace Edu.WebApi.Timers
} }
} }
var list2= dutyPlanModule.GetDutyPlanPageModule(1, 20, out _, new Model.ViewModel.Duty.RB_Duty_Plan_ViewModel() var list2 = dutyPlanModule.GetDutyPlanPageModule(1, 20, out _, new Model.ViewModel.Duty.RB_Duty_Plan_ViewModel()
{ {
QDutyStatus = 1, QDutyStatus = 1,
QEndDate = Common.ConvertHelper.FormatDate(DateTime.Now) QEndDate = Common.ConvertHelper.FormatDate(DateTime.Now)
...@@ -122,7 +123,7 @@ namespace Edu.WebApi.Timers ...@@ -122,7 +123,7 @@ namespace Edu.WebApi.Timers
{ {
foreach (var subItem in item.PlanDetails) foreach (var subItem in item.PlanDetails)
{ {
var endTime = Convert.ToDateTime((Common.ConvertHelper.FormatDate(item.Date) + " " + subItem.EndTime)).AddHours(1.5); var endTime = Convert.ToDateTime((Common.ConvertHelper.FormatDate(item.Date) + " " + subItem.EndTime)).AddHours(addhours);
if (subItem.Status == Common.Enum.Duty.DutyStatusEnum.DutyIng && endTime < DateTime.Now) if (subItem.Status == Common.Enum.Duty.DutyStatusEnum.DutyIng && endTime < DateTime.Now)
{ {
dutyPlanModule.UpdateDutyFinishedModule(subItem.Id); dutyPlanModule.UpdateDutyFinishedModule(subItem.Id);
...@@ -132,6 +133,5 @@ namespace Edu.WebApi.Timers ...@@ -132,6 +133,5 @@ namespace Edu.WebApi.Timers
Interlocked.Exchange(ref inTimer2, 0); Interlocked.Exchange(ref inTimer2, 0);
} }
} }
} }
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment