diff --git a/Edu.WebApi/Controllers/Duty/DutyPlanController.cs b/Edu.WebApi/Controllers/Duty/DutyPlanController.cs index 6b021ad0ec446bbe2c38dbcffd16500b67af024a..886e52578e67264061e70f98c48e894eb9d19e80 100644 --- a/Edu.WebApi/Controllers/Duty/DutyPlanController.cs +++ b/Edu.WebApi/Controllers/Duty/DutyPlanController.cs @@ -1,5 +1,6 @@ using Edu.Cache.User; using Edu.Common.API; +using Edu.Common.Enum.Duty; using Edu.Common.Plugin; using Edu.Model.ViewModel.Duty; using Edu.Module.Duty; @@ -144,9 +145,14 @@ namespace Edu.WebApi.Controllers.Duty { jiaoBanMan = string.Join(",", dic["previous"].Select(qitem => qitem.DutyManName)); ; } + DutyStatusEnum NewStatus = Common.Enum.Duty.DutyStatusEnum.NoStart; if (currentModel.Status == Common.Enum.Duty.DutyStatusEnum.NoStart) { - currentModel.Status= dutyPlanModule.CalcDutyPlanStatusModule(item.Date, currentModel.StartTime, currentModel.EndTime); + NewStatus = dutyPlanModule.CalcDutyPlanStatusModule(item.Date, currentModel.StartTime, currentModel.EndTime); + } + else + { + NewStatus = currentModel.Status; } result.Add(new { @@ -166,12 +172,12 @@ namespace Edu.WebApi.Controllers.Duty item.CreateByName, currentModel.Status, currentModel.StatusStr, + NewStatus, item.TotalBurstCount, item.TotalHandoverCount, currentModel.CheckTimeStr, currentModel.CheckLateTime, CheckLateTimeStr = (currentModel.CheckTimeStr != "未打å¡" ? (currentModel.CheckLateTime > 0 ? string.Format("[迟到{0}分钟]", currentModel.CheckLateTime) : "[æ£å¸¸]") : ""), - currentModel.FinishTimeStr, currentModel.FinishLateTime, FinishLateTimeStr = (currentModel.FinishTimeStr != "未打å¡" ? (currentModel.FinishLateTime > 0 ? string.Format("[早退{0}分钟]", currentModel.FinishLateTime) : "[æ£å¸¸]") : ""),