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

Edu.Model/ViewModel/Customer/RB_Customer_Extend.cs

@@ -74,11 +74,6 @@ namespace Edu.Model.ViewModel.Customer
         /// </summary>
         public int QCustomerState { get; set; }
 
-        /// <summary>
-        /// 查询同业类型   1非关联同业客人
-        /// </summary>
-        public int QCustomerType { get; set; }
-
         /// <summary>
         /// 同业Ids
         /// </summary>

Edu.Model/ViewModel/User/RB_Student_ViewModel.cs

@@ -159,6 +159,11 @@ namespace Edu.Model.ViewModel.User
         /// </summary>
         public int IsQueryMyStu { get; set; }
 
+        /// <summary>
+        /// 学生类型  1非关联同行的
+        /// </summary>
+        public int QStudentType { get; set; }
+
         /// <summary>
         /// 开始时间
         /// </summary>

Edu.Module.Course/OrderModule.cs

@@ -785,6 +785,8 @@ namespace Edu.Module.Course
                     { nameof(RB_Order_ViewModel.EffectStatus),demodel.EffectStatus},
                     { nameof(RB_Order_ViewModel.EffectTime),demodel.EffectTime},
                     { nameof(RB_Order_ViewModel.UpOrderId),demodel.UpOrderId},
+                    { nameof(RB_Order_ViewModel.CustomerId),demodel.CustomerId},
+                    { nameof(RB_Order_ViewModel.CourseConsultantId),demodel.CourseConsultantId},
                 };
                 flag = orderRepository.Update(keyValues, new WhereHelper(nameof(RB_Order_ViewModel.OrderId), demodel.OrderId));
                 //记录日志信息
@@ -818,6 +820,15 @@ namespace Edu.Module.Course
                     var empList = accountRepository.GetAccountListRepository(new RB_Account_ViewModel() { QIds = orderModel.HelpEnterId + "," + demodel.HelpEnterId });
                     LogContent += $"，协助人员由【{empList?.Where(qitem => qitem.Id == orderModel.HelpEnterId)?.FirstOrDefault()?.AccountName}】修改为【{empList?.Where(qitem => qitem.Id == demodel.HelpEnterId)?.FirstOrDefault()?.AccountName}】";
                 }
+                if (orderModel.CourseConsultantId != demodel.CourseConsultantId)
+                {
+                    var empList = accountRepository.GetAccountListRepository(new RB_Account_ViewModel() { QIds = orderModel.CourseConsultantId + "," + demodel.CourseConsultantId });
+                    LogContent += $"，课程顾问由【{empList?.Where(qitem => qitem.Id == orderModel.CourseConsultantId)?.FirstOrDefault()?.AccountName}】修改为【{empList?.Where(qitem => qitem.Id == demodel.CourseConsultantId)?.FirstOrDefault()?.AccountName}】";
+                }
+                if (orderModel.CustomerId != demodel.CustomerId)
+                {
+                    LogContent += $"，关联同行由【{customerRepository.GetEntity(orderModel.CustomerId)?.CustomerName ?? ""}】修改为【{customerRepository.GetEntity(demodel.CustomerId)?.CustomerName ?? ""}】";
+                }
                 if (orderModel.GeneralOccupation != demodel.GeneralOccupation)
                 {
                     LogContent += $"，一般同行由【{orderModel.GeneralOccupation}】修改为【{demodel.GeneralOccupation}】";

Edu.Repository/Customer/RB_CustomerRepository.cs

@@ -43,10 +43,6 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Customer_Extend.CustomerId), query.CustomerId);
                 }
-                if (query.QCustomerType == 1)
-                {
-                    builder.AppendFormat(" AND A.{0}=0 ", nameof(RB_Customer_Extend.CustomerId));
-                }
                 if (query.CreateBy > 0)
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Customer_Extend.CreateBy), query.CreateBy);

Edu.Repository/User/RB_StudentRepository.cs

@@ -145,6 +145,10 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Student_ViewModel.CustomerId), query.CustomerId);
                 }
+                if (query.QStudentType == 1)
+                {
+                    builder.AppendFormat(" AND t.{0}=0 ", nameof(RB_Student_ViewModel.CustomerId));
+                }
                 if (query.StuId > 0)
                 {
                     builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Student_ViewModel.StuId), query.StuId);

Edu.WebApi/Controllers/Customer/B2BCustomerController.cs

@@ -458,8 +458,7 @@ namespace Edu.WebApi.Controllers.Customer
                 CustomerName = base.ParmJObj.GetStringValue("CustomerName"),
                 ContactNumber = base.ParmJObj.GetStringValue("ContactNumber"),
                 ApproveState = base.ParmJObj.GetInt("ApproveState"),
-                QCustomerState = base.ParmJObj.GetInt("QCustomerState"),
-                QCustomerType = base.ParmJObj.GetInt("QCustomerType", -1)
+                QCustomerState = base.ParmJObj.GetInt("QCustomerState")
             };
             query.CreateBy = userInfo.Id;
             var list = customerModule.GetCustomerPageModule_V2(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);

Edu.WebApi/Controllers/User/UserController.cs

@@ -670,6 +670,7 @@ namespace Edu.WebApi.Controllers.User
                 StartTime = base.ParmJObj.GetStringValue("StartTime"),
                 EndTime = base.ParmJObj.GetStringValue("EndTime"),
                 BelongType=base.ParmJObj.GetInt("BelongType"),
+                QStudentType = base.ParmJObj.GetInt("QStudentType", -1)
             };
             if (query.IsQueryMyStu == 1)
             {