页面修改

Edu.Model/ViewModel/EduTask/RB_Change_ClassPlan_ViewModel.cs

@@ -10,6 +10,11 @@ namespace Edu.Model.ViewModel.EduTask
     /// </summary>
     public class RB_Change_ClassPlan_ViewModel : RB_Change_ClassPlan
     {
+        /// <summary>
+        /// 调课计划编号
+        /// </summary>
+        public string Q_Change_ClassPlan_Ids { get; set; }
+
         /// <summary>
         /// 调整原数据信息
         /// </summary>

Edu.Module.EduTask/EducationReceiptModule.cs

@@ -54,6 +54,11 @@ namespace Edu.Module.EduTask
         /// </summary>
         private readonly RB_Student_BackClassRepository student_BackClassRepository = new RB_Student_BackClassRepository();
 
+        /// <summary>
+        /// 调课仓储层对象
+        /// </summary>
+        private readonly RB_Change_ClassPlanRepository change_ClassPlanRepository = new RB_Change_ClassPlanRepository();
+
         /// <summary>
         /// 获取教务单据分页列表
         /// </summary>
@@ -70,6 +75,8 @@ namespace Edu.Module.EduTask
             {
                 //退课详情
                 List<RB_Student_BackClass_ViewModel> backClassLisit = new List<RB_Student_BackClass_ViewModel>();
+                //调课申请
+                List<RB_Change_ClassPlan_ViewModel> changeClassList = new List<RB_Change_ClassPlan_ViewModel>();
                 var groupList = list.GroupBy(qitem => new { qitem.ReceiptType }).Select(qitem => new { qitem.Key.ReceiptType });
                 foreach (var subItem in groupList)
                 {
@@ -81,15 +88,29 @@ namespace Edu.Module.EduTask
                             QBackIds = backIds
                         });
                     }
+                    if (subItem.ReceiptType == Common.Enum.Finance.ReceiptTypeEnum.ChangeClass)
+                    {
+                        string changeIds = string.Join(",", list.Where(qitem => qitem.ReceiptType == subItem.ReceiptType).Select(qitem => qitem.RelationId));
+                        changeClassList = change_ClassPlanRepository.GetChangeClassPlanListRepository(new RB_Change_ClassPlan_ViewModel()
+                        {
+                            Q_Change_ClassPlan_Ids = changeIds
+                        });
+                    }
                 }
 
                 foreach (var item in list)
                 {
                     object DataObj = new object();
+                    //退课
                     if (item.ReceiptType == Common.Enum.Finance.ReceiptTypeEnum.BackClass)
                     {
                         DataObj = backClassLisit?.Where(qitem => qitem.BackId == item.RelationId)?.FirstOrDefault();
                     }
+                    //调课
+                    if (item.ReceiptType == Common.Enum.Finance.ReceiptTypeEnum.ChangeClass)
+                    {
+                        DataObj = changeClassList.Where(qitem => qitem.Id == item.RelationId)?.FirstOrDefault();
+                    }
                     var obj = new
                     {
                         item.Id,

Edu.Repository/EduTask/RB_Change_ClassPlanRepository.cs

@@ -56,7 +56,10 @@ WHERE 1=1
 ");
             if (query != null)
             {
-
+                if (!string.IsNullOrEmpty(query.Q_Change_ClassPlan_Ids))
+                {
+                    builder.AppendFormat(@" AND A.{0} IN ({1}) ", nameof(RB_Change_ClassPlan_ViewModel.Id), query.Q_Change_ClassPlan_Ids);
+                }
             }
             return Get<RB_Change_ClassPlan_ViewModel>(builder.ToString()).ToList();
         }