页面修改

Edu.Module.Duty/DutyPlanModule.cs

@@ -1112,5 +1112,49 @@ namespace Edu.Module.Duty
         {
             return visitorRepository.GetVisitorCountRepository(model);
         }
+
+        /// <summary>
+        /// 更新值班【未值班，值班未打卡】状态
+        /// </summary>
+        public void UpdateDutyModule()
+        {
+            double addhours = 1.5;
+            var list = GetDutyPlanPageModule(1, 20, out _, new Model.ViewModel.Duty.RB_Duty_Plan_ViewModel()
+            {
+                QDutyStatus = 0,
+                QEndDate = Common.ConvertHelper.FormatDate(DateTime.Now.AddDays(1))
+            });
+            if (list != null && list.Count > 0)
+            {
+                foreach (var item in list)
+                {
+                    foreach (var subItem in item.PlanDetails)
+                    {
+                        var endTime = Convert.ToDateTime((Common.ConvertHelper.FormatDate(item.Date) + " " + subItem.EndTime)).AddHours(addhours);
+                        if (subItem.Status == Common.Enum.Duty.DutyStatusEnum.NoStart && endTime < DateTime.Now)
+                        {
+                            UpdateNoDutyModule(subItem.Id);
+                        }
+                    }
+                }
+            }
+
+            var list2 = GetDutyPlanPageModule(1, 20, out _, new Model.ViewModel.Duty.RB_Duty_Plan_ViewModel()
+            {
+                QDutyStatus = 1,
+                QEndDate = Common.ConvertHelper.FormatDate(DateTime.Now)
+            });
+            foreach (var item in list2)
+            {
+                foreach (var subItem in item.PlanDetails)
+                {
+                    var endTime = Convert.ToDateTime((Common.ConvertHelper.FormatDate(item.Date) + " " + subItem.EndTime)).AddHours(addhours);
+                    if (subItem.Status == Common.Enum.Duty.DutyStatusEnum.DutyIng && endTime < DateTime.Now)
+                    {
+                        UpdateDutyFinishedModule(subItem.Id);
+                    }
+                }
+            }
+        }
     }
 }

Edu.Repository/Duty/RB_Duty_PlanRepository.cs

@@ -118,7 +118,14 @@ WHERE 1=1
                     builder.AppendFormat(@" AND A.{0}<'{1}' ", nameof(RB_Duty_Plan_ViewModel.Date), Common.ConvertHelper.FormatDate(DateTime.Now));
                 }
             }
+            if (query.IsFinish == 1)
+            {
+                builder.AppendFormat(@" ORDER BY A.{0} DESC ", nameof(RB_Duty_Plan_ViewModel.Date));
+            }
+            else
+            {
                 builder.AppendFormat(@" ORDER BY A.{0} ASC ", nameof(RB_Duty_Plan_ViewModel.Date));
+            }
             return GetPage<RB_Duty_Plan_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString()).ToList();
         }
 

Edu.WebApi/Controllers/Duty/DutyPlanController.cs

@@ -56,6 +56,7 @@ namespace Edu.WebApi.Controllers.Duty
             query.SchoolIdList = Common.Plugin.JsonHelper.DeserializeObject<List<int>>(base.ParmJObj.GetStringValue("School_Ids"));
             query.Group_Id = base.UserInfo.Group_Id;
             List<object> result = new List<object>();
+            dutyPlanModule.UpdateDutyModule();
             var list = dutyPlanModule.GetDutyPlanPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
             foreach (var item in list)
             {
@@ -108,6 +109,7 @@ namespace Edu.WebApi.Controllers.Duty
         [HttpPost]
         public ApiResult GetMyDutyPlanPage()
         {
+            dutyPlanModule.UpdateDutyModule();
             var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
             var query = new RB_Duty_Plan_ViewModel()
             {

Edu.WebApi/Timers/TimerJobj.cs

@@ -101,45 +101,9 @@ namespace Edu.WebApi.Timers
         /// <param name="e"></param>
         public static void DealDuty(object sender, System.Timers.ElapsedEventArgs e)
         {
-            double addhours = 1.5;
             if (Interlocked.Exchange(ref inTimer2, 1) == 0)
             {
-                var list = dutyPlanModule.GetDutyPlanPageModule(1, 20, out _, new Model.ViewModel.Duty.RB_Duty_Plan_ViewModel()
-                {
-                    QDutyStatus = 0,
-                    QEndDate = Common.ConvertHelper.FormatDate(DateTime.Now.AddDays(1))
-                });
-                if (list != null && list.Count > 0)
-                {
-                    foreach (var item in list)
-                    {
-                        foreach (var subItem in item.PlanDetails)
-                        {
-                            var endTime = Convert.ToDateTime((Common.ConvertHelper.FormatDate(item.Date) + " " + subItem.EndTime)).AddHours(addhours);
-                            if (subItem.Status == Common.Enum.Duty.DutyStatusEnum.NoStart && endTime < DateTime.Now)
-                            {
-                                dutyPlanModule.UpdateNoDutyModule(subItem.Id);
-                            }
-                        }
-                    }
-                }
-
-                var list2 = dutyPlanModule.GetDutyPlanPageModule(1, 20, out _, new Model.ViewModel.Duty.RB_Duty_Plan_ViewModel()
-                {
-                    QDutyStatus = 1,
-                    QEndDate = Common.ConvertHelper.FormatDate(DateTime.Now)
-                });
-                foreach (var item in list2)
-                {
-                    foreach (var subItem in item.PlanDetails)
-                    {
-                        var endTime = Convert.ToDateTime((Common.ConvertHelper.FormatDate(item.Date) + " " + subItem.EndTime)).AddHours(addhours);
-                        if (subItem.Status == Common.Enum.Duty.DutyStatusEnum.DutyIng && endTime < DateTime.Now)
-                        {
-                            dutyPlanModule.UpdateDutyFinishedModule(subItem.Id);
-                        }
-                    }
-                }
+                dutyPlanModule.UpdateDutyModule();
                 Interlocked.Exchange(ref inTimer2, 0);
             }
         }