页面修改

Edu.Model/ViewModel/Course/RB_Order_Guest_ViewModel.cs

@@ -143,11 +143,21 @@ namespace Edu.Model.ViewModel.Course
         /// </summary>
         public int SourceOrderId { get; set; }
 
+        /// <summary>
+        /// 原订单班级名称
+        /// </summary>
+        public string SourceClassName { get; set; }
+
         /// <summary>
         /// 目标订单编号
         /// </summary>
         public int TargetOrderId { get; set; }
 
+        /// <summary>
+        /// 目标订单班级名称
+        /// </summary>
+        public string TargetClassName { get; set; }
+
         /// <summary>
         /// 生效时间
         /// </summary>

Edu.Module.Course/ClassModule.cs

@@ -1302,7 +1302,9 @@ namespace Edu.Module.Course
                         item.TargetJoinType,
                         TargetJoinTypeName=item.TargetJoinType.ToName(),
                         item.SourceOrderId,
+                        item.SourceClassName,
                         item.TargetOrderId,
+                        item.TargetClassName,
                         item.StartClassHours,
                         item.CourseName,
                         item.EffectStatus,

Edu.Module.Course/OrderModule.cs

@@ -1715,6 +1715,37 @@ namespace Edu.Module.Course
         public List<RB_Order_Guest_ViewModel> GetOrderGuestPageModule(int pageIndex, int pageSize, out long count, RB_Order_Guest_ViewModel dmodel)
         {
             var list = order_GuestRepository.GetOrderGuestPageRepository(pageIndex, pageSize, out count, dmodel);
+            if (list != null && list.Count > 0)
+            {
+                List<RB_Order_ViewModel> sourceTargetList = new List<RB_Order_ViewModel>();
+                List<int> idList = new List<int>();
+                var sourceOrderIdList = Common.ConvertHelper.StringToList(string.Join(",", list.Select(x => x.SourceOrderId)));
+                if (sourceOrderIdList != null && sourceOrderIdList.Count > 0)
+                {
+                    idList.AddRange(sourceOrderIdList);
+                }
+                var targetOrderIdList = Common.ConvertHelper.StringToList(string.Join(",", list.Select(x => x.TargetOrderId)));
+                if (targetOrderIdList != null && targetOrderIdList.Count > 0)
+                {
+                    idList.AddRange(targetOrderIdList);
+                }
+                if (idList != null && idList.Count > 0)
+                {
+                    string ids = string.Join(",", idList);
+                    sourceTargetList = orderRepository.GetOrderListRepository(new RB_Order_ViewModel { QOrderIds = ids });
+                }
+                foreach (var item in list)
+                {
+                    if (item.SourceOrderId > 0)
+                    {
+                        item.SourceClassName = sourceTargetList?.Where(qitem => qitem.OrderId == item.SourceOrderId)?.FirstOrDefault()?.ClassName;
+                    }
+                    if (item.TargetOrderId > 0)
+                    {
+                        item.TargetClassName = sourceTargetList?.Where(qitem => qitem.OrderId == item.TargetOrderId)?.FirstOrDefault()?.ClassName;
+                    }
+                }
+            }
             return list;
         }
 

Edu.Repository/Course/RB_Order_GuestRepository.cs

@@ -13,6 +13,11 @@ namespace Edu.Repository.Course
     /// </summary>
     public class RB_Order_GuestRepository : BaseRepository<RB_Order_Guest>
     {
+        /// <summary>
+        /// 订单仓储层对象
+        /// </summary>
+        private readonly RB_OrderRepository orderRepository = new RB_OrderRepository();
+
         /// <summary>
         /// 获取列表
         /// </summary>
@@ -21,7 +26,51 @@ namespace Edu.Repository.Course
         /// <returns></returns>
         public List<RB_Order_Guest_ViewModel> GetOrderGuestListRepository(RB_Order_Guest_ViewModel demodel)
         {
-            string where = $@" 1=1 and A.Status=0 ";
+            var list = GetCommonOrderGuestListRepository(demodel);
+            if (list != null)
+            {
+                List<RB_Order_ViewModel> sourceTargetList = new List<RB_Order_ViewModel>();
+                List<int> idList = new List<int>();
+                var sourceOrderIdList = Common.ConvertHelper.StringToList(string.Join(",", list.Select(x => x.SourceOrderId)));
+                if (sourceOrderIdList != null && sourceOrderIdList.Count > 0)
+                {
+                    idList.AddRange(sourceOrderIdList);
+                }
+                var targetOrderIdList = Common.ConvertHelper.StringToList(string.Join(",", list.Select(x => x.TargetOrderId)));
+                if (targetOrderIdList != null && targetOrderIdList.Count > 0)
+                {
+                    idList.AddRange(targetOrderIdList);
+                }
+                if (idList != null && idList.Count > 0)
+                {
+                    string ids = string.Join(",", idList);
+                    sourceTargetList = orderRepository.GetOrderListRepository(new RB_Order_ViewModel { QOrderIds = ids });
+                }
+                foreach (var item in list)
+                {
+                    if (item.SourceOrderId > 0)
+                    {
+                        item.SourceClassName = sourceTargetList?.Where(qitem => qitem.OrderId == item.SourceOrderId)?.FirstOrDefault()?.ClassName;
+                    }
+                    if (item.TargetOrderId > 0)
+                    {
+                        item.TargetClassName = sourceTargetList?.Where(qitem => qitem.OrderId == item.TargetOrderId)?.FirstOrDefault()?.ClassName;
+                    }
+                }
+            }
+            return list;
+        }
+
+
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="demodel"></param>
+        /// <param name="orderIds"></param>
+        /// <returns></returns>
+        public List<RB_Order_Guest_ViewModel> GetCommonOrderGuestListRepository(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}";
@@ -70,7 +119,7 @@ SELECT A.*,IFNULL(B.JoinType,0) AS JoinType,IFNULL(B.TargetJoinType,0) AS Target
 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 AND B.CourseId>0 AND B.OrderType=1)
      LEFT JOIN (SELECT OrderGuestId,MAX(TakeEffectTime) as StopClassEffectTime from rb_student_stopclass where IsAuditThrough=1 GROUP BY OrderGuestId) as sc on sc.OrderGuestId=a.Id
-WHERE {where}";
+WHERE 1=1 and A.Status=0 {where}";
             return Get<RB_Order_Guest_ViewModel>(sql).ToList();
         }
 
@@ -101,10 +150,10 @@ WHERE 1=1 AND A.Status=0
             {
                 builder.AppendFormat($@" AND A.{nameof(RB_Order_Guest_ViewModel.Group_Id)} ={demodel.Group_Id}");
             }
-            if (demodel.School_Id > 0)
-            {
-                builder.AppendFormat($@" AND A.{nameof(RB_Order_Guest_ViewModel.School_Id)} ={demodel.School_Id}");
-            }
+            //if (demodel.School_Id > 0)
+            //{
+            //    builder.AppendFormat($@" AND A.{nameof(RB_Order_Guest_ViewModel.School_Id)} ={demodel.School_Id}");
+            //}
             if (demodel.OrderId > 0)
             {
                 builder.AppendFormat($@" AND A.{nameof(RB_Order_Guest_ViewModel.OrderId)} ={demodel.OrderId}");

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -1050,7 +1050,9 @@ namespace Edu.WebApi.Controllers.Course
                 x.TargetJoinType,
                 TargetJoinTypeName=x.TargetJoinType.ToName(),
                 x.SourceOrderId,
+                x.SourceClassName,
                 x.TargetOrderId,
+                x.TargetClassName,
                 x.EffectStatus,
                 x.EffectStatusStr,
                 EffectTime=Common.ConvertHelper.FormatDate(x.EffectTime),