页面修改

Edu.Common/Config.cs

@@ -449,6 +449,19 @@ namespace Edu.Common
             }
         }
 
+        /// <summary>
+        /// 超过下班时间多少分钟数不能打卡
+        /// </summary>
+        public static int MoreThanMinutes
+        {
+            get
+            {
+                int.TryParse(ReadConfigKey("MoreThanMinutes"), out int MoreThanMinutes);
+                return MoreThanMinutes;
+            }
+        }
+        
+
         /// <summary>
         /// 消息推送AppId
         /// </summary>

Edu.Module.Duty/DutyPlanModule.cs

@@ -789,14 +789,15 @@ namespace Edu.Module.Duty
         /// <param name="DutyMan"></param>
         /// <param name="Status">Status(1-值班中，2-已完成)</param>
         /// <returns></returns>
-        public bool DutyCheckModule(int Id, int Shift, int DutyMan, int Status)
+        public bool DutyCheckModule(int Id, int Shift, int DutyMan, int Status, out string message)
         {
+            message = "";
             Dictionary<string, object> fileds = new Dictionary<string, object>()
             {
                 { nameof(RB_Duty_PlanDetails_ViewModel.Status),Status},
             };
             DateTime dt = DateTime.Now;
-            var planModel = GetDutyPlanDetailsListModule(new RB_Duty_PlanDetails_ViewModel() { PlanId = Id, Shift = Shift, QDutyMan = DutyMan.ToString() })?.FirstOrDefault();
+            var planModel = GetDutyPlanDetailsListModule(new RB_Duty_PlanDetails_ViewModel() { PlanId = Id, Shift = Shift,QDutyStatus=-1, QDutyMan = DutyMan.ToString() })?.FirstOrDefault();
             var startTime = Convert.ToDateTime(Common.ConvertHelper.FormatDate(dt) + " " + planModel?.StartTime);
             var endTime = Convert.ToDateTime(Common.ConvertHelper.FormatDate(dt) + " " + planModel?.EndTime);
             if (Status == 1)
@@ -814,6 +815,16 @@ namespace Edu.Module.Duty
             }
             if (Status == 2)
             {
+                if (dt < startTime)
+                {
+                    message = "还未到下班时间,不能打卡!";
+                    return false;
+                }
+                if (Common.ConvertHelper.CalcMinutes(endTime, dt) > Common.Config.MoreThanMinutes)
+                {
+                    message = string.Format("已超过下班时间【{0}】分钟,不能打卡!", Common.Config.MoreThanMinutes);
+                    return false;
+                }
                 fileds.Add(nameof(RB_Duty_PlanDetails_ViewModel.FinishTime), dt);
                 int minute = Common.ConvertHelper.CalcMinutes(dt, endTime);
                 if (minute > 0)

Edu.WebApi/Controllers/Duty/DutyPlanController.cs

@@ -308,8 +308,8 @@ namespace Edu.WebApi.Controllers.Duty
             var Id = base.ParmJObj.GetInt("Id");
             var Shift = base.ParmJObj.GetInt("Shift");
             var Status = base.ParmJObj.GetInt("Status");
-            var flag = dutyPlanModule.DutyCheckModule(Id, Shift, base.UserInfo.Id, Status);
-            return flag ? ApiResult.Success() : ApiResult.Failed();
+            var flag = dutyPlanModule.DutyCheckModule(Id, Shift, base.UserInfo.Id, Status,out string message);
+            return flag ? ApiResult.Success() : ApiResult.Failed(message: message);
         }
 
         /// <summary>

Edu.WebApi/appsettings.json

@@ -63,6 +63,7 @@
   //消息推送AppId
   "PushAppId": "JiaHeJiaoYu",
   //是否推送消息
-  "IsPushMessage": "1"
-
+  "IsPushMessage": "1",
+  //超过下班时间60分钟不能打卡
+  "MoreThanMinutes": 60
 }
\ No newline at end of file