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

Edu.Model/ViewModel/Course/RB_Class_ViewModel.cs

@@ -75,7 +75,7 @@ namespace Edu.Model.ViewModel.Course
         public int OrderStudentCount { get; set; }
 
         /// <summary>
-        /// 学习名称
+        /// 学校名称
         /// </summary>
         public string SchoolName { get; set; }
 

Edu.Model/ViewModel/EduTask/RB_Order_Change_ViewModel.cs

-using Edu.Model.Entity.EduTask;
+using Edu.Model.CacheModel;
+using Edu.Model.Entity.EduTask;
 using System;
 using System.Collections.Generic;
 using System.Text;
@@ -45,4 +46,65 @@ namespace Edu.Model.ViewModel.EduTask
         /// </summary>
         public string EffectiveDateStr { get { return Common.ConvertHelper.FormatDate(this.EffectiveDate); } }
     }
+
+    /// <summary>
+    /// 订单转班分拆生成财务单据实体类
+    /// </summary>
+    public class OrderChangeFinace
+    {
+        /// <summary>
+        /// 更改类型(1-转班，2-分拆)
+        /// </summary>
+        public int ChangeType { get; set; }
+
+        /// <summary>
+        /// 应收/退款
+        /// </summary>
+        public decimal InCome { get; set; }
+            
+        /// <summary>
+        /// 学员编号
+        /// </summary>
+        public int GuestId { get; set; }
+
+        /// <summary>
+        /// 学员名称
+        /// </summary>
+        public string GuestName { get; set; }
+
+        /// <summary>
+        /// 操作人员
+        /// </summary>
+        public UserInfo UserInfo { get; set; }
+
+        /// <summary>
+        /// 班级编号
+        /// </summary>
+        public int ClassId { get; set; }
+
+        /// <summary>
+        /// 班级所在校区编号
+        /// </summary>
+        public int Class_School_Id { get; set; }
+
+        /// <summary>
+        /// 校区名称
+        /// </summary>
+        public string SName { get; set; }
+
+        /// <summary>
+        /// 班级名称
+        /// </summary>
+        public string ClassName { get; set; }
+
+        /// <summary>
+        /// 订单编号
+        /// </summary>
+        public int OrderId { get; set; }
+            
+        /// <summary>
+        /// 关联财务单号
+        /// </summary>
+        public int ReFinanceId { get; set; }
+    }
 }

Edu.Module.EduTask/EducationReceiptModule.cs

@@ -1156,7 +1156,6 @@ namespace Edu.Module.EduTask
                 {
                     student_BackClassRepository.UpdateGuestStateRepository(receiptModel, auditModel);
                 }
-                
             }
             return flag;
         }

Edu.Repository/Course/RB_ClassRepository.cs

@@ -24,9 +24,10 @@ namespace Edu.Repository.Course
         {
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
-SELECT A.* ,IFNULL(B.CourseName,'') AS CourseName,IFNULL(C.GuestNum,0) AS GuestNum
+SELECT A.* ,IFNULL(B.CourseName,'') AS CourseName,IFNULL(C.GuestNum,0) AS GuestNum,IFNULL(D.SName,'') AS SchoolName
 FROM rb_class AS A LEFT JOIN rb_course AS B ON A.CouseId=B.CourseId
      LEFT JOIN(SELECT ClassId,SUM(GuestNum) AS GuestNum FROM rb_order WHERE OrderState=1 GROUP BY ClassId) AS C ON A.ClassId=C.ClassId
+	 LEFT JOIN rb_school AS D ON A.School_Id=D.SId
 WHERE 1=1 
 ");
             builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_ViewModel.Status), (int)DateStateEnum.Normal);