实体优化

Edu.Model/ViewModel/EduTask/RB_Change_ClassPlan_ViewModel.cs

 using Edu.Model.Entity.EduTask;
 using Edu.Model.ViewModel.Course;
+using Edu.Model.ViewModel.Grade;
 using System;
 using System.Collections.Generic;
 using System.Text;
@@ -125,7 +126,7 @@ namespace Edu.Model.ViewModel.EduTask
         /// <summary>
         ///班级计划上课日期的上课时间表
         /// </summary>
-        public List<Course.RB_Class_Time_ViewModel> PlanTimeList { get; set; }
+        public List<RB_Class_Time_ViewModel> PlanTimeList { get; set; }
     }
 
 

Edu.Model/ViewModel/Course/ClassTypeStatic_ViewModel.cs → Edu.Model/ViewModel/Grade/ClassTypeStatic_ViewModel.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Edu.Model.ViewModel.Course
+namespace Edu.Model.ViewModel.Grade
 {
     /// <summary>
     /// 班级类型统计

Edu.Model/ViewModel/Course/Class_LessonPlan_ViewModel.cs → Edu.Model/ViewModel/Grade/Class_LessonPlan_ViewModel.cs

@@ -3,8 +3,9 @@ using System.Collections.Generic;
 using System.Text;
 using Edu.Common.Enum;
 using Edu.Model.Entity.Course;
+using Edu.Model.ViewModel.Course;
 
-namespace Edu.Model.ViewModel.Course
+namespace Edu.Model.ViewModel.Grade
 {
 
     /// <summary>

Edu.Model/ViewModel/Course/RB_Class_Check_ViewModel.cs → Edu.Model/ViewModel/Grade/RB_Class_Check_ViewModel.cs

@@ -5,7 +5,7 @@ using Edu.Common.Enum.Sale;
 using Edu.Model.Entity.Course;
 using Edu.Model.Entity.Grade;
 
-namespace Edu.Model.ViewModel.Course
+namespace Edu.Model.ViewModel.Grade
 {
     /// <summary>
     /// 班级学员签到视图实体类

Edu.Model/ViewModel/Course/RB_Class_Config_ViewModel.cs → Edu.Model/ViewModel/Grade/RB_Class_Config_ViewModel.cs

@@ -4,7 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace Edu.Model.ViewModel.Course
+namespace Edu.Model.ViewModel.Grade
 {
     /// <summary>
     /// 班级基础配置视图实体类

Edu.Model/ViewModel/Course/RB_Class_Course_Extend.cs → Edu.Model/ViewModel/Grade/RB_Class_Course_Extend.cs

 using Edu.Model.Entity.Course;
 using Edu.Model.Entity.Grade;
+using Edu.Model.ViewModel.Course;
 using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace Edu.Model.ViewModel.Course
+namespace Edu.Model.ViewModel.Grade
 {
     /// <summary>
     /// 班级关联课程扩展实体类

Edu.Model/ViewModel/Course/RB_Class_Finance_ViewModel.cs → Edu.Model/ViewModel/Grade/RB_Class_Finance_ViewModel.cs

@@ -4,7 +4,7 @@ using System.Text;
 using Edu.Model.Entity.Course;
 using Edu.Model.Entity.Grade;
 
-namespace Edu.Model.ViewModel.Course
+namespace Edu.Model.ViewModel.Grade
 {
     /// <summary>
     /// 班级收支实体表

Edu.Model/ViewModel/Course/RB_Class_LessonComment_ViewModel.cs → Edu.Model/ViewModel/Grade/RB_Class_LessonComment_ViewModel.cs

 using Edu.Model.Entity.Course;
 using Edu.Model.Entity.Grade;
 
-namespace Edu.Model.ViewModel.Course
+namespace Edu.Model.ViewModel.Grade
 {
     /// <summary>
     /// 班级备案评论扩展实体类

Edu.Model/ViewModel/Course/RB_Class_LessonPlanDetails_ViewModel.cs → Edu.Model/ViewModel/Grade/RB_Class_LessonPlanDetails_ViewModel.cs

@@ -4,7 +4,7 @@ using System.Text;
 using Edu.Model.Entity.Course;
 using Edu.Model.Entity.Grade;
 
-namespace Edu.Model.ViewModel.Course
+namespace Edu.Model.ViewModel.Grade
 {
     /// <summary>
     /// 老师教案详细内容

Edu.Model/ViewModel/Course/RB_Class_LessonPlanProjects_ViewModel.cs → Edu.Model/ViewModel/Grade/RB_Class_LessonPlanProjects_ViewModel.cs

 using System.Collections.Generic;
 using Edu.Model.Entity.Grade;
 
-namespace Edu.Model.ViewModel.Course
+namespace Edu.Model.ViewModel.Grade
 {
     /// <summary>
     /// 老师教案指导项目扩展表

Edu.Model/ViewModel/Course/RB_Class_LessonPlan_ViewModel.cs → Edu.Model/ViewModel/Grade/RB_Class_LessonPlan_ViewModel.cs

@@ -4,7 +4,7 @@ using System.Text;
 using Edu.Model.Entity.Course;
 using Edu.Model.Entity.Grade;
 
-namespace Edu.Model.ViewModel.Course
+namespace Edu.Model.ViewModel.Grade
 {
     /// <summary>
     /// 老师教案扩展表

Edu.Model/ViewModel/Course/RB_Class_Log_ViewModel.cs → Edu.Model/ViewModel/Grade/RB_Class_Log_ViewModel.cs

 using Edu.Model.Entity.Log;
 
-namespace Edu.Model.ViewModel.Course
+namespace Edu.Model.ViewModel.Grade
 {
     /// <summary>
     /// 班级日志视图实体类

Edu.Model/ViewModel/Course/RB_Class_Plan_ViewModel.cs → Edu.Model/ViewModel/Grade/RB_Class_Plan_ViewModel.cs

 using Edu.Model.Entity.Course;
 using Edu.Model.Entity.Grade;
+using Edu.Model.ViewModel.Course;
 using System.Collections.Generic;
 
-namespace Edu.Model.ViewModel.Course
+namespace Edu.Model.ViewModel.Grade
 {
     /// <summary>
     /// 班级上课计划视图实体类

Edu.Model/ViewModel/Course/RB_Class_RoomUseLog_ViewModel.cs → Edu.Model/ViewModel/Grade/RB_Class_RoomUseLog_ViewModel.cs

@@ -4,7 +4,7 @@ using System.Text;
 using Edu.Model.Entity.Course;
 using Edu.Model.Entity.Grade;
 
-namespace Edu.Model.ViewModel.Course
+namespace Edu.Model.ViewModel.Grade
 {
     /// <summary>
     /// 教室异常管理扩展类

Edu.Model/ViewModel/Course/RB_Class_Room_ViewModel.cs → Edu.Model/ViewModel/Grade/RB_Class_Room_ViewModel.cs

@@ -3,7 +3,7 @@ using Edu.Common.Plugin;
 using Edu.Model.Entity.Course;
 using Edu.Model.Entity.Grade;
 
-namespace Edu.Model.ViewModel.Course
+namespace Edu.Model.ViewModel.Grade
 {
     /// <summary>
     /// 教室管理扩展实体类

Edu.Model/ViewModel/Course/RB_Class_StepPrice_ViewModel.cs → Edu.Model/ViewModel/Grade/RB_Class_StepPrice_ViewModel.cs

 using Edu.Model.Entity.Grade;
 
-namespace Edu.Model.ViewModel.Course
+namespace Edu.Model.ViewModel.Grade
 {
     /// <summary>
     /// 课程阶梯价实体类

Edu.Model/ViewModel/Course/RB_Class_Time_Extend.cs → Edu.Model/ViewModel/Grade/RB_Class_Time_Extend.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Edu.Model.ViewModel.Course
+namespace Edu.Model.ViewModel.Grade
 {
     public class RB_Class_Time_Extend
     {

Edu.Model/ViewModel/Course/RB_Class_Time_UnKnowUser_ViewModel.cs → Edu.Model/ViewModel/Grade/RB_Class_Time_UnKnowUser_ViewModel.cs

 using Edu.Model.Entity.Grade;
 
-namespace Edu.Model.ViewModel.Course
+namespace Edu.Model.ViewModel.Grade
 {
     /// <summary>
     /// 未知的用户信息视图实体类

Edu.Model/ViewModel/Course/RB_Class_Time_ViewModel.cs → Edu.Model/ViewModel/Grade/RB_Class_Time_ViewModel.cs

 using System.Collections.Generic;
 using Edu.Model.Entity.Course;
 using Edu.Model.Entity.Grade;
+using Edu.Model.ViewModel.Course;
 
-namespace Edu.Model.ViewModel.Course
+namespace Edu.Model.ViewModel.Grade
 {
     /// <summary>
     /// 班级上课时间视图实体类
@@ -60,6 +61,7 @@ namespace Edu.Model.ViewModel.Course
         ///班级学员
         /// </summary>
         public List<RB_Order_Guest_ViewModel> GuestList { get; set; }
+
         /// 上课分钟数
         /// </summary>
         public int TimeMinute { get; set; }

Edu.Model/ViewModel/Course/RB_Class_Type_ViewModel.cs → Edu.Model/ViewModel/Grade/RB_Class_Type_ViewModel.cs

 using Edu.Model.Entity.Grade;
 
-namespace Edu.Model.ViewModel.Course
+namespace Edu.Model.ViewModel.Grade
 {
     /// <summary>
     /// 班级类型费用设置视图实体类

Edu.Model/ViewModel/Course/RB_Class_ViewModel.cs → Edu.Model/ViewModel/Grade/RB_Class_ViewModel.cs

 using Edu.Model.Entity.Grade;
+using Edu.Model.ViewModel.Course;
 using System;
 using System.Collections.Generic;
 
-namespace Edu.Model.ViewModel.Course
+namespace Edu.Model.ViewModel.Grade
 {
     /// <summary>
     /// 班级实体类

Edu.Module.Course/ClassModule.cs

@@ -8,6 +8,7 @@ using Edu.Model.CacheModel;
 using Edu.Model.Entity.Course;
 using Edu.Model.Entity.Grade;
 using Edu.Model.ViewModel.Course;
+using Edu.Model.ViewModel.Grade;
 //using Edu.Model.ViewModel.Mall;
 using Edu.Model.ViewModel.Reserve;
 using Edu.Model.ViewModel.User;

Edu.Module.Course/ClassRoomModule.cs

 using Edu.Common.Enum;
 using Edu.Model.Entity.Grade;
 using Edu.Model.ViewModel.Course;
+using Edu.Model.ViewModel.Grade;
 using Edu.Repository.Course;
 using System;
 using System.Collections.Generic;

Edu.Module.Course/CourseModule.cs

@@ -2,6 +2,7 @@
 using Edu.Common.Enum;
 using Edu.Common.Plugin;
 using Edu.Model.ViewModel.Course;
+using Edu.Model.ViewModel.Grade;
 using Edu.Model.ViewModel.Question;
 using Edu.Model.ViewModel.User;
 using Edu.Repository.Course;

Edu.Module.Course/EducationContractModule.cs

@@ -7,6 +7,7 @@ using Edu.Common.Plugin;
 using Edu.Model.CacheModel;
 using Edu.Model.Entity.Finance;
 using Edu.Model.ViewModel.Course;
+using Edu.Model.ViewModel.Grade;
 using Edu.Model.ViewModel.User;
 using Edu.Repository.Course;
 using Edu.Repository.Finance;

Edu.Module.Course/OrderModule.cs

@@ -9,6 +9,7 @@ using Edu.Common.Plugin;
 using Edu.Model.CacheModel;
 using Edu.Model.Entity.Course;
 using Edu.Model.ViewModel.Course;
+using Edu.Model.ViewModel.Grade;
 using Edu.Model.ViewModel.Log;
 using Edu.Model.ViewModel.Reserve;
 using Edu.Model.ViewModel.StudyAbroad;

Edu.Module.Course/SellCommissionModule.cs

@@ -8,6 +8,7 @@ using Edu.Common.Plugin;
 using Edu.Model.CacheModel;
 using Edu.Model.ViewModel.Course;
 using Edu.Model.ViewModel.Finance;
+using Edu.Model.ViewModel.Grade;
 using Edu.Model.ViewModel.Log;
 using Edu.Model.ViewModel.User;
 using Edu.Repository.Course;
@@ -51,18 +52,7 @@ namespace Edu.Module.Course
         /// 订单学生
         /// </summary>
         private readonly RB_Order_GuestRepository order_GuestRepository = new RB_Order_GuestRepository();
-        /// <summary>
-        /// 教师
-        /// </summary>
-        private readonly RB_TeacherRepository teacherRepository = new RB_TeacherRepository();
-        /// <summary>
-        /// 上课计划
-        /// </summary>
-        private readonly RB_Class_PlanRepository class_PlanRepository = new RB_Class_PlanRepository();
-        /// <summary>
-        /// 上课时间
-        /// </summary>
-        private readonly RB_Class_TimeRepository class_TimeRepository = new RB_Class_TimeRepository();
+
         /// <summary>
         /// 签到
         /// </summary>
@@ -79,14 +69,7 @@ namespace Edu.Module.Course
         /// 班级类型
         /// </summary>
         private readonly RB_Class_TypeRepository class_TypeRepository = new RB_Class_TypeRepository();
-        /// <summary>
-        /// 财务账户
-        /// </summary>
-        private readonly RB_ClientBankAccountRepository clientBankAccountRepository = new RB_ClientBankAccountRepository();
-        /// <summary>
-        /// 集团
-        /// </summary>
-        private readonly RB_GroupRepository groupRepository = new RB_GroupRepository();
+ 
         /// <summary>
         /// 账户
         /// </summary>
@@ -1636,37 +1619,6 @@ namespace Edu.Module.Course
 
             }
         }
-
-        /// <summary>
-        /// 获取两日期间的所有月份
-        /// </summary>
-        /// <param name="startTime"></param>
-        /// <param name="endTime"></param>
-        /// <returns></returns>
-        private List<string> GetTwoDateMonth(string startTime, string endTime)
-        {
-            List<string> DateList = new List<string>();
-            if (startTime == endTime)
-            {
-                DateList.Add(startTime);
-                return DateList;
-            }
-            else
-            {
-                string sTime = startTime;
-                while (true)
-                {
-                    DateList.Add(sTime);
-                    sTime = Convert.ToDateTime(sTime + "-01").AddMonths(1).ToString("yyyy-MM");
-                    if (sTime == endTime)
-                    {
-                        break;
-                    }
-                }
-                return DateList;
-            }
-        }
-
         /// <summary>
         /// 验证用户离职
         /// </summary>

Edu.Module.Course/StudentBillModule.cs

@@ -8,6 +8,7 @@ using Edu.Model.CacheModel;
 using Edu.Model.Entity.BackClass;
 using Edu.Model.Entity.Course;
 using Edu.Model.ViewModel.Course;
+using Edu.Model.ViewModel.Grade;
 using Edu.Model.ViewModel.User;
 using Edu.Repository.Course;
 using Edu.Repository.Flow;

Edu.Module.Course/TeachingRewardsModule.cs

@@ -8,6 +8,7 @@ using Edu.Common.Plugin;
 using Edu.Model.CacheModel;
 using Edu.Model.ViewModel.Course;
 using Edu.Model.ViewModel.Finance;
+using Edu.Model.ViewModel.Grade;
 using Edu.Model.ViewModel.Log;
 using Edu.Model.ViewModel.User;
 using Edu.Repository.Course;

Edu.Module.Duty/VisitorReserveModule.cs

@@ -13,6 +13,7 @@ using Edu.Cache.User;
 using Edu.Model.CacheModel;
 using Edu.Repository.User;
 using Edu.Common.Message;
+using Edu.Model.ViewModel.Grade;
 
 namespace Edu.Module.Duty
 {
@@ -338,7 +339,7 @@ namespace Edu.Module.Duty
         public bool CheckClassTeacherModule(DateTime chooseDateTime, DateTime chooseEndTime, RB_Reserve_Class_Extend model, out string message)
         {
             message = "";
-            var planList = class_PlanRepository.GetClassPlanListExtRepository(new Model.ViewModel.Course.RB_Class_Plan_ViewModel()
+            var planList = class_PlanRepository.GetClassPlanListExtRepository(new RB_Class_Plan_ViewModel()
             {
                 TeacherId = model.TeacherId,
                 QClassDateStr = Common.ConvertHelper.FormatDate(model.ClassDate),
@@ -385,7 +386,7 @@ namespace Edu.Module.Duty
         public bool CheckClassRoomModule(DateTime chooseDateTime, DateTime chooseEndTime, RB_Reserve_Class_Extend model,out string RoomMessage)
         {
             RoomMessage = "";
-            var planList = class_PlanRepository.GetClassPlanListExtRepository(new Model.ViewModel.Course.RB_Class_Plan_ViewModel()
+            var planList = class_PlanRepository.GetClassPlanListExtRepository(new RB_Class_Plan_ViewModel()
             {
                 ClassRoomId=model.ClassRoomId,
                 QClassDateStr = Common.ConvertHelper.FormatDate(model.ClassDate),

Edu.Module.EduTask/ChangeClassPlanModule.cs

@@ -2,6 +2,7 @@
 using Edu.Model.Entity.EduTask;
 using Edu.Model.ViewModel.Course;
 using Edu.Model.ViewModel.EduTask;
+using Edu.Model.ViewModel.Grade;
 using Edu.Model.ViewModel.User;
 using Edu.Repository.Course;
 using Edu.Repository.EduTask;

Edu.Module.EduTask/EducationReceiptModule.cs

@@ -10,6 +10,7 @@ using Edu.Model.Entity.EduTask;
 using Edu.Model.ViewModel.BackClass;
 using Edu.Model.ViewModel.Course;
 using Edu.Model.ViewModel.EduTask;
+using Edu.Model.ViewModel.Grade;
 using Edu.Model.ViewModel.User;
 using Edu.Repository.Course;
 using Edu.Repository.EduTask;

Edu.Module.EduTask/OrderChangeModule.cs

@@ -9,6 +9,7 @@ using Edu.Model.Entity.Course;
 using Edu.Model.Entity.EduTask;
 using Edu.Model.ViewModel.Course;
 using Edu.Model.ViewModel.EduTask;
+using Edu.Model.ViewModel.Grade;
 using Edu.Module.Course;
 using Edu.Repository.Course;
 using Edu.Repository.EduTask;

Edu.Module.Finance/FinanceModule.cs

@@ -8,6 +8,7 @@ using Edu.Model.CacheModel;
 using Edu.Model.Entity.Finance;
 using Edu.Model.ViewModel.Course;
 using Edu.Model.ViewModel.Finance;
+using Edu.Model.ViewModel.Grade;
 using Edu.Repository.Course;
 using Edu.Repository.Finance;
 using Edu.Repository.StudyAbroad;
@@ -89,10 +90,7 @@ namespace Edu.Module.Finance
         /// 学生签到
         /// </summary>
         private readonly RB_Class_CheckRepository class_CheckRepository = new RB_Class_CheckRepository();
-        /// <summary>
-        /// 班级时长
-        /// </summary>
-        private readonly RB_Class_TimeRepository class_TimeRepository = new RB_Class_TimeRepository();
+
         /// <summary>
         /// 基础配置
         /// </summary>

Edu.Module.Public/ClassConfigModule.cs

 using Edu.Common.Enum;
 using Edu.Model.ViewModel.Course;
+using Edu.Model.ViewModel.Grade;
 using Edu.Repository.Course;
 using System;
 using System.Collections.Generic;

Edu.Repository/Course/RB_ClassRepository.cs

@@ -2,6 +2,7 @@
 using Edu.Model.Entity.Course;
 using Edu.Model.Entity.Grade;
 using Edu.Model.ViewModel.Course;
+using Edu.Model.ViewModel.Grade;
 using Edu.Model.ViewModel.User;
 using System;
 using System.Collections.Generic;

Edu.Repository/Course/RB_Class_CheckRepository.cs

@@ -6,6 +6,7 @@ using Edu.Model.Entity.Course;
 using Edu.Model.Entity.Grade;
 using Edu.Model.Entity.User;
 using Edu.Model.ViewModel.Course;
+using Edu.Model.ViewModel.Grade;
 using VT.FW.DB.Dapper;
 
 namespace Edu.Repository.Course

Edu.Repository/Course/RB_Class_ConfigRepository.cs

@@ -3,6 +3,7 @@ using Edu.Model.ViewModel.Course;
 using System.Text;
 using System.Linq;
 using Edu.Model.Entity.Grade;
+using Edu.Model.ViewModel.Grade;
 
 namespace Edu.Repository.Course
 {

Edu.Repository/Course/RB_Class_CourseRepository.cs

@@ -2,6 +2,7 @@
 using Edu.Model.Entity.Course;
 using Edu.Model.Entity.Grade;
 using Edu.Model.ViewModel.Course;
+using Edu.Model.ViewModel.Grade;
 using System;
 using System.Collections.Generic;
 using System.Linq;

Edu.Repository/Course/RB_Class_FinanceRepository.cs

@@ -6,6 +6,7 @@ using Edu.Common.Enum;
 using Edu.Model.Entity.Course;
 using Edu.Model.Entity.Grade;
 using Edu.Model.ViewModel.Course;
+using Edu.Model.ViewModel.Grade;
 
 namespace Edu.Repository.Course
 {

Edu.Repository/Course/RB_Class_LessonCommentRepository.cs

@@ -5,6 +5,7 @@ using System.Text;
 using Edu.Model.Entity.Course;
 using Edu.Model.Entity.Grade;
 using Edu.Model.ViewModel.Course;
+using Edu.Model.ViewModel.Grade;
 
 namespace Edu.Repository.Course
 {

Edu.Repository/Course/RB_Class_LessonPlanDetailsRepository.cs

@@ -5,6 +5,7 @@ using System.Text;
 using Edu.Model.Entity.Course;
 using Edu.Model.Entity.Grade;
 using Edu.Model.ViewModel.Course;
+using Edu.Model.ViewModel.Grade;
 
 namespace Edu.Repository.Course
 {

Edu.Repository/Course/RB_Class_LessonPlanProjectsRepository.cs

@@ -5,6 +5,7 @@ using System.Text;
 using Edu.Model.Entity.Course;
 using Edu.Model.Entity.Grade;
 using Edu.Model.ViewModel.Course;
+using Edu.Model.ViewModel.Grade;
 
 namespace Edu.Repository.Course
 {

Edu.Repository/Course/RB_Class_LessonPlanRepository.cs

@@ -5,6 +5,7 @@ using System.Text;
 using Edu.Model.Entity.Course;
 using Edu.Model.Entity.Grade;
 using Edu.Model.ViewModel.Course;
+using Edu.Model.ViewModel.Grade;
 
 namespace Edu.Repository.Course
 {

Edu.Repository/Course/RB_Class_PlanRepository.cs

@@ -3,6 +3,7 @@ using Edu.Common.Enum.Course;
 using Edu.Model.Entity.Course;
 using Edu.Model.Entity.Grade;
 using Edu.Model.ViewModel.Course;
+using Edu.Model.ViewModel.Grade;
 using Edu.Model.ViewModel.Reserve;
 using System;
 using System.Collections.Generic;

Edu.Repository/Course/RB_Class_RoomRepository.cs

@@ -2,6 +2,7 @@
 using Edu.Model.Entity.Course;
 using Edu.Model.Entity.Grade;
 using Edu.Model.ViewModel.Course;
+using Edu.Model.ViewModel.Grade;
 using System;
 using System.Collections.Generic;
 using System.Linq;

Edu.Repository/Course/RB_Class_RoomUseLogRepository.cs

@@ -6,6 +6,7 @@ using Edu.Common.Enum;
 using Edu.Model.Entity.Course;
 using Edu.Model.Entity.Grade;
 using Edu.Model.ViewModel.Course;
+using Edu.Model.ViewModel.Grade;
 using VT.FW.DB.Dapper;
 
 namespace Edu.Repository.Course

Edu.Repository/Course/RB_Class_StepPriceRepository.cs

 using Edu.Model.Entity.Course;
 using Edu.Model.Entity.Grade;
 using Edu.Model.ViewModel.Course;
+using Edu.Model.ViewModel.Grade;
 using System;
 using System.Collections.Generic;
 using System.Linq;

Edu.Repository/Course/RB_Class_TimeRepository.cs

@@ -2,6 +2,7 @@
 using Edu.Model.Entity.Course;
 using Edu.Model.Entity.Grade;
 using Edu.Model.ViewModel.Course;
+using Edu.Model.ViewModel.Grade;
 using System;
 using System.Collections.Generic;
 using System.Linq;

Edu.Repository/Course/RB_Class_Time_UnKnowRepository.cs

 using Edu.Model.Entity.Course;
 using Edu.Model.Entity.Grade;
 using Edu.Model.ViewModel.Course;
+using Edu.Model.ViewModel.Grade;
 using System;
 using System.Collections.Generic;
 using System.Linq;

Edu.Repository/Course/RB_Class_TypeRepository.cs

@@ -2,6 +2,7 @@
 using Edu.Model.Entity.Course;
 using Edu.Model.Entity.Grade;
 using Edu.Model.ViewModel.Course;
+using Edu.Model.ViewModel.Grade;
 using System;
 using System.Collections.Generic;
 using System.Linq;

Edu.Repository/Course/RB_Order_GuestRepository.cs

 using Edu.Common.Enum;
 using Edu.Model.Entity.Course;
 using Edu.Model.ViewModel.Course;
+using Edu.Model.ViewModel.Grade;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

Edu.Repository/EduTask/RB_Change_ClassPlanRepository.cs

@@ -7,6 +7,7 @@ using System.Linq;
 using Edu.Common.Enum.Course;
 using System.Threading.Tasks;
 using Edu.Model.ViewModel.Course;
+using Edu.Model.ViewModel.Grade;
 
 namespace Edu.Repository.EduTask
 {
@@ -172,7 +173,7 @@ WHERE 1=1
                         {
                             builder.AppendFormat(" update RB_Class_Plan SET  ClassRoomId={0} where ClassPlanId in({1})", newChangePlanItemList.FirstOrDefault().ClassRoomId, string.Join(",", oldChangePlanItemList.Select(x => x.ClassPlanId)));
                             string roomIds = string.Join(",", oldChangePlanItemList.Select(x => x.ClassRoomId)) + "," + newChangePlanItemList.FirstOrDefault().ClassRoomId;
-                            var roomList = class_RoomRepository.GetClassRoomListRepository(new Edu.Model.ViewModel.Course.RB_Class_Room_ViewModel() { QRoomIds = roomIds });
+                            var roomList = class_RoomRepository.GetClassRoomListRepository(new RB_Class_Room_ViewModel() { QRoomIds = roomIds });
                             foreach (var item in oldChangePlanItemList)
                             {
                                 logContent += string.Format(Common.ConvertHelper.FormatDate(item.ClassDate) + "的教室由【{0}】修改为【{1}】.",
@@ -184,7 +185,7 @@ WHERE 1=1
                     }
                     else if (model.ChangeType == 4)//取消课程
                     {
-                        var oldPlanList = class_TimeRepository.GetClassTimeListRepository(new Edu.Model.ViewModel.Course.RB_Class_Time_ViewModel()
+                        var oldPlanList = class_TimeRepository.GetClassTimeListRepository(new RB_Class_Time_ViewModel()
                         {
                             ClassId = model.ClassId,
                             QClassPlanIds = string.Join(",", oldChangePlanItemList.Select(x => x.ClassPlanId)),
@@ -229,7 +230,7 @@ WHERE 1=1
                     }
                     if (model.ChangeType == 1)
                     {
-                        var oldPlanList = class_PlanRepository.GetClassPlanListRepository(new Edu.Model.ViewModel.Course.RB_Class_Plan_ViewModel()
+                        var oldPlanList = class_PlanRepository.GetClassPlanListRepository(new RB_Class_Plan_ViewModel()
                         {
                             ClassId = model.ClassId,
                             StartTime = model.CreateTime.ToString("yyyy-MM-dd 00:00:00")
@@ -498,7 +499,7 @@ WHERE 1=1
                         {
                             builder.AppendFormat(" UPDATE RB_Class_Plan SET  ClassRoomId={0} WHERE DATE_FORMAT(ClassDate,'%Y-%m-%d')>=DATE_FORMAT('{1}','%Y-%m-%d')", allChangePlanModel.ClassRoomId, model.TakeEffectTime.Value.ToString("yyyy-MM-dd"));
                             string roomIds = allChangePlanModel.ClassRoomId.ToString();
-                            var roomList = class_RoomRepository.GetClassRoomListRepository(new Edu.Model.ViewModel.Course.RB_Class_Room_ViewModel() { QRoomIds = roomIds });
+                            var roomList = class_RoomRepository.GetClassRoomListRepository(new RB_Class_Room_ViewModel() { QRoomIds = roomIds });
                             logContent += string.Format("全局将教室修改为【{0}】.", (roomList?.Where(qitem => qitem.RoomId == allChangePlanModel.ClassRoomId)?.FirstOrDefault()?.RoomName ?? ""));
                         }
                     }

Edu.Repository/EduTask/RB_Student_TempInvitationRepository.cs

@@ -5,6 +5,7 @@ using System.Text;
 using Edu.Model.Entity.EduTask;
 using Edu.Model.ViewModel.Course;
 using Edu.Model.ViewModel.EduTask;
+using Edu.Model.ViewModel.Grade;
 using VT.FW.DB;
 
 namespace Edu.Repository.EduTask

Edu.Repository/Log/RB_Class_LogRepository.cs

 using Edu.Common.Enum.Course;
 using Edu.Model.Entity.Log;
 using Edu.Model.ViewModel.Course;
+using Edu.Model.ViewModel.Grade;
 using System;
 using System.Collections.Generic;
 using System.Linq;

Edu.WebApi/Controllers/APP/AppIndexController.cs

@@ -6,6 +6,7 @@ using Edu.Common.API;
 using Edu.Common.Enum.Course;
 using Edu.Common.Plugin;
 using Edu.Model.Entity.App;
+using Edu.Model.ViewModel.Grade;
 using Edu.Model.ViewModel.User;
 using Edu.Module.Course;
 using Edu.Module.System;
@@ -141,7 +142,7 @@ namespace Edu.WebApi.Controllers.APP
         public ApiResult GetStudentPlan()
         {
 
-            var query = new Model.ViewModel.Course.RB_Class_Plan_ViewModel()
+            var query = new RB_Class_Plan_ViewModel()
             {
                 Group_Id = base.AppUserInfo.Group_Id,
 

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -10,6 +10,7 @@ using Edu.Common.Enum.Course;
 using Edu.Common.Enum.System;
 using Edu.Common.Plugin;
 using Edu.Model.ViewModel.Course;
+using Edu.Model.ViewModel.Grade;
 using Edu.Module.Course;
 using Edu.Module.User;
 using Edu.WebApi.Filter;

Edu.WebApi/Controllers/Course/ClassRoomController.cs

@@ -7,6 +7,7 @@ using Edu.Common.API;
 using Edu.Common.Enum;
 using Edu.Common.Plugin;
 using Edu.Model.ViewModel.Course;
+using Edu.Model.ViewModel.Grade;
 using Edu.Module.Course;
 using Edu.WebApi.Filter;
 using Microsoft.AspNetCore.Cors;

Edu.WebApi/Controllers/Course/CourseController.cs

@@ -12,6 +12,7 @@ using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Mvc;
 using System.Linq;
 using Newtonsoft.Json.Linq;
+using Edu.Model.ViewModel.Grade;
 
 namespace Edu.WebApi.Controllers.Course
 {

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -7,6 +7,7 @@ using Edu.Common.Enum.Course;
 using Edu.Common.Enum.Sale;
 using Edu.Common.Plugin;
 using Edu.Model.ViewModel.Course;
+using Edu.Model.ViewModel.Grade;
 using Edu.Model.ViewModel.Log;
 using Edu.Module.Course;
 using Edu.WebApi.Filter;

Edu.WebApi/Controllers/Course/StuController.cs

@@ -6,6 +6,7 @@ using Edu.Common.API;
 using Edu.Common.Enum.Course;
 using Edu.Common.Plugin;
 using Edu.Model.ViewModel.Course;
+using Edu.Model.ViewModel.Grade;
 using Edu.Model.ViewModel.User;
 using Edu.Module.Course;
 using Edu.WebApi.Filter;

Edu.WebApi/Controllers/Course/TeacherClassController.cs

@@ -7,6 +7,7 @@ using Edu.Common.API;
 using Edu.Common.Enum.Course;
 using Edu.Common.Plugin;
 using Edu.Model.ViewModel.Course;
+using Edu.Model.ViewModel.Grade;
 using Edu.Model.ViewModel.User;
 using Edu.Module.Course;
 using Edu.Module.Finance;
@@ -166,13 +167,6 @@ namespace Edu.WebApi.Controllers.Course
             {
                 endDate = Common.ConvertHelper.FormatDate(d2);
             }
-            else
-            {
-                //if (Convert.ToDateTime(endDate) > Convert.ToDateTime(Common.ConvertHelper.FormatDate(DateTime.Now)))
-                //{
-                //    endDate = Common.ConvertHelper.FormatDate(DateTime.Now);
-                //}
-            }
             RB_Class_Plan_ViewModel query = new RB_Class_Plan_ViewModel()
             {
                 StartTime = startDate,

Edu.WebApi/Controllers/EduTask/ChangePlanController.cs

@@ -3,6 +3,7 @@ using Edu.Common.Enum.Course;
 using Edu.Common.Plugin;
 using Edu.Model.ViewModel.Course;
 using Edu.Model.ViewModel.EduTask;
+using Edu.Model.ViewModel.Grade;
 using Edu.Module.Course;
 using Edu.Module.EduTask;
 using Edu.WebApi.Filter;

Edu.WebApi/Controllers/Finance/FinanceController.cs

@@ -7,6 +7,7 @@ using Edu.Common.Enum.Finance;
 using Edu.Common.Plugin;
 using Edu.Model.ViewModel.Course;
 using Edu.Model.ViewModel.Finance;
+using Edu.Model.ViewModel.Grade;
 using Edu.Module.Course;
 using Edu.Module.Finance;
 using Edu.Module.StudyAbroad;
@@ -113,7 +114,7 @@ namespace Edu.WebApi.Controllers.Finance
             var projectInfo = new object();
             if (classId > 0)
             {
-                var classInfo = classModule.GetClassAndCourseListRepository(new Model.ViewModel.Course.RB_Class_ViewModel { Group_Id = base.UserInfo.Group_Id, ClassId = classId, School_Id = schoolId }).FirstOrDefault();
+                var classInfo = classModule.GetClassAndCourseListRepository(new RB_Class_ViewModel { Group_Id = base.UserInfo.Group_Id, ClassId = classId, School_Id = schoolId }).FirstOrDefault();
                 projectInfo = new { classInfo?.ClassName, classInfo?.CourseName, classInfo?.TeacherName, OpenTime = classInfo?.OpenTime.ToString("yyyy-MM-dd") };
             }
             else if (SourceId > 0)
@@ -243,7 +244,7 @@ namespace Edu.WebApi.Controllers.Finance
             var projectInfo = new RB_Class_ViewModel();
             if (classId > 0)
             {
-                var classInfo = classModule.GetClassAndCourseListRepository(new Model.ViewModel.Course.RB_Class_ViewModel { Group_Id = base.UserInfo.Group_Id, ClassId = classId, School_Id = schoolId }).FirstOrDefault();
+                var classInfo = classModule.GetClassAndCourseListRepository(new RB_Class_ViewModel { Group_Id = base.UserInfo.Group_Id, ClassId = classId, School_Id = schoolId }).FirstOrDefault();
                 projectInfo = new RB_Class_ViewModel()
                 {
                     ClassName = classInfo?.ClassName,

Edu.WebApi/Controllers/Public/HolidayController.cs

@@ -6,6 +6,7 @@ using Edu.Common.API;
 using Edu.Common.Plugin;
 using Edu.Model.CacheModel;
 using Edu.Model.Entity.System;
+using Edu.Model.ViewModel.Grade;
 using Edu.Module.System;
 using Edu.WebApi.Filter;
 using Microsoft.AspNetCore.Cors;
@@ -87,7 +88,7 @@ namespace Edu.WebApi.Controllers.Public
 
                 if (dmodel.DayType == 1)//判断节假日是否有排课计划
                 {
-                    var planList = classModule.GetClassPlanList_V3(new Model.ViewModel.Course.RB_Class_Plan_ViewModel
+                    var planList = classModule.GetClassPlanList_V3(new RB_Class_Plan_ViewModel
                     {
                         Group_Id = userInfo.Group_Id,
                         StartTime = dmodel.StartTime.HasValue ? dmodel.StartTime.Value.ToString("yyyy-MM-dd 00:00:00") : "",

Edu.WebApi/Controllers/Public/PublicController.cs

@@ -6,6 +6,7 @@ using Edu.Common.API;
 using Edu.Common.Plugin;
 using Edu.Model.Public;
 using Edu.Model.ViewModel.Course;
+using Edu.Model.ViewModel.Grade;
 using Edu.Model.ViewModel.System;
 using Edu.Module.Log;
 using Edu.Module.Public;

Edu.WebApi/Controllers/Web/WebController.cs

@@ -5,6 +5,7 @@ using Edu.Common.Enum;
 using Edu.Common.Enum.Web;
 using Edu.Common.Plugin;
 using Edu.Model.ViewModel.Course;
+using Edu.Model.ViewModel.Grade;
 using Edu.Model.ViewModel.StudyAbroad;
 using Edu.Model.ViewModel.Web;
 using Edu.Module.Course;