页面修改

Edu.Model/ViewModel/Sell/RB_Order_Guest_ViewModel.cs

@@ -314,5 +314,10 @@ namespace Edu.Model.ViewModel.Sell
         /// 学员数量
         /// </summary>
         public int StudentNum { get; set; }
+
+        /// <summary>
+        /// 学员账号编号
+        /// </summary>
+        public int Account_Id { get; set; }
     }
 }
\ No newline at end of file

Edu.Module.Course/ClassModule.cs

@@ -1127,6 +1127,7 @@ namespace Edu.Module.Course
                                     qitem.OrderId,
                                     GuestId = qitem.Id,
                                     qitem.CourseId,
+                                    qitem.Account_Id,
                                     IsCheck = false,
                                 })
                             };

Edu.Module.Goods/ActivitySurveyModule.cs

@@ -54,12 +54,13 @@ namespace Edu.Module.Goods
             bool flag = false;
             foreach (var item in model.GuestIdList)
             {
-                var oldModel = activitySurvey_GuestRepository.GetActivitySurveyGuestListRepository(new RB_ActivitySurvey_Guest_Extend()
-                {
-                    GuestId = item.GuestId,
-                    SurveyId = model.SurveyId
-                })?.FirstOrDefault();
-                model.Id = oldModel?.Id ?? 0;
+                //var oldModel = activitySurvey_GuestRepository.GetActivitySurveyGuestListRepository(new RB_ActivitySurvey_Guest_Extend()
+                //{
+                //    GuestId = item.GuestId,
+                //    SurveyId = model.SurveyId
+                //})?.FirstOrDefault();
+                //model.Id = oldModel?.Id ?? 0;
+
                 model.GuestId = item.GuestId;
                 if (model.Id > 0)
                 {
@@ -106,6 +107,12 @@ namespace Edu.Module.Goods
         public RB_ActivitySurvey_Guest_Extend GetActivitySurveyGuestModule(int Id)
         {
             var extModel = activitySurvey_GuestRepository.GetEntity<RB_ActivitySurvey_Guest_Extend>(Id);
+            if (extModel != null && extModel.GuestId > 0)
+            {
+                var stuModel = accountRepository.GetStudentExt(new RB_Account_ViewModel() { QIds = extModel.GuestId.ToString() }).FirstOrDefault();
+                extModel.GuestIdList = new List<GuestItem>();
+                extModel.GuestIdList.Add(new GuestItem() { GuestId = extModel.GuestId, GuestName = stuModel.AccountName });
+            }
             return extModel;
         }
 

Edu.Repository/Sell/RB_Order_GuestRepository.cs

@@ -190,7 +190,7 @@ namespace Edu.Repository.Sell
 SELECT sog.Student_Id as StudentId,A.*,cs.ClassName,cs.Teacher_Id,cs.ClassNo,IFNULL(B.JoinType,0) AS JoinType,IFNULL(B.TargetJoinType,0) AS TargetJoinType,IFNULL(B.StartClassHours,0) AS StartClassHours
        ,IFNULL(C.CourseName,'') AS CourseName,B.EffectStatus,B.EffectTime,B.UpOrderId,B.OrderType,B.CourseId,B.IsRenewOrder,B.RenewOrderId,B.EnterID
        ,sc.StopClassEffectTime,B.SourceOrderId,B.TargetOrderId,IFNULL(D.FirstClassHours,0)+IFNULL(D.SecondClassHours,0)+IFNULL(D.ThirdClassHours,0) AS ContractTotalHours
-	   ,IFNULL(stu.StuIcon,'') AS UserIcon,stu.StuTel,stu.StuRealMobile
+	   ,IFNULL(stu.StuIcon,'') AS UserIcon,stu.StuTel,stu.StuRealMobile,sog.Account_Id
 FROM RB_Order_Guest AS A LEFT JOIN rb_order AS B ON A.OrderId=B.OrderId
      LEFT JOIN rb_class AS cs ON B.ClassId=cs.ClassId
      LEFT JOIN rb_student_orderguest as sog on sog.GuestId=a.Id

Edu.WebApi/Controllers/Goods/SurveyController.cs

@@ -111,6 +111,7 @@ namespace Edu.WebApi.Controllers.Goods
                 Id = extModel?.Id ?? 0,
                 GuestId = extModel?.GuestId ?? 0,
                 GuestType = extModel?.GuestType ?? 0,
+                GuestIdList= extModel?.GuestIdList??new List<GuestItem> (),
                 StartTime = Common.ConvertHelper.FormatTime(extModel.StartTime),
                 EndTime = Common.ConvertHelper.FormatTime(extModel.EndTime),
             };