Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

Edu.Model/ViewModel/Course/RB_Class_Plan_ViewModel.cs

@@ -68,6 +68,11 @@ namespace Edu.Model.ViewModel.Course
         /// </summary>
         public int WeekDay { get; set; }
 
+        /// <summary>
+        /// 星期几
+        /// </summary>
+        public string WeekDayStr { get { return Common.ConvertHelper.GetWeekDay(this.ClassDate); } }
+
         /// <summary>
         /// 班级对应的老师id
         /// </summary>

Edu.Model/ViewModel/Course/RB_Class_ViewModel.cs

@@ -240,6 +240,11 @@ namespace Edu.Model.ViewModel.Course
         /// 是否查询剩余的上课计划
         /// </summary>
         public int IsQuerySurplusPlan { get; set; }
+
+        /// <summary>
+        /// 查询状态
+        /// </summary>
+        public string QClassStatus { get; set; }
     }
 
     /// <summary>

Edu.Model/ViewModel/EduTask/RB_Order_Change_ViewModel.cs

@@ -14,5 +14,35 @@ namespace Edu.Model.ViewModel.EduTask
         /// 查询编号【多个逗号分隔】
         /// </summary>
         public string QIds { get; set; }
+
+        /// <summary>
+        /// 学员名称
+        /// </summary>
+        public string GuestName { get; set; }
+
+        /// <summary>
+        /// 班级名称
+        /// </summary>
+        public string ClassName { get; set; }
+
+        /// <summary>
+        /// 班级编号
+        /// </summary>
+        public string ClassNo { get; set; }
+
+        /// <summary>
+        /// 课程名称
+        /// </summary>
+        public string CourseName { get; set; }
+
+        /// <summary>
+        /// 老师名称
+        /// </summary>
+        public string TeacherName { get; set; }
+
+        /// <summary>
+        /// 生效时间
+        /// </summary>
+        public string EffectiveDateStr { get { return Common.ConvertHelper.FormatDate(this.EffectiveDate); } }
     }
 }

Edu.Module.Course/StudentBillModule.cs

@@ -266,6 +266,7 @@ namespace Edu.Module.Course
                 {
                     item.ClassId,
                     item.ClassName,
+                    item.CouseId,
                     item.CourseName,
                     item.ClassHours,
                     item.TeacherName,

Edu.Module.EduTask/EducationReceiptModule.cs

@@ -72,6 +72,11 @@ namespace Edu.Module.EduTask
         /// </summary>
         private readonly RB_Order_GuestRepository order_GuestRepository = new RB_Order_GuestRepository();
 
+        /// <summary>
+        /// 订单转班、拆分仓储层对象
+        /// </summary>
+        private readonly RB_Order_ChangeRepository order_ChangeRepository = new RB_Order_ChangeRepository();
+
         /// <summary>
         /// 获取教务单据分页列表
         /// </summary>
@@ -98,6 +103,8 @@ namespace Edu.Module.EduTask
                 List<RB_Order_Guest_ViewModel> orderGuestList = new List<RB_Order_Guest_ViewModel>();
                 //教室列表
                 List<RB_Class_Room_ViewModel> roomList = new List<RB_Class_Room_ViewModel>();
+                //订单转班列表
+                List<RB_Order_Change_ViewModel> orderTransList = new List<RB_Order_Change_ViewModel>();
                 var groupList = list.GroupBy(qitem => new { qitem.ReceiptType }).Select(qitem => new { qitem.Key.ReceiptType });
                 string Ids = string.Join(",", list.Select(qitem => qitem.Id));
                 var recordList = education_RecordRepository.GetEducationRecordListRepository(new RB_Education_Record_ViewModel()
@@ -107,6 +114,7 @@ namespace Edu.Module.EduTask
                 });
                 foreach (var subItem in groupList)
                 {
+                    #region 退课申请
                     if (subItem.ReceiptType == Common.Enum.Finance.ReceiptTypeEnum.BackClass)
                     {
                         string backIds = string.Join(",", list.Where(qitem => qitem.ReceiptType == subItem.ReceiptType).Select(qitem => qitem.RelationId));
@@ -115,6 +123,9 @@ namespace Edu.Module.EduTask
                             QBackIds = backIds
                         });
                     }
+                    #endregion
+
+                    #region 调课申请
                     if (subItem.ReceiptType == Common.Enum.Finance.ReceiptTypeEnum.ChangeClass)
                     {
                         string changeIds = string.Join(",", list.Where(qitem => qitem.ReceiptType == subItem.ReceiptType).Select(qitem => qitem.RelationId));
@@ -197,6 +208,10 @@ namespace Edu.Module.EduTask
                             });
                         }
                     }
+                    #endregion
+
+                    #region 停课申请
+
                     if (subItem.ReceiptType == Common.Enum.Finance.ReceiptTypeEnum.StopClass)
                     {
                         string changeIds = string.Join(",", list.Where(qitem => qitem.ReceiptType == subItem.ReceiptType).Select(qitem => qitem.RelationId));
@@ -219,6 +234,20 @@ namespace Edu.Module.EduTask
                             }
                         }
                     }
+
+                    #endregion
+
+                    #region 订单转班
+                    if (subItem.ReceiptType == Common.Enum.Finance.ReceiptTypeEnum.OrderTransClass)
+                    {
+                        string transClassIds = string.Join(",", list.Where(qitem => qitem.ReceiptType == subItem.ReceiptType).Select(qitem => qitem.RelationId));
+                        orderTransList = order_ChangeRepository.GetOrderChangeListRepository(new RB_Order_Change_ViewModel()
+                        {
+                            QIds = transClassIds,
+                            ChangeType = 1,
+                        });
+                    }
+                    #endregion
                 }
 
                 foreach (var item in list)
@@ -256,10 +285,16 @@ namespace Edu.Module.EduTask
                         }
                         DataObj = tempModel;
                     }
+                    //停课
                     if (item.ReceiptType == Common.Enum.Finance.ReceiptTypeEnum.StopClass)
                     {
                         DataObj = stopClassList?.Where(qitem => qitem.Id == item.RelationId)?.FirstOrDefault();
                     }
+                    //订单转班
+                    if (item.ReceiptType == Common.Enum.Finance.ReceiptTypeEnum.OrderTransClass)
+                    {
+                        DataObj = orderTransList?.Where(qitem => qitem.Id == item.RelationId)?.FirstOrDefault();
+                    }
                     object AuditObj = new object();
                     if (item.VerifyStatus == EduTaskRrocessStatus.NotAudit || item.VerifyStatus == EduTaskRrocessStatus.AuditIng)
                     {

Edu.Module.EduTask/OrderChangeModule.cs

 using Edu.AOP.CustomerAttribute;
+using Edu.Cache.User;
+using Edu.Common.Enum.Course;
 using Edu.Model.Entity.EduTask;
+using Edu.Model.ViewModel.Course;
 using Edu.Model.ViewModel.EduTask;
 using Edu.Module.Course;
 using Edu.Repository.Course;
 using Edu.Repository.EduTask;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 
 namespace Edu.Module.EduTask
@@ -45,6 +49,16 @@ namespace Edu.Module.EduTask
         /// </summary>
         private readonly OrderModule orderModule = new OrderModule();
 
+        /// <summary>
+        /// 课程签到记录表
+        /// </summary>
+        private readonly RB_Class_CheckRepository classCheckRepository = new RB_Class_CheckRepository();
+
+        /// <summary>
+        /// 订单学员仓储层对象
+        /// </summary>
+        private readonly RB_Order_GuestRepository guestRepository = new RB_Order_GuestRepository();
+
         /// <summary>
         /// 新增订单转班、分拆
         /// </summary>
@@ -96,8 +110,59 @@ namespace Edu.Module.EduTask
                     var oldOrderModel = orderRepository.GetEntity(orderChangeModel.SourceOrderId);
                     var newClassModel = classRepository.GetEntity(orderChangeModel.NewClassId);
                     var newCourseModel = courseRepository.GetEntity(orderChangeModel.NewCourseId);
+                    var userInfo = UserReidsCache.GetUserLoginInfo(oldOrderModel.EnterID);
+                    var guestClassHours = classCheckRepository.GetGuestFinishMinutesRepository(orderChangeModel.OrderGuestId.ToString())?.FirstOrDefault();
+                    var guestModel = guestRepository.GetEntity(orderChangeModel.OrderGuestId);
 
-                    //orderModule.SetClassOrderCareOfClass
+                    //计算课时单价
+                    //老订单应收
+                    decimal oldPreferPrice = oldOrderModel.PreferPrice / guestModel.TotalHours * guestClassHours.FinishClassHours;
+                    //新订单应收
+                    decimal newPreferPrice = oldOrderModel.PreferPrice - oldPreferPrice;
+                    //老订单实收
+                    decimal oldIncome = 0;
+                     
+                    var orderModel = new RB_Order_ViewModel()
+                    {
+                        OrderId = 0,
+                        ClassId = orderChangeModel.NewClassId,//班级编号
+                        GuestNum = 1,
+                        OrderSource = oldOrderModel.OrderSource,
+                        OrderType = oldOrderModel.OrderType,
+                        Class_Price = newCourseModel.SellPrice,//单价
+                        Unit_Price = newCourseModel.SellPrice,//成交单价
+                        PreferPrice = newPreferPrice,//应收，
+                        Income = 0,
+                        HelpEnterId = 0,
+                        GeneralOccupation = "",
+                        EduOccupation = "",
+                        SaleRemark = orderChangeModel.Remarks,//销售备注
+                        SourceId = 0,
+                        IsLessPrice = 0,
+                        LessPrice = 0,
+                        OrderNature = oldOrderModel.OrderNature,
+                        OldPreferPrice = newPreferPrice,//应收，
+                        CourseId = 0,
+                        StartClassHours = 0,
+                        IsChaBan = 0,
+                        UpOrderId = 0,
+                        VisitorReserveId = 0,
+                        IsRenewOrder = 1,
+                    };
+                    //orderModel.RenewOrderId = OrderId;
+                    orderModel.Group_Id = userInfo.Group_Id;
+                    orderModel.School_Id = userInfo.School_Id;
+                    orderModel.Dept_Id = userInfo.DeptId;
+                    orderModel.OrderForm = OrderFormEnum.Computer;
+                    orderModel.EnterID = userInfo.Id;
+                    orderModel.OrderState = OrderStateEnum.Normal;
+                    orderModel.TradeWay = TradeWayEnum.OnLine;
+                    orderModel.CreateBy = userInfo.Id;
+                    orderModel.CreateTime = DateTime.Now;
+                    orderModel.UpdateBy = userInfo.Id;
+                    orderModel.UpdateTime = DateTime.Now;
+                    orderModel.OldGuestId = orderChangeModel.OrderGuestId;
+                    flag = orderModule.SetClassOrderModule(orderModel, userInfo, false, out string message);
                 }
             }
             return flag;

Edu.Repository/Course/RB_ClassRepository.cs

@@ -217,7 +217,7 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_ViewModel.Group_Id), query.Group_Id);
                 }
-                if (query.School_Id > 0)
+                if (query.School_Id >-1)
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_ViewModel.School_Id), query.School_Id);
                 }
@@ -229,6 +229,10 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_ViewModel.ClassStatus), (int)query.ClassStatus);
                 }
+                if (!string.IsNullOrEmpty(query.QClassStatus))
+                {
+                    builder.AppendFormat(" AND A.{0} IN ({1}) ", nameof(RB_Class_ViewModel.ClassStatus), query.QClassStatus);
+                }
                 if (!string.IsNullOrWhiteSpace(query.ClassName))
                 {
                     builder.AppendFormat(" AND A.{0} LIKE @ClassName ", nameof(RB_Class_ViewModel.ClassName));

Edu.Repository/EduTask/RB_Order_ChangeRepository.cs

@@ -21,8 +21,12 @@ namespace Edu.Repository.EduTask
         {
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
-SELECT A.* 
-FROM RB_Order_Change AS A
+SELECT A.*,IFNULL(B.GuestName,'') AS GuestName,IFNULL(c.ClassName,'') AS ClassName,IFNULL(c.ClassNo,'') AS ClassNo,IFNULL(D.CourseName,'') AS CourseName
+      ,IFNULL(E.TeacherName,'') AS TeacherName
+FROM RB_Order_Change AS A LEFT JOIN rb_order_guest AS B ON (A.OrderGuestId=B.Id)
+     LEFT JOIN rb_class AS C ON A.NewClassId=C.ClassId
+     LEFT JOIN rb_course AS D ON A.NewCourseId=D.CourseId
+     LEFT JOIN rb_teacher AS E ON c.Teacher_Id=E.TId
 WHERE 1=1
 ");
             if (query != null)
@@ -39,10 +43,12 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Order_Change_ViewModel.Id), query.QIds);
                 }
+                if (query.ChangeType > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Order_Change_ViewModel.ChangeType), query.ChangeType);
+                }
             }
             return Get<RB_Order_Change_ViewModel>(builder.ToString()).ToList();
         }
-
-       
     }
 }

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -151,6 +151,7 @@ namespace Edu.WebApi.Controllers.Course
                         {
                             subItem.ClassPlanId,
                             ClassDate = Common.ConvertHelper.FormatDate(subItem.ClassDate),
+                            subItem.WeekDayStr,
                             subItem.ClassRoomId,
                             subItem.RoomName,
                             subItem.TeacherId,

Edu.WebApi/Controllers/Course/StuController.cs

@@ -172,13 +172,14 @@ namespace Edu.WebApi.Controllers.Course
             var query = new RB_Class_ViewModel()
             {
                 Group_Id = base.UserInfo.Group_Id,
-                School_Id = base.ParmJObj.GetInt("School_Id"),
+               //School_Id = base.ParmJObj.GetInt("School_Id"),
                 ClassType = base.ParmJObj.GetInt("ClassType"),
                 StartTime = base.ParmJObj.GetStringValue("StartTime"),
                 EndTime = base.ParmJObj.GetStringValue("EndTime"),
                 TeacherName = base.ParmJObj.GetStringValue("TeacherName"),
                 CouseId = base.ParmJObj.GetInt("CouseId"),
-                OldClassId = base.ParmJObj.GetInt("ClassId")
+                OldClassId = base.ParmJObj.GetInt("ClassId"),
+                QClassStatus = "1,2"
             };
             var obj = studentBillModule.GetRenewClassModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
             pageModel.Count = Convert.ToInt32(rowsCount);