页面修改

Edu.Common/Enum/Course/BackClassEnum.cs

@@ -31,4 +31,47 @@ namespace Edu.Common.Enum.Course
         [EnumField("作废")]
         Delete = 4,
     }
+
+    /// <summary>
+    /// 我的退课单据切换条件
+    /// </summary>
+    public enum BackClassConditionEnum
+    {
+        /// <summary>
+        ///我发起的
+        /// </summary>
+        [EnumField("我发起的")]
+        Launch = 1,
+        /// <summary>
+        /// 我审批的
+        /// </summary>
+        [EnumField("我审批的")]
+        Agree = 2,
+        /// <summary>
+        /// 待我审批
+        /// </summary>
+        [EnumField("待我审批")]
+        WaitAgree = 3,
+        /// <summary>
+        /// 抄送给我的
+        /// </summary>
+        [EnumField("抄送给我的")]
+        CarbonCopy = 4,
+
+        /// <summary>
+        ///全部
+        /// </summary>
+        [EnumField("全部")]
+        ALL = 5,
+        /// <summary>
+        /// 我作废的
+        /// </summary>
+        [EnumField("我作废的")]
+        Delete = 6,
+        /// <summary>
+        /// 被驳回的
+        /// </summary>
+        [EnumField("被驳回的")]
+        Refund = 7,
+    }
 }
\ No newline at end of file

Edu.Model/ViewModel/Course/RB_Student_BackClass_ViewModel.cs

-using Edu.Model.Entity.Course;
+using Edu.Common.Enum.Course;
+using Edu.Model.Entity.Course;
 using System;
 using System.Collections.Generic;
 using System.Text;
@@ -64,5 +65,10 @@ namespace Edu.Model.ViewModel.Course
         /// 课程名称
         /// </summary>
         public string CourseName { get; set; }
+
+        /// <summary>
+        /// 查询条件
+        /// </summary>
+        public BackClassConditionEnum? Conditon { get; set; }
     }
 }

Edu.Repository/Course/RB_Student_BackClassRepository.cs

@@ -60,7 +60,32 @@ WHERE 1=1  ");
                 {
                     builder.AppendFormat(@" AND A.{0}<='{1} 23:59:59' ", nameof(RB_Student_BackClass_ViewModel.CreateTime), query.QEndTime);
                 }
+                if (query.Conditon != null && query.Conditon>0)
+                {
+               
+                    switch (query.Conditon)
+                    {
+                        //待我审批
+                        case Common.Enum.Course.BackClassConditionEnum.WaitAgree:
+                            builder.AppendFormat(" AND EXISTS (SELECT 1 FROM rb_student_backrecord WHERE ConditionId=A.BackId AND AuditStatus=1 AND AuditEmId={0}) ", query.CreateBy);
+                            break;
+                        //已审批的
+                        case Common.Enum.Course.BackClassConditionEnum.Agree:
+                            builder.AppendFormat(" AND EXISTS (SELECT 1 FROM rb_student_backrecord WHERE ConditionId=A.BackId AND AuditStatus=2 AND AuditEmId={0}) ", query.CreateBy);
+                            break;
+                        //我发起的
+                        case Common.Enum.Course.BackClassConditionEnum.Launch:
+                            builder.AppendFormat(" AND A.CreateBy={0} ", query.CreateBy);
+                            break;
+                        //抄送给我的
+                        case Common.Enum.Course.BackClassConditionEnum.CarbonCopy:
+                            builder.AppendFormat(" AND FIND_IN_SET({0},A.RecipientIds) ", query.CreateBy);
+                            break;
+                    }
+
+                }
             }
+            builder.AppendFormat(" ORDER BY A.CreateTime DESC ");
             return GetPage<RB_Student_BackClass_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString()).ToList();
         }
 

Edu.WebApi/Controllers/Course/StuController.cs

@@ -42,8 +42,14 @@ namespace Edu.WebApi.Controllers.Course
                 ClassName = base.ParmJObj.GetStringValue("ClassName"),
                 QStartTime=base.ParmJObj.GetStringValue("QStartTime"),
                 QEndTime=base.ParmJObj.GetStringValue("QEndTime"),
-                AuditStatus=(BackClassAuditStatusEnum)base.ParmJObj.GetInt("AuditStatus")
+                AuditStatus=(BackClassAuditStatusEnum)base.ParmJObj.GetInt("AuditStatus"),
             };
+            query.CreateBy = base.UserInfo.Id;
+            var Conditon = base.ParmJObj.GetInt("Conditon");
+            if (Conditon > 0)
+            {
+                query.Conditon = (BackClassConditionEnum)Conditon;
+            }
             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);