Commit 224b39c4 authored by 黄奎's avatar 黄奎

也没修过

parent a64cd6ff
...@@ -523,9 +523,11 @@ namespace Edu.Module.Duty ...@@ -523,9 +523,11 @@ namespace Edu.Module.Duty
result.Add("PlanDate", Common.ConvertHelper.FormatDate(model?.Date)); result.Add("PlanDate", Common.ConvertHelper.FormatDate(model?.Date));
result.Add("WeekDay", Common.ConvertHelper.GetWeekDay(model?.Date)); result.Add("WeekDay", Common.ConvertHelper.GetWeekDay(model?.Date));
result.Add("CheckTime", currentModel?.CheckTimeStr); result.Add("CheckTime", currentModel?.CheckTimeStr);
result.Add("FinishTime", currentModel?.FinishTimeStr);
result.Add("CheckLateTime", currentModel?.CheckLateTime); result.Add("CheckLateTime", currentModel?.CheckLateTime);
result.Add("FinishLateTime", currentModel?.FinishLateTime); result.Add("CheckLateTimeStr", (currentModel?.CheckLateTime > 0 ? string.Format("[迟到{0}分钟]", currentModel.CheckLateTime) : "[正常]"));
result.Add("FinishTime", currentModel?.FinishTimeStr);
result.Add("FinishTime", currentModel?.FinishTimeStr);
result.Add("FinishLateTimeStr", (currentModel.FinishLateTime > 0 ? string.Format("[早退{0}分钟]", currentModel.FinishLateTime) : "[正常]"));
result.Add("SchoolName", model?.SchoolName); result.Add("SchoolName", model?.SchoolName);
result.Add("ShiftName", currentModel?.ShiftName); result.Add("ShiftName", currentModel?.ShiftName);
result.Add("StartTime", currentModel?.StartTime); result.Add("StartTime", currentModel?.StartTime);
......
...@@ -74,12 +74,14 @@ namespace Edu.WebApi.Controllers.Duty ...@@ -74,12 +74,14 @@ namespace Edu.WebApi.Controllers.Duty
qitem.EndTime, qitem.EndTime,
qitem.Shift, qitem.Shift,
qitem.ShiftName, qitem.ShiftName,
qitem.Status, qitem.Status,
qitem.StatusStr,
qitem.CheckTimeStr, qitem.CheckTimeStr,
qitem.CheckLateTime,
CheckLateTimeStr = (qitem.CheckLateTime > 0 ? string.Format("[迟到{0}分钟]", qitem.CheckLateTime) : "[正常]"),
qitem.FinishTimeStr, qitem.FinishTimeStr,
qitem.FinishLateTime, qitem.FinishLateTime,
qitem.CheckLateTime, FinishLateTimeStr = (qitem.FinishLateTime > 0 ? string.Format("[早退{0}分钟]", qitem.FinishLateTime) : "[正常]"),
}) })
}); });
} }
...@@ -179,8 +181,10 @@ namespace Edu.WebApi.Controllers.Duty ...@@ -179,8 +181,10 @@ namespace Edu.WebApi.Controllers.Duty
item.TotalHandoverCount, item.TotalHandoverCount,
currentModel.CheckTimeStr, currentModel.CheckTimeStr,
currentModel.CheckLateTime, currentModel.CheckLateTime,
CheckLateTimeStr = (currentModel.CheckLateTime > 0 ? string.Format("[迟到{0}分钟]", currentModel.CheckLateTime) : "[正常]"),
currentModel.FinishTimeStr, currentModel.FinishTimeStr,
currentModel.FinishLateTime, currentModel.FinishLateTime,
FinishLateTimeStr = (currentModel.FinishLateTime > 0 ? string.Format("[早退{0}分钟]", currentModel.FinishLateTime) : "[正常]"),
}); });
} }
pageModel.Count = rowsCount; pageModel.Count = rowsCount;
......
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