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

Edu.Model/ViewModel/Duty/RB_Visitor_ViewModel.cs

@@ -33,5 +33,10 @@ namespace Edu.Model.ViewModel.Duty
         /// 关键字查询
         /// </summary>
         public string KeyWords { get; set; }
+
+        /// <summary>
+        /// 是否查看所有人访客
+        /// </summary>
+        public int IsQueryAll { get; set; }
     }
 }

Edu.Model/ViewModel/Reserve/RB_Visitor_Reserve_Extend.cs

@@ -120,5 +120,10 @@ namespace Edu.Model.ViewModel.Reserve
         /// 账户表Id
         /// </summary>
         public int AccountId { get; set; }
+
+        /// <summary>
+        /// 是否查询所有约课(1-是)
+        /// </summary>
+        public int IsQueryAll { get; set; }
     }
 }

Edu.Repository/Reserve/RB_Visitor_ReserveRepository.cs

@@ -75,6 +75,10 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Visitor_Reserve_Extend.Id), query.Id);
                 }
+                if (query.CreateBy > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Visitor_Reserve_Extend.CreateBy), query.CreateBy);
+                }
             }
             return GetPage<RB_Visitor_Reserve_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
         }

Edu.WebApi/Controllers/Duty/DutyPlanController.cs

@@ -386,8 +386,13 @@ namespace Edu.WebApi.Controllers.Duty
             var query = new RB_Visitor_ViewModel()
             {
                 PlanId = base.ParmJObj.GetInt("PlanId"),
-                KeyWords = base.ParmJObj.GetStringValue("KeyWords")
+                KeyWords = base.ParmJObj.GetStringValue("KeyWords"),
+                IsQueryAll=base.ParmJObj.GetInt("IsQueryAll"),//1-查看全部
             };
+            if (query.IsQueryAll != 1)
+            {
+                query.CreateBy = base.UserInfo.Id;
+            }
             query.Group_Id = base.UserInfo.Group_Id;
             List<object> result = new List<object>();
             var list = dutyPlanModule.GetVisitorPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);

Edu.WebApi/Controllers/Duty/VisitorReserveController.cs

@@ -47,7 +47,12 @@ namespace Edu.WebApi.Controllers.Duty
                 Q_ReserveStatus=base.ParmJObj.GetStringValue("Q_ReserveStatus"),
                 VisitorName=base.ParmJObj.GetStringValue("VisitorName"),
                 Id=base.ParmJObj.GetInt("Id"),
+                IsQueryAll=base.ParmJObj.GetInt("IsQueryAll")
             };
+            if (query.IsQueryAll != 1)
+            {
+                query.CreateBy = base.UserInfo.Id;
+            }
             var list = visitorReserveModule.GetVisitorReservePageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
             foreach (var item in list)
             {
@@ -181,6 +186,7 @@ namespace Edu.WebApi.Controllers.Duty
                 if (item.CreateBy > 0)
                 {
                     item.CreateByName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName ?? "";
+
                 }
             }
             pageModel.PageData = list;