查询修改

Edu.Model/ViewModel/Course/RB_Student_BackClass_ViewModel.cs

@@ -24,5 +24,30 @@ namespace Edu.Model.ViewModel.Course
         /// 班级名称
         /// </summary>
         public string ClassName { get; set; }
+
+        /// <summary>
+        /// 教师名称
+        /// </summary>
+        public string TeacherName { get; set; }
+
+        /// <summary>
+        /// 申请开始时间
+        /// </summary>
+        public string QStartTime { get; set; }
+
+        /// <summary>
+        /// 申请结束时间
+        /// </summary>
+        public string QEndTime { get; set; }
+
+        /// <summary>
+        /// 申请人
+        /// </summary>
+        public string CreateByName { get; set; }
+
+        /// <summary>
+        /// 申请时间
+        /// </summary>
+        public string CreateTimeStr { get { return Common.ConvertHelper.FormatTime(this.CreateTime); } }
     }
 }

Edu.Module.Course/OrderModule2.cs

@@ -223,7 +223,6 @@ namespace Edu.Module.Course
                     }
                 }
             }
-
             if (flag)
             {
                 Dictionary<string, object> fileds = new Dictionary<string, object>()

Edu.Repository/Course/RB_Student_BackClassRepository.cs

@@ -4,6 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using VT.FW.DB.Dapper;
 
 namespace Edu.Repository.Course
 {
@@ -22,17 +23,41 @@ namespace Edu.Repository.Course
         /// <returns></returns>
         public List<RB_Student_BackClass_ViewModel> GetStudentBackClassPageListRepository(int pageIndex, int pageSize, out long rowsCount, RB_Student_BackClass_ViewModel query)
         {
+            var parameters = new DynamicParameters();
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
-SELECT A.*,IFNULL(B.GuestName,'') AS GuestName,IFNULL(C.SName,'') AS SchoolName,IFNULL(D.ClassName,'') AS ClassName
+SELECT A.*,IFNULL(B.GuestName,'') AS GuestName,IFNULL(C.SName,'') AS SchoolName,IFNULL(D.ClassName,'') AS ClassName,IFNULL(T.TeacherName,'') AS TeacherName
 FROM RB_Student_BackClass AS A LEFT JOIN rb_order_guest AS B ON A.GuestId=B.Id
      LEFT JOIN rb_school AS C ON A.SchoolId=C.SId
      LEFT JOIN rb_class AS D ON A.ClassId=D.ClassId
+     LEFT JOIN (SELECT account.Id,teac.TeacherName FROM rb_account AS account INNER JOIN rb_teacher AS teac ON account.AccountId=teac.TId AND account.AccountType=2)
+               AS T ON A.TeacherId=T.Id
 WHERE 1=1 
 ");
             if (query != null)
-            { 
-                 
+            {
+                if (query.Group_Id > 0)
+                {
+                    builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Student_BackClass_ViewModel.Group_Id), query.Group_Id);
+                }
+                if (!string.IsNullOrEmpty(query.ClassName))
+                {
+                    builder.AppendFormat(@" AND (B.{0} LIKE @ClassName OR D.{1} @ClassName OR T.{2} LIKE @ClassName) ",
+                        nameof(RB_Student_BackClass_ViewModel.GuestName), nameof(RB_Student_BackClass_ViewModel.ClassName), nameof(RB_Student_BackClass_ViewModel.TeacherName));
+                    parameters.Add("ClassName", "%" + query.ClassName.Trim() + "%");
+                }
+                if (query.AuditStatus > 0)
+                {
+                    builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Student_BackClass_ViewModel.AuditStatus), (int)query.AuditStatus);
+                }
+                if (!string.IsNullOrEmpty(query.QStartTime))
+                {
+                    builder.AppendFormat(@" AND A.{0}>='{1}' ", nameof(RB_Student_BackClass_ViewModel.CreateTime), query.QStartTime);
+                }
+                if (!string.IsNullOrEmpty(query.QEndTime))
+                {
+                    builder.AppendFormat(@" AND A.{0}<='{1} 23:59:59' ", nameof(RB_Student_BackClass_ViewModel.CreateTime), query.QEndTime);
+                }
             }
             return GetPage<RB_Student_BackClass_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString()).ToList();
         }

Edu.WebApi/Controllers/Course/StuController.cs

@@ -2,6 +2,12 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Edu.Cache.User;
+using Edu.Common.API;
+using Edu.Common.Enum.Course;
+using Edu.Common.Plugin;
+using Edu.Model.ViewModel.Course;
+using Edu.Module.Course;
 using Edu.WebApi.Filter;
 using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Http;
@@ -18,6 +24,58 @@ namespace Edu.WebApi.Controllers.Course
     [EnableCors("AllowCors")]
     public class StuController : BaseController
     {
+        /// <summary>
+        /// 学员单据处理类对象
+        /// </summary>
+        private readonly StudentBillModule studentBillModule = new StudentBillModule();
 
+        /// <summary>
+        /// 获取学员退课单据分页列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetStudentBackClassPage()
+        {
+            var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
+            var query = new RB_Student_BackClass_ViewModel()
+            {
+                ClassName = base.ParmJObj.GetStringValue("ClassName"),
+                QStartTime=base.ParmJObj.GetStringValue("QStartTime"),
+                QEndTime=base.ParmJObj.GetStringValue("QEndTime"),
+                AuditStatus=(BackClassAuditStatusEnum)base.ParmJObj.GetInt("AuditStatus")
+            };
+            query.Group_Id = base.UserInfo.Group_Id;
+            List<object> result = new List<object>();
+            var list = studentBillModule.GetStudentBackClassPageListModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
+            foreach (var item in list)
+            {
+                if (item.CreateBy > 0)
+                {
+                    item.CreateByName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName ?? "";
+                }
+                result.Add(new
+                {
+                    item.BackId,
+                    item.BackNum,
+                    item.GuestId,
+                    item.GuestName,
+                    item.SchoolId,
+                    item.SchoolName,
+                    item.ClassId,
+                    item.ClassName,
+                    item.TeacherId,
+                    item.TeacherName,
+                    item.FinishHours,
+                    item.BackMoney,
+                    item.CreateTimeStr,
+                    item.CreateByName,
+                    item.AuditStatus,
+                    AuditStatusName=item.AuditStatus.ToName(),
+                });
+            }
+            pageModel.Count = rowsCount;
+            pageModel.PageData = result;
+            return ApiResult.Success(data: pageModel);
+        }
     }
 }