页面修改

Edu.Module.Course/ClassModule.cs

@@ -1097,7 +1097,11 @@ namespace Edu.Module.Course
                 Group_Id = group_Id,
                 School_Id = school_Id,
                 QEffectStatus = QEffectStatus,
-            }).Where(x => x.GuestState == 1).ToList();
+            }).ToList();
+            if (QEffectStatus == 1)
+            {
+                orderStudentList = orderStudentList.Where(qitem => qitem.GuestState == 1).ToList();
+            }
             var classModel = GetClassModule(classId);
             var courseModel = courseRepository.GetEntity((classModel?.CouseId ?? 0));
             List<RB_Class_Check_ViewModel> checkList = new List<RB_Class_Check_ViewModel>();
@@ -1134,6 +1138,8 @@ namespace Edu.Module.Course
                         item.EffectStatusStr,
                         EffectTime = Common.ConvertHelper.FormatDate(item.EffectTime),
                         item.UpOrderId,
+                        item.GuestState,
+                        item.GuestStateStr,
                     });
                 }
             }

Edu.Module.Duty/DutyPlanModule.cs

@@ -1237,6 +1237,7 @@ namespace Edu.Module.Duty
                 result.Add(new
                 {
                     item.Id,
+                    Name= Common.ConvertHelper.FormatDate(item.DutyDate)+" "+ item.ConfigStartTime+" " + item.ShiftName + " "+ item.DutyManName,
                     item.PlanId,
                     item.Shift,
                     item.DutyMan,

Edu.Repository/Course/RB_Order_GuestRepository.cs

@@ -26,10 +26,10 @@ namespace Edu.Repository.Course
             {
                 where += $@" and A.{nameof(RB_Order_Guest_ViewModel.Group_Id)} ={demodel.Group_Id}";
             }
-            if (demodel.School_Id > 0)
-            {
-                where += $@" and A.{nameof(RB_Order_Guest_ViewModel.School_Id)} ={demodel.School_Id}";
-            }
+            //if (demodel.School_Id > 0)
+            //{
+            //    where += $@" and A.{nameof(RB_Order_Guest_ViewModel.School_Id)} ={demodel.School_Id}";
+            //}
             if (demodel.Id > 0)
             {
                 where += $@" and A.{nameof(RB_Order_Guest_ViewModel.Id)} ={demodel.Id}";

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -261,7 +261,8 @@ namespace Edu.WebApi.Controllers.Course
                         {
                             z.Id,
                             z.GuestName,
-                            z.GuestState
+                            z.GuestState,
+                            z.GuestStateStr,
                         }),
                         ContractList = x.ContractList.Select(z => new
                         {
@@ -1259,6 +1260,7 @@ namespace Edu.WebApi.Controllers.Course
                         z.ContractNo,
                         z.ContractStatus,
                         z.ContractStatusStr,
+                        z.GuestStateStr,
                     }),
                     ContractList = x?.ContractList.Select(z => new
                     {
@@ -1409,6 +1411,7 @@ namespace Edu.WebApi.Controllers.Course
                         z.ContractNo,
                         z.ContractStatus,
                         z.ContractStatusStr,
+                        z.GuestStateStr,
                     }),
                     ContractList = x?.ContractList.Select(z => new
                     {