Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

Edu.Model/ViewModel/Sell/RB_Order_ReturnComission_ViewModel.cs

@@ -29,9 +29,8 @@ namespace Edu.Model.ViewModel.Sell
         /// </summary>
         public string UserName { get; set; }
 
-
         /// <summary>
-        /// 用户部门
+        /// 用户部门(财务单据跳转使用)
         /// </summary>
         public int UserDept { get; set; }
 

Edu.Module.Customer/CustomerCommissionModule.cs

@@ -150,6 +150,7 @@ namespace Edu.Module.Course
                 foreach (var item in list)
                 {
                     item.SchoolName = slist.Where(x => x.SId == item.SchoolId).FirstOrDefault()?.SName ?? "";
+                    item.UserDeptName = "-";
                     if (item.OrderSourceType == Common.Enum.User.StuCreateTypeEnum.EmployeeInput || item.OrderSourceType == Common.Enum.User.StuCreateTypeEnum.InternalIntroduction)
                     {
                         var umodel = ulist.Where(x => x.Id == item.OrderSourceId).FirstOrDefault();
@@ -167,6 +168,11 @@ namespace Edu.Module.Course
                     }
                 }
             }
+           
+            if (dmodel.UserDept > 0)
+            {
+                list = list.Where(x => x.UserDept == dmodel.UserDept).ToList();
+            }
             return list;
         }
 

Edu.Module.User/TeacherAssessmentModule.cs

@@ -189,18 +189,6 @@ namespace Edu.Module.User
             return subList;
         }
 
-
-        /// <summary>
-        /// 根据编号获取老师考评子类型配置
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        public RB_Assessment_Subtype_Extend GetAssessmentSubtypeModule(object id)
-        {
-            var extModel = assessment_SubtypeRepository.GetEntity<RB_Assessment_Subtype_Extend>(id);
-            return extModel;
-        }
-
         /// <summary>
         /// 根据编号删除老师考评子类型配置
         /// </summary>

Edu.WebApi/Controllers/Customer/CustomerCommissionController.cs

@@ -133,22 +133,89 @@ namespace Edu.WebApi.Controllers.Course
             }
 
             var list = customerCommissionModule.GetCommissionUserListModule(dmodel);
-            if (dmodel.UserDept > 0)
-            {
-                list = list.Where(x => x.UserDept == dmodel.UserDept).ToList();
-            }
+
             return ApiResult.Success("", list.Select(x => new
             {
                 x.SchoolId,
                 x.SchoolName,
                 x.UserName,
+                x.UserDeptName,
                 x.OrderSourceType,
+                OrderSourceTypeName= x.OrderSourceType.ToName(),
                 x.OrderSourceId,
                 x.StudentCount,
                 x.CommissionMoeny
             }));
         }
 
+        /// <summary>
+        /// 下载返佣用户列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [Obsolete]
+        public FileContentResult DownLoadCommissionUserList()
+        {
+            var userInfo = base.UserInfo;
+            var dmodel = new RB_Order_ReturnComission_ViewModel()
+            {
+                BatchId = base.ParmJObj.GetInt("BatchId"),
+                OrderSourceId = base.ParmJObj.GetInt("OrderSourceId"),
+                OrderSourceType = (StuCreateTypeEnum)base.ParmJObj.GetInt("OrderSourceType"),
+                Q_SelectNormal = base.ParmJObj.GetInt("Q_SelectNormal"),
+                Status = base.ParmJObj.GetInt("Status"),
+                UserDept = base.ParmJObj.GetInt("UserDept"),
+                SchoolId = base.ParmJObj.GetInt("SchoolId"),
+            };
+
+            dmodel.GroupId = userInfo.Group_Id;
+            var list = customerCommissionModule.GetCommissionUserListModule(dmodel);
+            string excelName = "用户返佣.xls";
+            List<ExcelDataSource> slist = new List<ExcelDataSource>();
+            try
+            {
+                ExcelDataSource header = new ExcelDataSource
+                {
+                    ExcelRows = new List<ExcelColumn>()
+                    {
+                        new ExcelColumn("校区"){ CellWidth=25},
+                        new ExcelColumn("部门"){ CellWidth=25},
+                        new ExcelColumn("人员"){ CellWidth=25},
+                        new ExcelColumn("类型"){ CellWidth=20},
+                        new ExcelColumn("学生数量"){ CellWidth=20},
+                        new ExcelColumn("提成金额"){ CellWidth=20},
+                    }
+                };
+                slist.Add(header);
+                foreach (var item in list)
+                {
+                    JObject dObj = JObject.Parse(JsonHelper.Serialize(item));
+                    var columns = new List<ExcelColumn>
+                    {
+                        new ExcelColumn(dObj.GetStringValue("SchoolName"))
+                    };
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("UserDeptName")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("UserName")));
+                    columns.Add(new ExcelColumn(item.OrderSourceType.ToName()));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("StudentCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("CommissionMoeny")));
+                    var dataRow = new ExcelDataSource()
+                    {
+                        ExcelRows = columns
+                    };
+                    slist.Add(dataRow);
+                }
+                var byteData = ExcelTempLateHelper.ToExcelExtend(slist);
+                return File(byteData, "application/octet-stream", excelName);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Write(ex, "DownLoadCommissionUserList");
+                var byteData1 = ExcelTempLateHelper.ToExcelExtend(slist);
+                return File(byteData1, "application/octet-stream", excelName);
+            }
+        }
+
         /// <summary>
         /// 返佣统计
         /// </summary>

Edu.WebApi/Controllers/DataService/TeacherAssessmentController.cs

@@ -187,6 +187,18 @@ namespace Edu.WebApi.Controllers.DataService
             pageModel.PageData = result;
             return ApiResult.Success(data: pageModel);
         }
+
+        /// <summary>
+        /// 获取教师考核信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetTeacherAssessmentInfo()
+        {
+            int TeacherAccountId = base.ParmJObj.GetInt("TeacherAccountId");
+
+            return ApiResult.Failed();
+        }
         #endregion
     }
 }