页面修改

Edu.Model/ViewModel/Customer/RB_Student_Visit_Extend.cs

@@ -10,5 +10,14 @@ namespace Edu.Model.ViewModel.Customer
     /// </summary>
     public class RB_Student_Visit_Extend : RB_Student_Visit
     {
+        /// <summary>
+        /// 校区名称
+        /// </summary>
+        public string SchoolName { get; set; }
+
+        /// <summary>
+        /// 接待人姓名
+        /// </summary>
+        public string ReceptionPersionName { get; set; }
     }
 }

Edu.Module.Customer/CustomerStudentModule.cs

@@ -235,7 +235,25 @@ namespace Edu.Module.Customer
         /// <returns></returns>
         public List<RB_Student_Visit_Extend> GetStudentVisitPageModule(int pageIndex, int pageSize, out long rowsCount, RB_Student_Visit_Extend query)
         {
-            return student_VisitRepository.GetStudentVisitPageRepository(pageIndex, pageSize, out rowsCount, query);
+            var list= student_VisitRepository.GetStudentVisitPageRepository(pageIndex, pageSize, out rowsCount, query);
+            if (list != null && list.Count > 0)
+            {
+                string sids = string.Join(",", list.Select(qitem => qitem.School_Id));
+                string empIds = string.Join(",", list.Select(qitem => qitem.ReceptionPersion));
+                var schoolList = schoolRepository.GetSchoolListRepository(new Model.ViewModel.User.RB_School_ViewModel()
+                {
+                    QSIds = sids
+                });
+                var empList = accountRepository.GetEmployeeListRepository(new Model.ViewModel.User.Employee_ViewModel() {
+                    QIds = empIds
+                });
+                foreach (var item in list)
+                {
+                    item.SchoolName = schoolList?.FirstOrDefault(qitem => qitem.SId == item.School_Id)?.SName ?? "";
+                    item.ReceptionPersionName = empList?.FirstOrDefault(qitem => qitem.Id == item.ReceptionPersion)?.EmployeeName ?? "";
+                }
+            }
+            return list;
         }
 
         /// <summary>

Edu.WebApi/Controllers/Customer/CustomerStudentController.cs

@@ -185,13 +185,24 @@ namespace Edu.WebApi.Controllers.Customer
                 StuId = base.ParmJObj.GetInt("StuId"),
             };
             query.Group_Id = base.UserInfo.Group_Id;
-            var list = customerStudentModule.GetStudentVisitPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
-            foreach (var item in list)
+            var data = customerStudentModule.GetStudentVisitPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
+            List<object> list = new List<object>();
+            foreach (var item in data)
             {
+                string CreateByName = "";
                 if (item.CreateBy > 0)
                 {
-                    // item.CreateByName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName ?? "";
+                    CreateByName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName ?? "";
                 }
+                list.Add(new
+                {
+                    item.SchoolName,
+                    item.ReceptionPersionName,
+                    item.Remark,
+                    item.Feedback,
+                    CreateTime=Common.ConvertHelper.FormatTimeStr2(item.CreateTime),
+                    CreateByName,
+                });
             }
             pageModel.Count = rowsCount;
             pageModel.PageData = list;