页面修改

Edu.Model/ViewModel/EduTask/RB_Change_ClassPlan_ViewModel.cs

@@ -73,7 +73,6 @@ namespace Edu.Model.ViewModel.EduTask
         /// </summary>
         public List<ChangePlanItem> OldChangePlanItemList { get; set; }
 
-
         /// <summary>
         /// 调整新数据信息
         /// </summary>
@@ -97,22 +96,35 @@ namespace Edu.Model.ViewModel.EduTask
         /// </summary>
         public DateTime ClassDate { get; set; }
 
+        /// <summary>
+        /// 上课时间
+        /// </summary>
+        public string ClassDateStr { get { return Common.ConvertHelper.FormatDate(this.ClassDate); } }
+
         /// <summary>
         /// 老师编号
         /// </summary>
         public int TeacherId { get; set; }
 
+        /// <summary>
+        /// 教师姓名
+        /// </summary>
+        public string TeacherName { get; set; }
+
         /// <summary>
         /// 教室编号
         /// </summary>
         public int ClassRoomId { get; set; }
 
+        /// <summary>
+        /// 教师名称
+        /// </summary>
+        public string ClassRoomName { get; set; }
+
         /// <summary>
         ///班级计划上课日期的上课时间表
         /// </summary>
         public List<Course.RB_Class_Time_ViewModel> PlanTimeList { get; set; }
-
-
     }
 
 
@@ -131,6 +143,7 @@ namespace Edu.Model.ViewModel.EduTask
         /// 课时分钟数
         /// </summary>
         public int ClassHourMinute { get; set; }
+
         /// <summary>
         /// 开课时间
         /// </summary>
@@ -141,11 +154,21 @@ namespace Edu.Model.ViewModel.EduTask
         /// </summary>
         public int TeacherId { get; set; }
 
+        /// <summary>
+        /// 老师姓名
+        /// </summary>
+        public string TeacherName { get; set; }
+
         /// <summary>
         /// 教室编号
         /// </summary>
         public int ClassRoomId { get; set; }
 
+        /// <summary>
+        /// 教师名称
+        /// </summary>
+        public string ClassRoomName { get; set; }
+
         /// 选中的周几/或日期数组
         /// </summary>
         public List<string> WeekDayList { get; set; }
@@ -155,22 +178,12 @@ namespace Edu.Model.ViewModel.EduTask
         /// </summary>
         public List<ClassTimeItem> DefaultTimeList { get; set; }
 
-        /// <summary>
-        /// 默认选中的日期、周
-        /// </summary>
-//public string DateJson { get; set; }
-
 
         /// <summary>
         /// 排课方式(1-周，2-月，3-固定日期，4-约课)
         /// </summary>
         public Common.Enum.Course.ClassStyleEnum ClassStyle { get; set; }
 
-
-        /// <summary>
-		/// 默认时间字符串JSON
-		/// </summary>
-	//	public string DefaultTimeJson { get; set; }
     }
 
     ///<summary>

Edu.Model/ViewModel/EduTask/RB_Education_Receipt_ViewModel.cs

@@ -24,5 +24,20 @@ namespace Edu.Model.ViewModel.EduTask
         /// 班级编号
         /// </summary>
         public string ClassNo { get; set; }
+
+        /// <summary>
+        /// 老师姓名
+        /// </summary>
+        public string TeacherName { get; set; }
+
+        /// <summary>
+        /// 学校名称
+        /// </summary>
+        public string SchoolName { get; set; }
+
+        /// <summary>
+        /// 课程名称
+        /// </summary>
+        public string CourseName { get; set; }
     }
 }

Edu.Repository/EduTask/RB_Education_ReceiptRepository.cs

@@ -66,8 +66,12 @@ namespace Edu.Repository.EduTask
             }
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
-SELECT A.*,IFNULL(B.ClassName,'') AS ClassName,IFNULL(B.ClassNo,'') AS ClassNo {0} 
+SELECT A.*,IFNULL(B.ClassName,'') AS ClassName,IFNULL(B.ClassNo,'') AS ClassNo,IFNULL(C.TeacherName,'') AS TeacherName
+       ,IFNULL(D.SName,'') AS SchoolName,IFNULL(E.CourseName,'') AS CourseName {0} 
 FROM RB_Education_Receipt AS A LEFT JOIN rb_class AS B ON A.ClassId=B.ClassId
+     LEFT JOIN rb_teacher AS C ON B.Teacher_Id=C.TId
+	 LEFT JOIN rb_school AS D ON A.School_Id=D.SId
+     LEFT JOIN rb_course AS E ON B.CouseId=E.CourseId
 WHERE 1=1  
 ", isSpecNode);
             if (query != null)