Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

Edu.Common/Enum/Duty/DutyStatusEnum.cs

@@ -20,9 +20,15 @@ namespace Edu.Common.Enum.Duty
         DutyIng = 1,
 
         /// <summary>
-        /// 值班完成
+        /// 已完成
         /// </summary>
-        [EnumField("值班完成")]
+        [EnumField("已完成")]
         DutyFinished = 2,
+
+        /// <summary>
+        /// 未值班
+        /// </summary>
+        [EnumField("未值班")]
+        NoDuty = 3,
     }
 }

Edu.Model/ViewModel/Duty/RB_Duty_PlanDetails_ViewModel.cs

@@ -58,35 +58,11 @@ namespace Edu.Model.ViewModel.Duty
         {
             get
             {
-                string str = "未开始";
-                if (this.Status == 1)
-                {
-                    str = "已打卡";
-                }
-                if (this.Status == 2)
-                {
-                    str = "已交接";
-                }
-                return str;
+                return Common.Plugin.EnumHelper.ToName(this.Status);
             }
         }
 
-        /// <summary>
-        /// 值班状态(见枚举)
-        /// </summary>
-        public DutyStatusEnum DutyStatus { get; set; }
 
-        /// <summary>
-        /// 值班状态字符串
-        /// </summary>
-        public string DutyStatusStr
-        {
-            get
-            {
-                string str = Common.Plugin.EnumHelper.ToName(this.DutyStatus);
-                return str;
-            }
-        }
 
         /// <summary>
         /// 突发事件总数

Edu.WebApi/Controllers/Duty/DutyPlanController.cs

@@ -63,8 +63,7 @@ namespace Edu.WebApi.Controllers.Duty
                     PlanDate = Common.ConvertHelper.FormatDate(item.Date),
                     item.SchoolName,
                     item.School_Id,
-                    item.DutyStatus,
-                    item.DutyStatusStr,
+   
                     PlanDetails = item?.PlanDetails?.Select(qitem => new
                     {
                         qitem.Id,
@@ -75,13 +74,14 @@ namespace Edu.WebApi.Controllers.Duty
                         qitem.EndTime,
                         qitem.Shift,
                         qitem.ShiftName,
-                        qitem.DutyStatus,
-                        qitem.DutyStatusStr,
                         qitem.Status,
+                        qitem.StatusStr,
                         qitem.CheckTimeStr,
+                        qitem.CheckLateTime,
+                        CheckLateTimeStr = (qitem.CheckLateTime > 0 ? string.Format("[迟到{0}分钟]", qitem.CheckLateTime) : "[正常]"),
                         qitem.FinishTimeStr,
                         qitem.FinishLateTime,
-                        qitem.CheckLateTime,
+                        FinishLateTimeStr = (qitem.FinishLateTime > 0 ? string.Format("[早退{0}分钟]", qitem.FinishLateTime) : "[正常]"),
                     })
                 });
             }
@@ -144,6 +144,7 @@ namespace Edu.WebApi.Controllers.Duty
                         nextModel = item.PlanDetails[nextIndex];
                     }
                 }
+
                 string jiaoBanMan = "";//交班人
                 string jieBanMan = "";//接班人
                 if (nextModel != null&&nextModel.Id>0)
@@ -155,6 +156,10 @@ namespace Edu.WebApi.Controllers.Duty
                 {
                     jiaoBanMan = previousModel?.DutyManName ?? "";
                 }
+                if (currentModel.Status == Common.Enum.Duty.DutyStatusEnum.NoStart)
+                {
+                    currentModel.Status= dutyPlanModule.CalcDutyPlanStatusModule(item.Date, currentModel.StartTime, currentModel.EndTime);
+                }
                 result.Add(new
                 {
                     item.Id,
@@ -165,17 +170,21 @@ namespace Edu.WebApi.Controllers.Duty
                     currentModel.StartTime,
                     currentModel.EndTime,
                     PlanList = currentModel?.WorkContentList ?? new  List<RB_Duty_PlanWork_ViewModel>(),
-                    currentModel.CheckLateTime,
-                    currentModel.FinishLateTime,
                     currentModel.BurstCount,
                     currentModel.HandoverCount,
                     ReciveMan= jieBanMan,
                     GiveMan= jiaoBanMan,
                     item.CreateByName,
-                    currentModel.DutyStatus,
-                    currentModel.DutyStatusStr,
+                    currentModel.Status,
+                    currentModel.StatusStr,
                     item.TotalBurstCount,
                     item.TotalHandoverCount,
+                    currentModel.CheckTimeStr,
+                    currentModel.CheckLateTime,
+                    CheckLateTimeStr = (currentModel.CheckLateTime > 0 ? string.Format("[迟到{0}分钟]", currentModel.CheckLateTime) : "[正常]"),
+                    currentModel.FinishTimeStr,
+                    currentModel.FinishLateTime,
+                    FinishLateTimeStr = (currentModel.FinishLateTime > 0 ? string.Format("[早退{0}分钟]", currentModel.FinishLateTime) : "[正常]"),
                 });
             }
             pageModel.Count = rowsCount;