页面修改

Edu.Model/ViewModel/Sell/RB_Order_Guest_Extend.cs

@@ -230,5 +230,10 @@ namespace Edu.Model.ViewModel.Sell
         /// 预约数量
         /// </summary>
         public int AppointNum { get; set; }
+
+        /// <summary>
+        /// 学员数量
+        /// </summary>
+        public int StudentNum { get; set; }
     }
 }

Edu.Module.Course/StudentBillModule.cs

@@ -157,7 +157,7 @@ namespace Edu.Module.Course
                 courseModel = courseRepository.GetEntity(classModel.CouseId);
             }
             //预计退款金额
-            decimal backMoney = orderRepository.CalcBackMoneyRepository(orderModel, courseModel, FinishHours,out decimal classHourPrice);
+            decimal backMoney = orderRepository.CalcBackMoneyRepository(orderModel, courseModel, FinishHours, out decimal classHourPrice);
             var obj = new
             {
                 orderModel.PreferPrice,
@@ -190,7 +190,7 @@ namespace Edu.Module.Course
             var eduReceipt = education_ReceiptRepository.GetEducationReceiptListRepository(new EducationReceiptQuery()
             {
                 ReceiptType = 2,
-                RelationId= backClassId
+                RelationId = backClassId
             })?.FirstOrDefault();
             if (backModel == null || backModel.AuditStatus != WFRrocessStatus.AuditThrough) { return "退课流程未审核通过"; }
             if (backModel.FinanceId > 0) { return "已制单，无法再次生成财务单据"; }
@@ -213,7 +213,7 @@ namespace Edu.Module.Course
                 }
             };
             var classModel = classRepository.GetEntity(backModel.ClassId);
-            string Remark = backModel.ApplyReason+ "【" + (classModel?.ClassName ?? "") + "】下,订单" + backModel.OrderId + " 客人退课";
+            string Remark = backModel.ApplyReason + "【" + (classModel?.ClassName ?? "") + "】下,订单" + backModel.OrderId + " 客人退课";
             var financeObj = new
             {
                 OtherType = 28,
@@ -457,10 +457,10 @@ namespace Edu.Module.Course
         /// <param name="demodel"></param>
         /// <param name="orderIds"></param>
         /// <returns></returns>
-        public List<RB_Order_Guest_Extend> GetAllStudentPage(int pageIndex, int pageSize, out long rowsCount, RB_Order_Guest_Extend demodel)
+        public List<RB_Order_Guest_Extend> GetAllStudentPageModule(int pageIndex, int pageSize, out long rowsCount, RB_Order_Guest_Extend demodel)
         {
-            var orderstudentList = order_GuestRepository.GetAllStudentPage(pageIndex, pageSize, out rowsCount, demodel);
-            if (orderstudentList.Any()) 
+            var orderstudentList = order_GuestRepository.GetAllStudentPageRepository(pageIndex, pageSize, out rowsCount, demodel);
+            if (orderstudentList.Any())
             {
                 //课程顾问  协助老师   负责人； 客户来源   来源关联人
                 string stuIds = string.Join(",", orderstudentList.Select(x => x.StuId).Distinct().ToList());
@@ -481,7 +481,7 @@ namespace Edu.Module.Course
                 {
                     accountList = accountModule.GetAccountListExtModule(new RB_Account_ViewModel() { QIds = string.Join(",", empIdList) });
                 }
-                
+
                 //同业录入列表
                 List<Model.ViewModel.Customer.RB_Customer_Extend> customerList = new List<Model.ViewModel.Customer.RB_Customer_Extend>();
                 List<int> customerIdList = Common.ConvertHelper.StringToList(string.Join(",", orderstudentList.Where(qitem => qitem.CreateType == StuCreateTypeEnum.CustomerInput).Select(qitem => qitem.StuSourceId)));
@@ -537,7 +537,7 @@ namespace Edu.Module.Course
                         {
                             item.EnterpriseName = "";
                         }
-                        
+
                     }
                     else if (item.CreateType == StuCreateTypeEnum.TransIntroduction)
                     {
@@ -550,6 +550,32 @@ namespace Edu.Module.Course
             return orderstudentList;
         }
 
+        /// <summary>
+        /// 获取学员名单分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="demodel"></param>
+        /// <param name="orderIds"></param>
+        /// <returns></returns>
+        public object GetAllStudentStaticModule(RB_Order_Guest_Extend demodel)
+        {
+            var obj = new object();
+            var list = order_GuestRepository.GetAllStudentStaticRepository(demodel);
+            if (list != null)
+            {
+                obj = new
+                {
+                    NormalNum = list?.FirstOrDefault(qitem => qitem.GuestState == GuestStateEnum.Normal)?.StudentNum ?? 0,
+                    DropOutNum = list?.FirstOrDefault(qitem => qitem.GuestState == GuestStateEnum.DropOut)?.StudentNum ?? 0,
+                    StopClassesNum = list?.FirstOrDefault(qitem => qitem.GuestState == GuestStateEnum.StopClasses)?.StudentNum ?? 0,
+                    GraduateNum = list?.FirstOrDefault(qitem => qitem.GuestState == GuestStateEnum.Graduate)?.StudentNum ?? 0,
+                };
+            }
+            return obj;
+        }
+
         /// <summary>
         /// 获取签到状态记录
         /// </summary>

Edu.WebApi/Controllers/Course/StuController.cs

@@ -135,9 +135,9 @@ namespace Edu.WebApi.Controllers.Course
                 SourceId = 0,
                 IsLessPrice = 0,
                 LessPrice = 0,
-                PerLessMoney=0,
-                DiscountMoney=0,
-                PerDiscountMoney=0,
+                PerLessMoney = 0,
+                DiscountMoney = 0,
+                PerDiscountMoney = 0,
                 OrderNature = oldOrderModel.OrderNature,
                 OldPreferPrice = base.ParmJObj.GetDecimal("PreferPrice"),//应收，
                 CourseId = 0,
@@ -162,7 +162,7 @@ namespace Edu.WebApi.Controllers.Course
             orderModel.UpdateBy = base.UserInfo.Id;
             orderModel.UpdateTime = DateTime.Now;
             orderModel.OldGuestId = guestId;
-  
+
             bool flag = orderModule.SetClassOrderModule(orderModel, base.UserInfo, base.CheckUserActionAuth("Edit_Order"), out string message);
             if (flag)
             {
@@ -208,10 +208,10 @@ namespace Edu.WebApi.Controllers.Course
             {
                 CheckStatus = base.ParmJObj.GetInt("CheckStatus"),
                 ClassId = base.ParmJObj.GetInt("ClassId"),
-                CouseId=base.ParmJObj.GetInt("CouseId"),
-                GuestName=base.ParmJObj.GetStringValue("GuestName"),
-                OrderGuestId=base.ParmJObj.GetInt("OrderGuestId"),
-                StartDate=base.ParmJObj.GetStringValue("StartDate"),
+                CouseId = base.ParmJObj.GetInt("CouseId"),
+                GuestName = base.ParmJObj.GetStringValue("GuestName"),
+                OrderGuestId = base.ParmJObj.GetInt("OrderGuestId"),
+                StartDate = base.ParmJObj.GetStringValue("StartDate"),
             };
             demodel.School_Id = -1;
             var School_Id = base.ParmJObj.GetStringValue("School_Id");
@@ -304,7 +304,7 @@ namespace Edu.WebApi.Controllers.Course
                 EnterID = base.ParmJObj.GetInt("EnterID", 0),
                 JoinType = base.ParmJObj.GetInt("JoinType", 0),
                 EarlyWarning = (Common.Enum.Course.GuestClassHoursEarlyWarningEnum)base.ParmJObj.GetInt("EarlyWarning", 0),
-                GuestState=(GuestStateEnum)base.ParmJObj.GetInt("GuestState"),
+                GuestState = (GuestStateEnum)base.ParmJObj.GetInt("GuestState"),
                 StuChannelId = base.ParmJObj.GetInt("StuChannelId", 0),
                 CreateType = (Common.Enum.User.StuCreateTypeEnum)base.ParmJObj.GetInt("CreateType", 0),
                 StuSourceId = base.ParmJObj.GetInt("StuSourceId", 0),
@@ -339,7 +339,8 @@ namespace Edu.WebApi.Controllers.Course
             }
 
             model.Group_Id = base.UserInfo.Group_Id;
-            var list = studentBillModule.GetAllStudentPage(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, model);
+            var list = studentBillModule.GetAllStudentPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, model);
+            var obj = studentBillModule.GetAllStudentStaticModule(model);
             List<object> result = new List<object>();
 
             foreach (var item in list)
@@ -417,7 +418,7 @@ namespace Edu.WebApi.Controllers.Course
             }
             pageModel.Count = rowsCount;
             pageModel.PageData = result;
-            return ApiResult.Success(data: pageModel);
+            return ApiResult.Success(data: new { pageModel, StudentStatic = obj });
         }