财务相关调整

Edu.Model/ViewModel/Course/RB_Sell_Commission_Details_ViewModel.cs

@@ -27,6 +27,11 @@ namespace Edu.Model.ViewModel.Course
         /// </summary>
         public string ClassName { get; set; }
 
+        /// <summary>
+        /// 班号
+        /// </summary>
+        public string ClassNo { get; set; }
+
         /// <summary>
         /// 班级类型
         /// </summary>

Edu.Module.Course/SellCommissionModule.cs

@@ -354,6 +354,7 @@ namespace Edu.Module.Course
                     item.DeptName = dlist.Where(x => x.DeptId == item.Depart_Id).FirstOrDefault()?.DeptName ?? "";
                     item.SchoolName = slist.Where(x => x.SId == item.School_Id).FirstOrDefault()?.SName ?? "";
                     item.ClassName = clist.Where(x => x.ClassId == item.ClassId).FirstOrDefault()?.ClassName ?? "";
+                    item.ClassNo = clist.Where(x => x.ClassId == item.ClassId).FirstOrDefault()?.ClassNo ?? "";
                     item.ClassTypeName = ctlist.Where(x => x.CTypeId == item.ClassType).FirstOrDefault()?.CTypeName ?? "";
                 }
             }
@@ -391,6 +392,7 @@ namespace Edu.Module.Course
                     item.DeptName = dlist.Where(x => x.DeptId == item.Depart_Id).FirstOrDefault()?.DeptName ?? "";
                     item.SchoolName = slist.Where(x => x.SId == item.School_Id).FirstOrDefault()?.SName ?? "";
                     item.ClassName = clist.Where(x => x.ClassId == item.ClassId).FirstOrDefault()?.ClassName ?? "";
+                    item.ClassNo = clist.Where(x => x.ClassId == item.ClassId).FirstOrDefault()?.ClassNo ?? "";
                     item.ClassTypeName = ctlist.Where(x => x.CTypeId == item.ClassType).FirstOrDefault()?.CTypeName ?? "";
                 }
             }

Edu.Module.Course/TeachingRewardsModule.cs

@@ -103,6 +103,10 @@ namespace Edu.Module.Course
         /// 财务配置
         /// </summary>
         private readonly RB_Finance_ConfigRepository finance_ConfigRepository = new RB_Finance_ConfigRepository();
+        /// <summary>
+        /// 财务单据
+        /// </summary>
+        private readonly RB_FinanceRepository financeRepository = new RB_FinanceRepository();
 
 
         #region 教务配置
@@ -336,7 +340,8 @@ namespace Edu.Module.Course
                 //获取所有的教师
                 string teacherIds = string.Join(",", list.Select(x => x.TeacherIds));
                 var tlist = teacherRepository.GetTeacherListRepository(new RB_Teacher_ViewModel() { Group_Id = dmodel.Group_Id, QTIds = teacherIds });
-
+                //查询财务单据
+                var financeList = financeRepository.GetListSingle(new RB_Finance_Extend() { RB_Group_Id = dmodel.Group_Id, FinanceType = 2, OtherType = 39, ReFinanceIds = bonusIds, IsSelectNormal = 1 });
                 foreach (var item in list)
                 {
                     item.TeacherList = new List<RB_Teaching_BonusDetail_ViewModel>();
@@ -353,6 +358,12 @@ namespace Edu.Module.Course
                             TeacherName = teacherName,
                             Money = money
                         });
+                        //财务单据
+                        var flist = financeList.Where(x => x.ReFinanceId == item.Id).Select(x => x.FrID);
+                        if (flist.Any())
+                        {
+                            item.FinanceId = string.Join(",", flist);
+                        }
                     }
                 }
             }

Edu.Repository/Course/RB_Teaching_BonusDetailRepository.cs

@@ -154,7 +154,7 @@ where {where} order by bd.Date asc";
                 where += $@" and b.{nameof(RB_Teaching_BonusDetail.Type)} ={demodel.Type}";
             }
 
-            string sql = $@" select b.*,t.TeacherName,c.ClassName from RB_Teaching_BonusDetail b
+            string sql = $@" select b.*,t.TeacherName,c.ClassName,c.ClassNo from RB_Teaching_BonusDetail b
 left join rb_teacher t on b.TeacherId = t.TId
 left join rb_class c on b.ClassId = c.ClassId
 where {where} order by b.TeacherId asc,b.Date asc";

Edu.WebApi/Controllers/Course/SellCommissionController.cs

@@ -213,6 +213,7 @@ namespace Edu.WebApi.Controllers.Course
                 x.UserName,
                 x.ClassId,
                 x.ClassName,
+                x.ClassNo,
                 x.ClassType,
                 x.ClassTypeName,
                 x.OrderId,
@@ -262,6 +263,7 @@ namespace Edu.WebApi.Controllers.Course
                 x.UserName,
                 x.ClassId,
                 x.ClassName,
+                x.ClassNo,
                 x.ClassType,
                 x.ClassTypeName,
                 x.OrderId,
@@ -312,6 +314,7 @@ namespace Edu.WebApi.Controllers.Course
                     x.UserName,
                     x.ClassId,
                     x.ClassName,
+                    x.ClassNo,
                     x.ClassType,
                     x.ClassTypeName,
                     x.OrderId,
@@ -342,6 +345,7 @@ namespace Edu.WebApi.Controllers.Course
         /// </summary>
         /// <returns></returns>
         [HttpPost]
+        [Obsolete]
         public FileContentResult GetSellCommissionStatisticsToExcel() {
             var userInfo = base.UserInfo;
             var dmodel = JsonHelper.DeserializeObject<RB_Sell_Commission_Details_ViewModel>(RequestParm.Msg.ToString());
@@ -354,6 +358,7 @@ namespace Edu.WebApi.Controllers.Course
                     new ExcelColumn(value: "校区") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
                     new ExcelColumn(value: "部门") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
                     new ExcelColumn(value: "销售") { CellWidth = 25, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
+                    new ExcelColumn(value: "班号") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
                     new ExcelColumn(value: "班级") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
                     new ExcelColumn(value: "班级类型") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
                     new ExcelColumn(value: "学生数量") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
@@ -390,6 +395,7 @@ namespace Edu.WebApi.Controllers.Course
                             new ExcelColumn(value: item.SchoolName){ },
                             new ExcelColumn(value: item.DeptName){ },
                             new ExcelColumn(value: item.UserName){ },
+                            new ExcelColumn(value: item.ClassNo){ },
                             new ExcelColumn(value: item.ClassName + (item.IsContinueClass == 1 ? " 续班" : "")){ },
                             new ExcelColumn(value: item.ClassTypeName){ },
                             new ExcelColumn(value: item.StudentCount.ToString()){ },
@@ -438,6 +444,7 @@ namespace Edu.WebApi.Controllers.Course
                             new ExcelColumn(value: ""){ },
                             new ExcelColumn(value: ""){ },
                             new ExcelColumn(value: ""){ },
+                            new ExcelColumn(value: ""){ },
                             new ExcelColumn(value: TotalMoney.ToString("#0.00")){ },
                             new ExcelColumn(value: ""){ },
                             new ExcelColumn(value: ""){ },

Edu.WebApi/Controllers/Course/TeachingRewardsController.cs

@@ -266,6 +266,7 @@ namespace Edu.WebApi.Controllers.Course
                     x.TeacherName,
                     x.ClassId,
                     x.ClassName,
+                    x.ClassNo,
                     x.Type,
                     x.CourseHour,
                     x.DeductionHour,
@@ -308,6 +309,7 @@ namespace Edu.WebApi.Controllers.Course
                 ExcelRows = new List<ExcelColumn>(30) {
                     new ExcelColumn(value: "日期") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
                     new ExcelColumn(value: "老师") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
+                    new ExcelColumn(value: "班号") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
                     new ExcelColumn(value: "班级") { CellWidth = 25, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
                     new ExcelColumn(value: "类型") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
                     new ExcelColumn(value: "基础课时") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
@@ -331,6 +333,7 @@ namespace Edu.WebApi.Controllers.Course
                         ExcelRows = new List<ExcelColumn>(30) {
                             new ExcelColumn(value: item.Date.ToString("yyyyMMdd")){ },
                             new ExcelColumn(value: item.TeacherName){ },
+                            new ExcelColumn(value: item.ClassNo){ },
                             new ExcelColumn(value: item.ClassName){ },
                             new ExcelColumn(value: item.Type==1?"带班":"代课"){ },
                             new ExcelColumn(value: item.DeductionHour.ToString()){ },
@@ -355,6 +358,7 @@ namespace Edu.WebApi.Controllers.Course
                             new ExcelColumn(value: ""){ },
                             new ExcelColumn(value: ""){ },
                             new ExcelColumn(value: ""){ },
+                            new ExcelColumn(value: ""){ },
                         }
                 };
                 slist.Add(datarows);
@@ -370,6 +374,7 @@ namespace Edu.WebApi.Controllers.Course
                             new ExcelColumn(value: ""){ },
                             new ExcelColumn(value: ""){ },
                             new ExcelColumn(value: ""){ },
+                            new ExcelColumn(value: ""){ },
                         }
                 };
                 slist.Add(datarows);
@@ -387,6 +392,7 @@ namespace Edu.WebApi.Controllers.Course
                             new ExcelColumn(value: ""){ },
                             new ExcelColumn(value: ""){ },
                             new ExcelColumn(value: ""){ },
+                            new ExcelColumn(value: ""){ },
                         }
                     };
                     slist.Add(datarows);