页面修改

Edu.Model/ViewModel/Course/RB_Order_Remark_ViewModel.cs

@@ -13,5 +13,10 @@ namespace Edu.Model.ViewModel.Course
         /// 姓名
         /// </summary>
         public string CreateByName { get; set; }
+
+        /// <summary>
+        /// 订单编号【查询使用】
+        /// </summary>
+        public string QOrderIds { get; set; }
     }
 }
\ No newline at end of file

Edu.Module.Course/ClassModule.cs

@@ -1116,17 +1116,6 @@ namespace Edu.Module.Course
         }
 
 
-        /// <summary>
-        /// 获取列表
-        /// </summary>
-        /// <param name="demodel"></param>
-        /// <param name="orderIds"></param>
-        /// <returns></returns>
-        public List<RB_Order_Guest_ViewModel> GetList_V2(RB_Order_Guest_ViewModel demodel)
-        {
-            return order_GuestRepository.GetList_V2(demodel);
-        }
-
         /// <summary>
         /// 更新学生的退课信息
         /// </summary>
@@ -1445,7 +1434,7 @@ namespace Edu.Module.Course
                 {
                     List<object> time = new List<object>();
                     var tempTimeList = timeList?.Where(qitem => qitem.ClassPlanId == item.ClassPlanId)?.OrderBy(qitem => qitem.StartTime)?.ToList();
-                    int tempTotalNum = order_GuestRepository.GetGuestNum(new RB_Order_Guest_ViewModel() { ClassId = item.ClassId, GuestState = 1 });
+                    int tempTotalNum = order_GuestRepository.GetOrderGuestNumRepository(new RB_Order_Guest_ViewModel() { ClassId = item.ClassId, GuestState = 1 });
                     int TotalNum = 0;
                     int NoCheckNum = 0;
                     if (tempTimeList != null && tempTimeList.Count > 0)

Edu.Module.Course/EducationContractModule.cs

@@ -90,7 +90,7 @@ namespace Edu.Module.Course
         public object GetStudentInfoModule(int OrderId, int GuestId)
         {
             var obj = new object();
-            var glist = order_GuestRepository.GetList(new RB_Order_Guest_ViewModel() { OrderId = OrderId, GuestState = 1 });
+            var glist = order_GuestRepository.GetOrderGuestListRepository(new RB_Order_Guest_ViewModel() { OrderId = OrderId, GuestState = 1 });
             var orderModel = orderRepository.GetEntity(OrderId);
             var guestModel = glist.Where(qitem => qitem.Id == GuestId)?.FirstOrDefault();
             var classModel = new RB_Class_ViewModel();

Edu.Module.Course/OrderModule.cs

@@ -1008,7 +1008,7 @@ namespace Edu.Module.Course
             {
                 string orderIds = string.Join(",", orderList.Select(x => x.OrderId));
                 //获取备注列表
-                var remarkList = order_RemarkRepository.GetList(new RB_Order_Remark_ViewModel() { }, orderIds);
+                var remarkList = order_RemarkRepository.GetOrderRemarkListRepository(new RB_Order_Remark_ViewModel() { QOrderIds=orderIds});
                 //获取名单列表
                 var guestList = order_GuestRepository.GetOrderGuestListRepository(new RB_Order_Guest_ViewModel() { OrderIds = orderIds });
                 //获取合同列表
@@ -1138,9 +1138,9 @@ namespace Edu.Module.Course
         /// <param name="count"></param>
         /// <param name="dmodel"></param>
         /// <returns></returns>
-        public List<RB_Order_Remark_ViewModel> GetClassOrderRemarkList(int pageIndex, int pageSize, out long count, RB_Order_Remark_ViewModel dmodel)
+        public List<RB_Order_Remark_ViewModel> GetClassOrderRemarkPageModule(int pageIndex, int pageSize, out long count, RB_Order_Remark_ViewModel dmodel)
         {
-            return order_RemarkRepository.GetPageList(pageIndex, pageSize, out count, dmodel, "");
+            return order_RemarkRepository.GetOrderRemarkPageRepository(pageIndex, pageSize, out count, dmodel);
         }
 
         /// <summary>
@@ -1485,9 +1485,9 @@ namespace Edu.Module.Course
         /// <param name="count"></param>
         /// <param name="dmodel"></param>
         /// <returns></returns>
-        public List<RB_Order_Guest_ViewModel> GetOrderGuestPageList(int pageIndex, int pageSize, out long count, RB_Order_Guest_ViewModel dmodel)
+        public List<RB_Order_Guest_ViewModel> GetOrderGuestPageModule(int pageIndex, int pageSize, out long count, RB_Order_Guest_ViewModel dmodel)
         {
-            var list = order_GuestRepository.GetPageList(pageIndex, pageSize, out count, dmodel);
+            var list = order_GuestRepository.GetOrderGuestPageRepository(pageIndex, pageSize, out count, dmodel);
             return list;
         }
 
@@ -1682,7 +1682,7 @@ namespace Edu.Module.Course
                 }
                 dmodel.ClassId = ordermodel.ClassId;
                 dmodel.SourceId = ordermodel.SourceId;
-                int GuestNum = order_GuestRepository.GetGuestNum(new RB_Order_Guest_ViewModel() { OrderId = dmodel.OrderId, GuestState = 1 });
+                int GuestNum = order_GuestRepository.GetOrderGuestNumRepository(new RB_Order_Guest_ViewModel() { OrderId = dmodel.OrderId, GuestState = 1 });
                 if (GuestNum >= ordermodel.GuestNum)
                 {
                     message = "学生名单已录入完毕";
@@ -1857,7 +1857,7 @@ namespace Edu.Module.Course
             {
                 string orderIds = string.Join(",", orderList.Select(x => x.OrderId));
                 //获取备注列表
-                var remarkList = order_RemarkRepository.GetList(new RB_Order_Remark_ViewModel() { }, orderIds);
+                var remarkList = order_RemarkRepository.GetOrderRemarkListRepository(new RB_Order_Remark_ViewModel() { QOrderIds=orderIds});
                 //获取名单列表
                 var guestList = order_GuestRepository.GetOrderGuestListRepository(new RB_Order_Guest_ViewModel() { OrderIds = orderIds });
                 //获取合同列表
@@ -1923,7 +1923,7 @@ namespace Edu.Module.Course
             {
                 string orderIds = string.Join(",", orderList.Select(x => x.OrderId));
                 //获取备注列表
-                var remarkList = order_RemarkRepository.GetList(new RB_Order_Remark_ViewModel() { }, orderIds);
+                var remarkList = order_RemarkRepository.GetOrderRemarkListRepository(new RB_Order_Remark_ViewModel() {QOrderIds=orderIds });
                 //获取名单列表
                 var guestList = order_GuestRepository.GetOrderGuestListRepository(new RB_Order_Guest_ViewModel() { OrderIds = orderIds });
                 //获取合同列表

Edu.Module.Course/StudentBillModule.cs

@@ -580,7 +580,7 @@ namespace Edu.Module.Course
             bool flag = student_BackClassRepository.Update(backFileds, new WhereHelper(nameof(RB_Student_BackClass_ViewModel.BackId), backModel.BackId));
             if (flag)
             {
-                var guestList = order_GuestRepository.GetList(new RB_Order_Guest_ViewModel() { OrderId = backModel.OrderId });
+                var guestList = order_GuestRepository.GetOrderGuestListRepository(new RB_Order_Guest_ViewModel() { OrderId = backModel.OrderId });
                 if (guestList != null && guestList.Where(qitem => qitem.GuestState == 2).Count() == guestList.Count())
                 {
                     //更新订单为退学状态

Edu.Repository/Course/RB_Order_GuestRepository.cs

@@ -19,9 +19,9 @@ namespace Edu.Repository.Course
         /// <param name="demodel"></param>
         /// <param name="orderIds"></param>
         /// <returns></returns>
-        public List<RB_Order_Guest_ViewModel> GetList(RB_Order_Guest_ViewModel demodel)
+        public List<RB_Order_Guest_ViewModel> GetOrderGuestListRepository(RB_Order_Guest_ViewModel demodel)
         {
-            string where = $@" 1=1 and A.Status=0";
+            string where = $@" 1=1 and A.Status=0 ";
             if (demodel.Group_Id > 0)
             {
                 where += $@" and A.{nameof(RB_Order_Guest_ViewModel.Group_Id)} ={demodel.Group_Id}";
@@ -72,68 +72,15 @@ namespace Edu.Repository.Course
 
             string sql = $@" 
 SELECT A.*,IFNULL(B.IsChaBan,0) AS IsChaBan,IFNULL(B.StartClassHours,0) AS StartClassHours,IFNULL(C.CourseName,'') AS CourseName
-       ,B.EffectStatus,B.EffectTime,B.UpOrderId
+       ,B.EffectStatus,B.EffectTime,B.UpOrderId,B.OrderType,B.CourseId
 FROM RB_Order_Guest AS A LEFT JOIN rb_order AS B ON A.OrderId=B.OrderId
-     LEFT JOIN rb_course AS C ON B.CourseId=C.CourseId
+     LEFT JOIN rb_course AS C ON (B.CourseId=C.CourseId AND B.CourseId>0 AND B.OrderType=1)
 WHERE {where}";
             return Get<RB_Order_Guest_ViewModel>(sql).ToList();
         }
 
  
 
-        /// <summary>
-        /// 获取列表
-        /// </summary>
-        /// <param name="demodel"></param>
-        /// <param name="orderIds"></param>
-        /// <returns></returns>
-        public List<RB_Order_Guest_ViewModel> GetList_V2(RB_Order_Guest_ViewModel demodel)
-        {
-            string where = $@" ";
-            if (demodel.Group_Id > 0)
-            {
-                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.Id > 0)
-            {
-                where += $@" and a.{nameof(RB_Order_Guest_ViewModel.Id)} ={demodel.Id}";
-            }
-            if (demodel.OrderId > 0)
-            {
-                where += $@" and a.{nameof(RB_Order_Guest_ViewModel.OrderId)} ={demodel.OrderId}";
-            }
-            if (demodel.ClassId > 0)
-            {
-                where += $@" and a.{nameof(RB_Order_Guest_ViewModel.ClassId)} ={demodel.ClassId}";
-            }
-            if (!string.IsNullOrEmpty(demodel.OrderIds))
-            {
-                where += $@" and a.{nameof(RB_Order_Guest_ViewModel.OrderId)} in({demodel.OrderIds})";
-            }
-            if (!string.IsNullOrEmpty(demodel.ClassIds))
-            {
-                where += $@" and a.{nameof(RB_Order_Guest_ViewModel.ClassId)} in({demodel.ClassIds})";
-            }
-            if (!string.IsNullOrEmpty(demodel.GuestName))
-            {
-                where += $@" and a.{nameof(RB_Order_Guest_ViewModel.GuestName)} like '%{demodel.GuestName}%'";
-            }
-            if (demodel.GuestState > 0)
-            {
-                where += $@" and a.{nameof(RB_Order_Guest_ViewModel.GuestState)} ={demodel.GuestState}";
-            }
-
-            string sql = $@" SELECT A.* ,IFNULL(course.CourseName,'') AS CourseName,tOrder.CourseId,tOrder.OrderType,tOrder.StartClassHours,tOrder.IsChaBan
-FROM RB_Order_Guest AS A LEFT  JOIN RB_Order as tOrder ON A.OrderId=tOrder.OrderId
-     LEFT JOIN rb_course AS course ON (tOrder.CourseId=course.CourseId AND tOrder.CourseId>0 AND tOrder.OrderType=1)
-WHERE 1=1 AND A.Status=0 {where}";
-            return Get<RB_Order_Guest_ViewModel>(sql).ToList();
-        }
-
         /// <summary>
         /// 获取分页列表
         /// </summary>
@@ -143,7 +90,7 @@ WHERE 1=1 AND A.Status=0 {where}";
         /// <param name="demodel"></param>
         /// <param name="orderIds"></param>
         /// <returns></returns>
-        public List<RB_Order_Guest_ViewModel> GetPageList(int pageIndex, int pageSize, out long rowsCount, RB_Order_Guest_ViewModel demodel)
+        public List<RB_Order_Guest_ViewModel> GetOrderGuestPageRepository(int pageIndex, int pageSize, out long rowsCount, RB_Order_Guest_ViewModel demodel)
         {
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
@@ -190,7 +137,7 @@ WHERE 1=1 AND A.Status=0
         /// </summary>
         /// <param name="demodel"></param>
         /// <returns></returns>
-        public int GetGuestNum(RB_Order_Guest_ViewModel demodel)
+        public int GetOrderGuestNumRepository(RB_Order_Guest_ViewModel demodel)
         {
             string where = $@" 1=1 and Status=0";
             if (demodel.Group_Id > 0)

Edu.Repository/Course/RB_Order_RemarkRepository.cs

@@ -19,26 +19,26 @@ namespace Edu.Repository.Course
         /// <param name="demodel"></param>
         /// <param name="orderIds"></param>
         /// <returns></returns>
-        public List<RB_Order_Remark_ViewModel> GetList(RB_Order_Remark_ViewModel demodel,string orderIds)
+        public List<RB_Order_Remark_ViewModel> GetOrderRemarkListRepository(RB_Order_Remark_ViewModel demodel)
         {
             string where = $@" 1=1";
-            
             if (demodel.OrderId > 0)
             {
                 where += $@" and r.{nameof(RB_Order_Remark.OrderId)} ={demodel.OrderId}";
             }
-            if (!string.IsNullOrEmpty(orderIds))
+            if (!string.IsNullOrEmpty(demodel.QOrderIds))
             {
-                where += $@" and r.{nameof(RB_Order_Remark.OrderId)} in({orderIds})";
+                where += $@" and r.{nameof(RB_Order_Remark.OrderId)} in({demodel.QOrderIds})";
             }
             if (demodel.Type > 0)
             {
                 where += $@" and r.{nameof(RB_Order_Remark.Type)} ={demodel.Type}";
             }
-
-            string sql = $@" select r.*,e.EmName as CreateByName from RB_Order_Remark r
-left join rb_employee e on r.CreateBy = e.EmployeeId 
-where {where} order by r.Id desc";
+            string sql = $@" 
+SELECT r.*,e.EmName as CreateByName 
+FROM RB_Order_Remark r left join rb_employee e on r.CreateBy = e.EmployeeId 
+WHERE {where} 
+ORDER BY r.Id DESC ";
             return Get<RB_Order_Remark_ViewModel>(sql).ToList();
         }
 
@@ -51,7 +51,7 @@ where {where} order by r.Id desc";
         /// <param name="demodel"></param>
         /// <param name="orderIds"></param>
         /// <returns></returns>
-        public List<RB_Order_Remark_ViewModel> GetPageList(int pageIndex, int pageSize, out long rowsCount, RB_Order_Remark_ViewModel demodel, string orderIds)
+        public List<RB_Order_Remark_ViewModel> GetOrderRemarkPageRepository(int pageIndex, int pageSize, out long rowsCount, RB_Order_Remark_ViewModel demodel)
         {
             string where = $@" 1=1";
 
@@ -59,9 +59,9 @@ where {where} order by r.Id desc";
             {
                 where += $@" and {nameof(RB_Order_Remark.OrderId)} ={demodel.OrderId}";
             }
-            if (!string.IsNullOrEmpty(orderIds))
+            if (!string.IsNullOrEmpty(demodel.QOrderIds))
             {
-                where += $@" and {nameof(RB_Order_Remark.OrderId)} in({orderIds})";
+                where += $@" and {nameof(RB_Order_Remark.OrderId)} in({demodel.QOrderIds})";
             }
             if (demodel.Type > 0)
             {

Edu.WebApi/Controllers/Course/ClassRoomController.cs

@@ -133,8 +133,8 @@ namespace Edu.WebApi.Controllers.Course
             {
                 extModel.RoomPicList = new List<string>();
             }
-            extModel.EndTime = extModel.EndTime ?? "21:30";
-            extModel.StartTime = extModel.StartTime ?? "09:30";
+            extModel.EndTime ??= "21:30";
+            extModel.StartTime ??= "09:30";
             return ApiResult.Success(data: extModel);
         }
 
@@ -454,7 +454,7 @@ namespace Edu.WebApi.Controllers.Course
             }
 
 
-            var orderGuestList = classModule.GetList_V2(new RB_Order_Guest_ViewModel { Group_Id = base.UserInfo.Group_Id, School_Id = 0, ClassId = classModel.ClassId });
+            var orderGuestList = classModule.GetOrderGuestListModule(new RB_Order_Guest_ViewModel { Group_Id = base.UserInfo.Group_Id, School_Id = 0, ClassId = classModel.ClassId });
             var checkLogList = classModule.GetClassCheckList(new RB_Class_Check_ViewModel { Group_Id = base.UserInfo.Group_Id, School_Id = -1, ClassId = classModel.ClassId, StartDate = timeModel.NewPlanDateTime, EndDate = timeModel.NewPlanDateTime });
             foreach (var item in orderGuestList)
             {

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -677,9 +677,11 @@ namespace Edu.WebApi.Controllers.Course
             var userInfo = base.UserInfo;
             var pageModel = JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
             var dmodel = JsonHelper.DeserializeObject<RB_Order_Remark_ViewModel>(RequestParm.Msg.ToString());
-            if (dmodel.OrderId <= 0) { return ApiResult.ParamIsNull(); }
-
-            var list = orderModule.GetClassOrderRemarkList(pageModel.PageIndex, pageModel.PageSize, out long count, dmodel);
+            if (dmodel.OrderId <= 0)
+            {
+                return ApiResult.ParamIsNull();
+            }
+            var list = orderModule.GetClassOrderRemarkPageModule(pageModel.PageIndex, pageModel.PageSize, out long count, dmodel);
             pageModel.Count = Convert.ToInt32(count);
             pageModel.PageData = list.Select(x => new
             {
@@ -690,7 +692,6 @@ namespace Edu.WebApi.Controllers.Course
                 CreateTime = x.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
                 x.Type
             });
-
             return ApiResult.Success("", pageModel);
         }
 
@@ -950,7 +951,7 @@ namespace Edu.WebApi.Controllers.Course
                 SourceId = base.ParmJObj.GetInt("SourceId"),
             };
             dmodel.Group_Id = userInfo.Group_Id;
-            var list = orderModule.GetOrderGuestPageList(pageModel.PageIndex, pageModel.PageSize, out long count, dmodel);
+            var list = orderModule.GetOrderGuestPageModule(pageModel.PageIndex, pageModel.PageSize, out long count, dmodel);
             pageModel.Count = Convert.ToInt32(count);
             pageModel.PageData = list.Select(x => new
             {