页面修改

Edu.WebApi/Controllers/Duty/DutyPlanController.cs

 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) : "[正常]") : ""),