学生名单

Edu.Model/Entity/Course/RB_Order_Guest.cs

@@ -21,6 +21,11 @@ namespace Edu.Model.Entity.Course
         /// </summary>
         public int OrderId { get; set; }
 
+        /// <summary>
+        /// 班级id
+        /// </summary>
+        public int ClassId { get; set; }
+
         /// <summary>
         /// 客人名称
         /// </summary>

Edu.Model/Entity/Course/RB_Order_Remark.cs

@@ -31,6 +31,11 @@ namespace Edu.Model.Entity.Course
         /// </summary>
         public string Content { get; set; }
 
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public int CreateBy { get; set; }
+
         /// <summary>
         /// 创建时间
         /// </summary>

Edu.Model/ViewModel/Course/RB_Order_Guest_ViewModel.cs

@@ -9,6 +9,9 @@ namespace Edu.Model.ViewModel.Course
     [Serializable]
     public class RB_Order_Guest_ViewModel : Model.Entity.Course.RB_Order_Guest
     {
-        
+        /// <summary>
+        /// 订单ids
+        /// </summary>
+        public string OrderIds { get; set; }
     }
 }
\ No newline at end of file

Edu.Model/ViewModel/Course/RB_Order_Remark_ViewModel.cs

+using System;
+using System.Collections.Generic;
+
+namespace Edu.Model.ViewModel.Course
+{
+    /// <summary>
+    /// 订单实体类
+    /// </summary>
+    [Serializable]
+    public class RB_Order_Remark_ViewModel : Model.Entity.Course.RB_Order_Remark
+    {
+        
+    }
+}
\ No newline at end of file

Edu.Model/ViewModel/Course/RB_Order_ViewModel.cs

@@ -33,5 +33,26 @@ namespace Edu.Model.ViewModel.Course
         /// 排序
         /// </summary>
         public int Q_OrderBy { get; set; }
+
+        /// <summary>
+        /// 销售备注
+        /// </summary>
+        public List<RB_Order_Remark_ViewModel> SaleRemarkList { get; set; }
+        /// <summary>
+        /// 教务备注
+        /// </summary>
+        public List<RB_Order_Remark_ViewModel> TeacherRemarkList { get; set; }
+        /// <summary>
+        /// 校长备注
+        /// </summary>
+        public List<RB_Order_Remark_ViewModel> RectorRemarkList { get; set; }
+        /// <summary>
+        /// 经理备注
+        /// </summary>
+        public List<RB_Order_Remark_ViewModel> DirectorRemarkList { get; set; }
+        /// <summary>
+        /// 客人列表
+        /// </summary>
+        public List<RB_Order_Guest_ViewModel> GuestList { get; set; }
     }
 }
\ No newline at end of file

Edu.Module.Course/Edu.Module.Course.csproj

@@ -6,6 +6,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Edu.Aop\Edu.Aop.csproj" />
+    <ProjectReference Include="..\Edu.Cache\Edu.Cache.csproj" />
     <ProjectReference Include="..\Edu.Common\Edu.Common.csproj" />
     <ProjectReference Include="..\Edu.Model\Edu.Model.csproj" />
     <ProjectReference Include="..\Edu.Repository\Edu.Repository.csproj" />

Edu.Repository/Course/RB_Order_GuestRepository.cs

@@ -34,6 +34,14 @@ namespace Edu.Repository.Course
             {
                 where += $@" and {nameof(RB_Order_Guest_ViewModel.OrderId)} ={demodel.OrderId}";
             }
+            if (demodel.ClassId > 0)
+            {
+                where += $@" and {nameof(RB_Order_Guest_ViewModel.ClassId)} ={demodel.ClassId}";
+            }
+            if (!string.IsNullOrEmpty(demodel.OrderIds))
+            {
+                where += $@" and {nameof(RB_Order_Guest_ViewModel.OrderId)} in({demodel.OrderIds})";
+            }
             if (!string.IsNullOrEmpty(demodel.GuestName))
             {
                 where += $@" and {nameof(RB_Order_Guest_ViewModel.GuestName)} like '%{demodel.GuestName}%'";
@@ -56,7 +64,7 @@ namespace Edu.Repository.Course
         /// <param name="demodel"></param>
         /// <param name="orderIds"></param>
         /// <returns></returns>
-        public List<RB_Order_Guest_ViewModel> GetClassPageListRepository(int pageIndex, int pageSize, out long rowsCount, RB_Order_Guest_ViewModel demodel)
+        public List<RB_Order_Guest_ViewModel> GetPageList(int pageIndex, int pageSize, out long rowsCount, RB_Order_Guest_ViewModel demodel)
         {
             string where = $@" 1=1 and Status=0";
             if (demodel.Group_Id > 0)
@@ -71,6 +79,10 @@ namespace Edu.Repository.Course
             {
                 where += $@" and {nameof(RB_Order_Guest_ViewModel.OrderId)} ={demodel.OrderId}";
             }
+            if (demodel.ClassId > 0)
+            {
+                where += $@" and {nameof(RB_Order_Guest_ViewModel.ClassId)} ={demodel.ClassId}";
+            }
             if (!string.IsNullOrEmpty(demodel.GuestName))
             {
                 where += $@" and {nameof(RB_Order_Guest_ViewModel.GuestName)} like '%{demodel.GuestName}%'";

Edu.Repository/Course/RB_Order_RemarkRepository.cs

@@ -19,7 +19,7 @@ namespace Edu.Repository.Course
         /// <param name="demodel"></param>
         /// <param name="orderIds"></param>
         /// <returns></returns>
-        public List<RB_Order_Remark> GetList(RB_Order_Remark demodel,string orderIds)
+        public List<RB_Order_Remark_ViewModel> GetList(RB_Order_Remark_ViewModel demodel,string orderIds)
         {
             string where = $@" 1=1";
             
@@ -37,7 +37,7 @@ namespace Edu.Repository.Course
             }
 
             string sql = $@" select * from RB_Order_Remark where {where}";
-            return Get<RB_Order_Remark>(sql).ToList();
+            return Get<RB_Order_Remark_ViewModel>(sql).ToList();
         }
 
         /// <summary>
@@ -49,7 +49,7 @@ namespace Edu.Repository.Course
         /// <param name="demodel"></param>
         /// <param name="orderIds"></param>
         /// <returns></returns>
-        public List<RB_Order_Remark> GetPageList(int pageIndex, int pageSize, out long rowsCount, RB_Order_Remark demodel, string orderIds)
+        public List<RB_Order_Remark_ViewModel> GetPageList(int pageIndex, int pageSize, out long rowsCount, RB_Order_Remark_ViewModel demodel, string orderIds)
         {
             string where = $@" 1=1";
 
@@ -67,7 +67,7 @@ namespace Edu.Repository.Course
             }
 
             string sql = $@" select * from RB_Order_Remark where {where}";
-            return GetPage<RB_Order_Remark>(pageIndex, pageSize, out rowsCount, sql).ToList();
+            return GetPage<RB_Order_Remark_ViewModel>(pageIndex, pageSize, out rowsCount, sql).ToList();
         }
 
     }