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

Edu.Common/Config.cs

@@ -380,6 +380,19 @@ namespace Edu.Common
             }
         }
 
+        /// <summary>
+        /// 临时上课邀请流程编号
+        /// </summary>
+        public static int TempInvitationClassFlowId
+        {
+            get
+            {
+                int.TryParse(ReadConfigKey("TempInvitationClassFlowId"), out int TempInvitationClassFlowId);
+                return TempInvitationClassFlowId;
+            }
+        }
+
+
         /// <summary>
         /// 订单转班流程编号
         /// </summary>
@@ -552,8 +565,10 @@ namespace Edu.Common
         /// <summary>
         /// 销售发放提成的前提比例
         /// </summary>
-        public static string SellCommissionFFBL {
-            get {
+        public static string SellCommissionFFBL
+        {
+            get
+            {
                 return ReadConfigKey("SellCommissionFFBL");
             }
         }
@@ -651,8 +666,10 @@ namespace Edu.Common
         /// <summary>
         /// 获取字母排序
         /// </summary>
-        public static string ClassNoLetterStr {
-            get {
+        public static string ClassNoLetterStr
+        {
+            get
+            {
                 return "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
             }
         }

Edu.Model/Entity/EduTask/RB_Student_StopClass.cs

@@ -59,6 +59,12 @@ namespace Edu.Model.Entity.EduTask
         /// </summary>
         public int UpdateBy { get; set; }
 
+
+        /// <summary>
+        /// 申请之前的状态
+        /// </summary>
+        public int OldStudentStatus { get; set; }
+
         /// <summary>
         /// 更新时间
         /// </summary>

Edu.Model/Entity/EduTask/RB_Student_TempInvitation.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.EduTask
+{
+    /// <summary>
+    /// 临时邀请学生上课申请实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Student_TempInvitation
+    {
+        /// <summary>
+        /// 主键(调课编号)
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 学校编号
+        /// </summary>
+        public int School_Id { get; set; }
+
+        /// <summary>
+        /// 班级编号
+        /// </summary>
+        public int ClassId { get; set; }
+
+        /// <summary>
+        /// 课程编号
+        /// </summary>
+        public int CourseId { get; set; }
+
+        /// <summary>
+        /// 老师id
+        /// </summary>
+        public int TeacherId { get; set; }
+
+        /// <summary>
+        /// 学生id
+        /// </summary>
+        public string OrderGuestIds { get; set; }
+
+        /// <summary>
+        /// 计划id
+        /// </summary>
+        public int ClassPlanId { get; set; }
+        /// <summary>
+        /// 计划时间id
+        /// </summary>
+        public int ClassTimeId { get; set; }
+
+
+
+        /// <summary>
+        /// 集团编号
+        /// </summary>
+        public int Group_Id { get; set; }
+
+       
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public int CreateBy { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime { get; set; }
+
+        /// <summary>
+        /// 修改人
+        /// </summary>
+        public int UpdateBy { get; set; }
+
+
+        /// <summary>
+        /// 更新时间
+        /// </summary>
+        public DateTime UpdateTime { get; set; }
+
+        /// <summary>
+        /// 申请备注
+        /// </summary>
+        public string Remarks { get; set; }
+    }
+}

Edu.Model/Entity/EduTask/RB_Temporary_Invitation.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Edu.Model.Entity.EduTask
+{
+    /// <summary>
+    /// 临时上课邀请
+    /// </summary>
+    public class RB_Temporary_Invitation
+    {
+        /// <summary>
+        /// 编号
+        /// </summary>
+        public int Id { get; set; }
+
+       
+        /// <summary>
+        /// 集团编号
+        /// </summary>
+        public int Group_Id { get; set; }
+        /// <summary>
+        /// 学校id
+        /// </summary>
+        public int School_Id { get; set; }
+
+        /// <summary>
+        /// 班级id
+        /// </summary>
+        public int ClassId { get; set; }
+
+        /// <summary>
+        /// 课程编号
+        /// </summary>
+        public int CourseId { get; set; }
+
+        /// <summary>
+        /// 计划id
+        /// </summary>
+        public int ClassPlanId { get; set; }
+        /// <summary>
+        /// 计划时间id
+        /// </summary>
+        public int ClassTimeId { get; set; }
+
+        /// <summary>
+        /// 学员id
+        /// </summary>
+        public int OrderGuestId { get; set; }
+
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public int CreateBy { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime { get; set; }
+    }
+}

Edu.Model/ViewModel/Course/RB_Order_Guest_ViewModel.cs

@@ -10,6 +10,11 @@ namespace Edu.Model.ViewModel.Course
     [Serializable]
     public class RB_Order_Guest_ViewModel : Model.Entity.Course.RB_Order_Guest
     {
+        /// <summary>
+        /// 订单学生号
+        /// </summary>
+        public string OrderGuestIds { get; set; }
+
         /// <summary>
         /// 订单ids
         /// </summary>
@@ -34,6 +39,10 @@ namespace Edu.Model.ViewModel.Course
         /// </summary>
         public string ClassName { get; set; }
 
+        /// <summary>
+        /// 班号
+        /// </summary>
+        public string ClassNo { get; set; }
         /// <summary>
         /// 老师id
         /// </summary>
@@ -184,5 +193,15 @@ namespace Edu.Model.ViewModel.Course
         /// 续课订单编号
         /// </summary>
         public int RenewOrderId { get; set; }
+
+        /// <summary>
+        /// 老师
+        /// </summary>
+        public string TeacherName { get; set; }
+
+        /// <summary>
+        /// 学校
+        /// </summary>
+        public string SchoolName { get; set; }
     }
 }
\ No newline at end of file

Edu.Model/ViewModel/EduTask/RB_Student_StopClass_ViewModel.cs

@@ -20,5 +20,10 @@ namespace Edu.Model.ViewModel.EduTask
         /// 多个ids
         /// </summary>
         public string Q_Student_StopClass_Ids { get; set; }
+
+        /// <summary>
+        /// 学员信息
+        /// </summary>
+        public Course.RB_Order_Guest_ViewModel Order_Guest_ViewModel { get; set; }
     }
 }

Edu.Model/ViewModel/EduTask/RB_Student_TempInvitation_ViewModel.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Edu.Model.Entity.EduTask;
+
+namespace Edu.Model.ViewModel.EduTask
+{
+    /// <summary>
+    /// 临时邀请学员上课扩展表
+    /// </summary>
+    public class RB_Student_TempInvitation_ViewModel : RB_Student_TempInvitation
+    {
+
+    }
+}

Edu.Model/ViewModel/EduTask/RB_Temporary_Invitation_ViewModel.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Edu.Model.Entity.EduTask;
+
+namespace Edu.Model.ViewModel.EduTask
+{
+    /// <summary>
+    /// 临时上课邀请申请扩展实体
+    /// </summary>
+    public class RB_Temporary_Invitation_ViewModel : RB_Temporary_Invitation
+    {
+        /// <summary>
+        /// 班级名称
+        /// </summary>
+        public string ClassName { get; set; }
+
+
+        /// <summary>
+        /// 多个ids
+        /// </summary>
+        public string Q_TempInvitation_Ids { get; set; }
+
+
+        /// <summary>
+        /// 校区名称
+        /// </summary>
+        public string SchoolName { get; set; }
+
+
+
+        /// <summary>
+        /// 班级编号
+        /// </summary>
+        public string ClassNo { get; set; }
+
+        /// <summary>
+        /// 教师名称
+        /// </summary>
+        public string TeacherName { get; set; }
+
+        /// <summary>
+        /// 课程名称
+        /// </summary>
+        public string CourseName { get; set; }
+
+
+        /// <summary>
+        /// 学员信息
+        /// </summary>
+        public List<Course.RB_Order_Guest_ViewModel> OrderGuestList { get; set; }
+
+    }
+}

Edu.Module.EduTask/EducationReceiptModule.cs

@@ -46,6 +46,12 @@ namespace Edu.Module.EduTask
         /// </summary>
         private readonly RB_Student_BackClassRepository student_BackClassRepository = new RB_Student_BackClassRepository();
 
+        /// <summary>
+        /// 学员停课仓储层对象
+        /// </summary>
+        private readonly RB_Student_StopClassRepository student_StopClassRepository = new RB_Student_StopClassRepository();
+
+
         /// <summary>
         /// 调课仓储层对象
         /// </summary>
@@ -61,6 +67,11 @@ namespace Edu.Module.EduTask
         /// </summary>
         private readonly RB_Class_RoomRepository class_RoomRepository = new RB_Class_RoomRepository();
 
+        /// <summary>
+        /// 订单学员仓储层对象
+        /// </summary>
+        private readonly RB_Order_GuestRepository order_GuestRepository = new RB_Order_GuestRepository();
+
         /// <summary>
         /// 获取教务单据分页列表
         /// </summary>
@@ -79,8 +90,12 @@ namespace Edu.Module.EduTask
                 List<RB_Student_BackClass_ViewModel> backClassLisit = new List<RB_Student_BackClass_ViewModel>();
                 //调课申请
                 List<RB_Change_ClassPlan_ViewModel> changeClassList = new List<RB_Change_ClassPlan_ViewModel>();
+                //停课申请
+                List<RB_Student_StopClass_ViewModel> stopClassList = new List<RB_Student_StopClass_ViewModel>();
                 //老师列表
                 List<RB_Teacher_ViewModel> teacherList = new List<RB_Teacher_ViewModel>();
+                //学生信息
+                List<RB_Order_Guest_ViewModel> orderGuestList = new List<RB_Order_Guest_ViewModel>();
                 //教室列表
                 List<RB_Class_Room_ViewModel> roomList = new List<RB_Class_Room_ViewModel>();
                 var groupList = list.GroupBy(qitem => new { qitem.ReceiptType }).Select(qitem => new { qitem.Key.ReceiptType });
@@ -169,7 +184,7 @@ namespace Edu.Module.EduTask
                         }
                         if (teacherIds != null && teacherIds.Count > 0)
                         {
-                            teacherList= teacherRepository.GetTeacherListRepository(new Model.ViewModel.User.RB_Teacher_ViewModel()
+                            teacherList = teacherRepository.GetTeacherListRepository(new Model.ViewModel.User.RB_Teacher_ViewModel()
                             {
                                 QTIds = string.Join(",", teacherIds)
                             });
@@ -182,6 +197,27 @@ namespace Edu.Module.EduTask
                             });
                         }
                     }
+                    if (subItem.ReceiptType == Common.Enum.Finance.ReceiptTypeEnum.StopClass)
+                    {
+                        string changeIds = string.Join(",", list.Where(qitem => qitem.ReceiptType == subItem.ReceiptType).Select(qitem => qitem.RelationId));
+                        stopClassList = student_StopClassRepository.GetStudentStopClassListRepository(new RB_Student_StopClass_ViewModel()
+                        {
+                            Q_Student_StopClass_Ids = changeIds
+                        });
+                        if (stopClassList != null && stopClassList.Any())
+                        {
+                            string orderGuestIds = string.Join(",", stopClassList.Select(x => x.OrderGuestId));
+                            orderGuestList = order_GuestRepository.GetStopingStudentPage(new RB_Order_Guest_ViewModel
+                            {
+                                OrderGuestIds = orderGuestIds
+                            });
+                            if (orderGuestList != null && orderGuestList.Any())
+                            {
+                                stopClassList.ForEach(x => x.Order_Guest_ViewModel = orderGuestList.Where(y => y.Id == x.OrderGuestId).FirstOrDefault());
+                            }
+                        }
+
+                    }
                 }
 
                 foreach (var item in list)
@@ -214,13 +250,17 @@ namespace Edu.Module.EduTask
                         }
                         if (tempModel.AllChangePlanModel != null)
                         {
-                            tempModel.AllChangePlanModel.TeacherName= teacherList?.Where(qitem => qitem.TId == tempModel.AllChangePlanModel.TeacherId)?.FirstOrDefault()?.TeacherName ?? "";
+                            tempModel.AllChangePlanModel.TeacherName = teacherList?.Where(qitem => qitem.TId == tempModel.AllChangePlanModel.TeacherId)?.FirstOrDefault()?.TeacherName ?? "";
                             tempModel.AllChangePlanModel.ClassRoomName = roomList?.Where(qitem => qitem.RoomId == tempModel.AllChangePlanModel.ClassRoomId)?.FirstOrDefault()?.RoomName ?? "";
                         }
                         DataObj = tempModel;
                     }
-                    object AuditObj =new object();
-                    if (item.VerifyStatus == EduTaskRrocessStatus.NotAudit|| item.VerifyStatus == EduTaskRrocessStatus.AuditIng)
+                    if (item.ReceiptType == Common.Enum.Finance.ReceiptTypeEnum.StopClass)
+                    {
+                        DataObj = stopClassList?.Where(qitem => qitem.Id == item.RelationId)?.FirstOrDefault();
+                    }
+                    object AuditObj = new object();
+                    if (item.VerifyStatus == EduTaskRrocessStatus.NotAudit || item.VerifyStatus == EduTaskRrocessStatus.AuditIng)
                     {
                         var tempRecordList = recordList?.Where(qitem => qitem.ConditionId == item.Id)?.ToList();
                         if (tempRecordList != null && tempRecordList.Count > 0)
@@ -275,7 +315,7 @@ namespace Edu.Module.EduTask
             var recordList = education_RecordRepository.GetEducationRecordListRepository(new RB_Education_Record_ViewModel()
             {
                 QConditionIds = Id.ToString(),
-                AuditStatus= EduTaskRrocessStatus.AuditIng
+                AuditStatus = EduTaskRrocessStatus.AuditIng
             });
             if (recordList != null && recordList.Count > 0)
             {
@@ -320,7 +360,7 @@ namespace Edu.Module.EduTask
             bool flag = true;
             foreach (var item in list)
             {
-                if (flag&&item.NewAuditEmId > 0)
+                if (flag && item.NewAuditEmId > 0)
                 {
                     Dictionary<string, object> fileds = new Dictionary<string, object>()
                     {
@@ -341,7 +381,7 @@ namespace Edu.Module.EduTask
 
                 })?.FirstOrDefault();
 
-                if (recordList != null && recordList.Count > 0 && relevance!=null)
+                if (recordList != null && recordList.Count > 0 && relevance != null)
                 {
                     string audits = string.Join(",", recordList.Select(qitem => qitem.AuditEmId));
                     Dictionary<string, object> fileds = new Dictionary<string, object>()
@@ -375,6 +415,11 @@ namespace Edu.Module.EduTask
                 var changeClassModel = change_ClassPlanRepository.GetEntity<RB_Change_ClassPlan_ViewModel>(receipt.RelationId);
                 ApplyReason = changeClassModel?.Remarks ?? "";
             }
+            else if (receipt.ReceiptType == Common.Enum.Finance.ReceiptTypeEnum.StopClass)
+            {
+                var changeClassModel = student_StopClassRepository.GetEntity<RB_Student_StopClass_ViewModel>(receipt.RelationId);
+                ApplyReason = changeClassModel?.Remarks ?? "";
+            }
             //获取审核记录
             var aurList = education_RecordRepository.GetEducationRecordListRepository(new RB_Education_Record_ViewModel()
             {
@@ -878,7 +923,7 @@ namespace Edu.Module.EduTask
             {
                 if (auditModel.AuditStatus == 2)
                 {
-                    flag = student_BackClassRepository.UpdateStudentBackClassRepository(receiptModel,auditModel);
+                    flag = student_BackClassRepository.UpdateStudentBackClassRepository(receiptModel, auditModel);
                 }
                 if (auditModel.AuditStatus == 3)
                 {
@@ -893,6 +938,18 @@ namespace Edu.Module.EduTask
                     flag = change_ClassPlanRepository.UpdateChangeClassPlan(receiptModel.Id);
                 }
             }
+            //停课
+            if (receiptModel.ReceiptType == Common.Enum.Finance.ReceiptTypeEnum.StopClass)
+            {
+                if (auditModel.AuditStatus == 2)
+                {
+                    flag = student_StopClassRepository.UpdateStudentStopClass(receiptModel, auditModel.AuditStatus);
+                }
+                if (auditModel.AuditStatus == 3)
+                {
+                    flag = student_StopClassRepository.UpdateStudentStopClass(receiptModel, auditModel.AuditStatus);
+                }
+            }
             return flag;
         }
 

Edu.Repository/Course/RB_Order_GuestRepository.cs

@@ -273,6 +273,10 @@ WHERE  1=1 and A.Status=0    and b.OrderState<>3
             {
                 builder.AppendFormat($@" AND A.{nameof(RB_Order_Guest_ViewModel.OrderId)} ={demodel.OrderId}");
             }
+            if (demodel.Teacher_Id > 0)
+            {
+                builder.AppendFormat($@" and class.Teacher_Id ={demodel.Teacher_Id}");
+            }
             if (!string.IsNullOrEmpty(demodel.GuestName))
             {
                 builder.AppendFormat($@" AND A.{nameof(RB_Order_Guest_ViewModel.GuestName)} like '%{demodel.GuestName}%'");
@@ -301,5 +305,79 @@ WHERE  1=1 and A.Status=0    and b.OrderState<>3
             builder.AppendFormat($@" order by A.{nameof(RB_Order_Guest_ViewModel.Id)} desc");
             return GetPage<RB_Order_Guest_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString()).ToList();
         }
+
+
+
+
+        /// <summary>
+        /// 获取分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="demodel"></param>
+        /// <param name="orderIds"></param>
+        /// <returns></returns>
+        public List<RB_Order_Guest_ViewModel> GetStopingStudentPage( RB_Order_Guest_ViewModel demodel)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT A.*,IFNULL(B.IsChaBan,0) AS IsChaBan,IFNULL(B.StartClassHours,0) AS StartClassHours,school.SName as SchoolName,teacher.TeacherName,IFNULL(C.CourseName,'') AS CourseName,class.ClassNo,class.ClassName,b.EnterID
+      ,plan.TotalPlanNum,planr.Ranks ,B.EffectStatus,B.EffectTime,B.UpOrderId,B.OrderType,B.CourseId,B.IsRenewOrder,B.RenewOrderId
+FROM RB_Order_Guest AS A LEFT JOIN rb_order AS B ON A.OrderId=B.OrderId
+LEFT JOIN rb_class as class on class.ClassId=a.ClassId
+     LEFT JOIN rb_course AS C ON (B.CourseId=C.CourseId AND B.CourseId>0 AND B.OrderType=1)
+LEFT JOIN (SELECT ClassId,COUNT(*) TotalPlanNum from rb_class_plan where `Status`=0 GROUP BY ClassId) as plan on plan.ClassId=class.ClassId
+LEFT JOIN (SELECT ClassId,COUNT(*) Ranks from rb_class_plan where `Status`=0 and DATE_FORMAT(ClassDate,'%Y-%m-%d') <=DATE_FORMAT(NOW(),'%Y-%m-%d') GROUP BY ClassId) as planr on planr.ClassId=class.ClassId
+LEFT JOIN rb_teacher as teacher on teacher.TId=class.Teacher_Id
+LEFT JOIN rb_school as school on school.SId=class.School_Id
+WHERE  1=1 and A.Status=0    and b.OrderState<>3  ");
+            if (demodel.Group_Id > 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.OrderId > 0)
+            {
+                builder.AppendFormat($@" AND A.{nameof(RB_Order_Guest_ViewModel.OrderId)} ={demodel.OrderId}");
+            }
+            if (demodel.Teacher_Id > 0)
+            {
+                builder.AppendFormat($@" and class.Teacher_Id ={demodel.Teacher_Id}");
+            }
+            if (!string.IsNullOrEmpty(demodel.GuestName))
+            {
+                builder.AppendFormat($@" AND A.{nameof(RB_Order_Guest_ViewModel.GuestName)} like '%{demodel.GuestName}%'");
+            }
+            if (demodel.ClassId > 0)
+            {
+                builder.AppendFormat($@" AND A.{nameof(RB_Order_Guest_ViewModel.ClassId)} ={demodel.ClassId}");
+            }
+            if (demodel.CourseId > 0)
+            {
+                builder.AppendFormat($@" AND B.{nameof(RB_Order_Guest_ViewModel.CourseId)} ={demodel.CourseId}");
+            }
+            if (demodel.EnterID > 0)
+            {
+                builder.AppendFormat($@" AND B.{nameof(RB_Order_Guest_ViewModel.EnterID)} ={demodel.EnterID}");
+            }
+            if (demodel.SourceId > 0)
+            {
+                builder.AppendFormat($@" AND A.{nameof(RB_Order_Guest_ViewModel.SourceId)} ={demodel.SourceId}");
+            }
+            if (!string.IsNullOrWhiteSpace(demodel.OrderGuestIds))
+            {
+                builder.AppendFormat($@" AND A.{nameof(RB_Order_Guest_ViewModel.Id)}  in ({demodel.OrderGuestIds})");
+            }
+            if (demodel.GuestState > 0)
+            {
+                builder.AppendFormat($@" AND A.{nameof(RB_Order_Guest_ViewModel.GuestState)} ={demodel.GuestState}");
+            }
+            builder.AppendFormat($@" order by A.{nameof(RB_Order_Guest_ViewModel.Id)} desc");
+            return Get<RB_Order_Guest_ViewModel>(builder.ToString()).ToList();
+        }
     }
 }

Edu.Repository/EduTask/RB_Student_StopClassRepository.cs

@@ -4,14 +4,23 @@ using System.Linq;
 using System.Text;
 using Edu.Model.Entity.EduTask;
 using Edu.Model.ViewModel.EduTask;
+using VT.FW.DB;
 
 namespace Edu.Repository.EduTask
 {
-  public  class RB_Student_StopClassRepository:BaseRepository<RB_Student_StopClass>
+    public class RB_Student_StopClassRepository : BaseRepository<RB_Student_StopClass>
     {
+        // <summary>
+        /// 订单学员仓储层对象
+        /// </summary>
+        private readonly Course.RB_Order_GuestRepository order_GuestRepository = new Course.RB_Order_GuestRepository();
 
         /// <summary>
-        /// 获取调课计划列表
+        /// 教务单据仓储层对象
+        /// </summary>
+        private readonly RB_Education_ReceiptRepository education_ReceiptRepository = new RB_Education_ReceiptRepository();
+        /// <summary>
+        /// 获取停课列表
         /// </summary>
         /// <param name="query"></param>
         /// <returns></returns>
@@ -33,5 +42,83 @@ WHERE 1=1
             return Get<RB_Student_StopClass_ViewModel>(builder.ToString()).ToList();
         }
 
+
+
+        /// <summary>
+        /// 审核通过后更新申请表中的状态
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <param name="AuditStatus">2审核通过  3 不通过  4 驳回</param>
+        /// <returns></returns>
+        public bool UpdateStudentStopClass(object Id, int AuditStatus)
+        {
+            //查询当前调课信息
+            bool flag = false;
+            var receiptModel = education_ReceiptRepository.GetEntity(Id);
+            if (receiptModel == null || receiptModel.Id == 0)
+            {
+                return false;
+            }
+            if (receiptModel.ReceiptType != Common.Enum.Finance.ReceiptTypeEnum.ChangeClass)
+            {
+                return false;
+            }
+            var model = GetEntity(receiptModel.RelationId);
+            if (model == null || model.Id == 0)
+            {
+                return false;
+            }
+            else //更新学生的信息
+            {
+                if (AuditStatus == 2)//审核通过
+                {
+                    Dictionary<string, object> keyValues = new Dictionary<string, object>()
+                    {
+                        { nameof(RB_Student_StopClass_ViewModel.IsAuditThrough),1}
+                    };
+                    List<WhereHelper> wheres = new List<WhereHelper>() {
+                        new WhereHelper(){
+                             FiledName=nameof(RB_Student_StopClass_ViewModel.Id),
+                              FiledValue=model.Id,
+                               OperatorEnum=OperatorEnum.Equal
+                        }
+                     };
+                    flag = Update(keyValues, wheres);
+                }
+                else
+                { //拒绝or 不通过将状态改回之前的状态
+                    Dictionary<string, object> keyValues = new Dictionary<string, object>()
+                    {
+                        { nameof(RB_Student_StopClass_ViewModel.IsAuditThrough),(AuditStatus-1)}
+                    };
+                    List<WhereHelper> wheres = new List<WhereHelper>() {
+                        new WhereHelper(){
+                             FiledName=nameof(RB_Student_StopClass_ViewModel.Id),
+                              FiledValue=model.Id,
+                               OperatorEnum=OperatorEnum.Equal
+                        }
+                     };
+                    flag = Update(keyValues, wheres);
+                    if (flag)
+                    {
+                        Dictionary<string, object> keyStudentValues = new Dictionary<string, object>()
+                        {
+                            { nameof(Model.Entity.Course.RB_Order_Guest.GuestState),model.OldStudentStatus}
+                        };
+                        List<WhereHelper> wheresStudnetn = new List<WhereHelper>() {
+                            new WhereHelper(){
+                                 FiledName=nameof(Model.Entity.Course.RB_Order_Guest.Id),
+                                  FiledValue=model.OrderGuestId,
+                                   OperatorEnum=OperatorEnum.Equal
+                            }
+                         };
+                        flag = order_GuestRepository.Update(keyStudentValues, wheresStudnetn);
+                    }
+                }
+            }
+
+            return flag;
+        }
+
     }
 }

Edu.Repository/EduTask/RB_Student_TempInvitationRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Edu.Model.Entity.EduTask;
+
+namespace Edu.Repository.EduTask
+{
+    public class RB_Student_TempInvitationRepository:BaseRepository<RB_Student_TempInvitation>
+    {
+
+    }
+}

Edu.Repository/EduTask/RB_Temporary_InvitationRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Edu.Model.Entity.EduTask;
+using Edu.Model.ViewModel.EduTask;
+
+namespace Edu.Repository.EduTask
+{
+    public class RB_Temporary_InvitationRepository : BaseRepository<RB_Temporary_Invitation>
+    {
+        /// <summary>
+        /// 教务单据仓储层对象
+        /// </summary>
+        private readonly RB_Education_ReceiptRepository education_ReceiptRepository = new RB_Education_ReceiptRepository();
+
+
+        /// <summary>
+        /// 获取临时上课邀请申请列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Temporary_Invitation_ViewModel> GetTemporaryInvitationListRepository(RB_Temporary_Invitation_ViewModel query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@" 
+SELECT A.*,IFNULL(B.ClassName,'') AS ClassName
+FROM RB_Temporary_Invitation AS A LEFT JOIN rb_class AS B ON A.ClassId=B.ClassId
+WHERE 1=1
+");
+            if (query != null)
+            {
+                if (!string.IsNullOrEmpty(query.Q_TempInvitation_Ids))
+                {
+                    builder.AppendFormat(@" AND A.{0} IN ({1}) ", nameof(RB_Temporary_Invitation_ViewModel.Id), query.Q_TempInvitation_Ids);
+                }
+            }
+            return Get<RB_Temporary_Invitation_ViewModel>(builder.ToString()).ToList();
+        }
+    }
+}

Edu.WebApi/Controllers/EduTask/StopStudentClassController.cs

@@ -46,7 +46,8 @@ namespace Edu.WebApi.Controllers.EduTask
                 ClassId = base.ParmJObj.GetInt("ClassId"),
                 CourseId = base.ParmJObj.GetInt("CourseId"),
                 OrderGuestId = base.ParmJObj.GetInt("OrderGuestId"),
-                Remarks = base.ParmJObj.GetStringValue("Remarks")
+                Remarks = base.ParmJObj.GetStringValue("Remarks"),
+                OldStudentStatus= base.ParmJObj.GetInt("OldStudentStatus")
             };
             var classModel = classModule.GetClassModule(model.ClassId);
             try

Edu.WebApi/appsettings.json

@@ -84,6 +84,8 @@
     "ChangeClassFlowId": 2,
     //停课流程编号
     "StopClassFlowId": 3,
+    //临时上课邀请流程编号
+    "TempInvitationClassFlowId": 4,
     //订单转班流程编号
     "OrderTransClassFlowId": 5
 }
\ No newline at end of file