页面修改

Edu.Repository/BackClass/RB_Student_BackClassRepository.cs

 using Edu.Common.Enum.Course;
 using Edu.Model.Entity.BackClass;
-using Edu.Model.Entity.Course;
 using Edu.Model.Entity.EduTask;
 using Edu.Model.Entity.Sell;
 using Edu.Model.ViewModel.BackClass;
 using Edu.Model.ViewModel.Contract;
-using Edu.Model.ViewModel.Course;
 using Edu.Model.ViewModel.EduTask;
 using Edu.Model.ViewModel.Sell;
 using Edu.Repository.Contract;
-using Edu.Repository.Course;
 using Edu.Repository.EduTask;
 using Edu.Repository.Sell;
 using System;
@@ -137,7 +134,6 @@ WHERE 1=1   ");
                 //更新退课协议审核状态
                 flag = backClass_ProtocolRepository.Update(backprotocolFileds, new WhereHelper(nameof(RB_BackClass_Protocol_ViewModel.BackId), backModel.BackId));
             }
-
             if (flag)
             {
                 var guestList = order_GuestRepository.GetOrderGuestListRepository(new RB_Order_Guest_ViewModel() { OrderId = backModel.OrderId });
@@ -150,7 +146,6 @@ WHERE 1=1   ");
                     };
                     flag = orderRepository.Update(orderFileds, new WhereHelper(nameof(RB_Order.OrderId), backModel.OrderId));
                 }
-
             }
             if (flag)
             {

Edu.Repository/Contract/RB_Education_ContractAdjustRepository.cs

@@ -10,7 +10,6 @@ namespace Edu.Repository.Contract
     /// </summary>
     public class RB_Education_ContractAdjustRepository : BaseRepository<RB_Education_ContractAdjust>
     {
-
         /// <summary>
         /// 获取列表
         /// </summary>

Edu.Repository/Course/RB_Course_ChapterRepository.cs

 using Edu.Common.Enum;
 using Edu.Common.Plugin;
 using Edu.Model.ViewModel.Course;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

Edu.Repository/Course/RB_Course_StepPriceRepository.cs

@@ -38,16 +38,5 @@ WHERE 1=1
             }
             return Get<RB_Course_StepPrice_ViewModel>(builder.ToString()).ToList();
         }
-
-        /// <summary>
-        /// 根据课程编号删除课程阶梯价格
-        /// </summary>
-        /// <param name="CourseId"></param>
-        /// <returns></returns>
-        public bool DeleteStepPriceRepository(int CourseId)
-        {
-            bool flag = base.DeleteOne(new VT.FW.DB.WhereHelper(nameof(RB_Course_StepPrice_ViewModel.CourseId), CourseId));
-            return flag;
-        }
     }
 }

Edu.Repository/Question/RB_QuestionRepository.cs

@@ -26,7 +26,6 @@ SELECT A.*
 FROM  RB_Question AS A INNER JOIN rb_question_bank AS B ON A.BankId=B.BankId
 WHERE 1=1 AND B.Status=0
 ");
-
             if (query == null)
             {
                 return new List<RB_Question_ViewModel>();
@@ -89,7 +88,6 @@ WHERE 1=1 AND B.Status=0  AND A.Status=0
             }
         }
 
-
         /// <summary>
         /// 获取问题分页列表
         /// </summary>
@@ -167,6 +165,5 @@ WHERE 1=1
             builder.AppendFormat(" UPDATE RB_Question SET LevelType={0} WHERE QuestionId IN ({1}) ", (int)levelTypeEnum, string.Join(",", questionIdList));
             return base.Execute(builder.ToString()) > 0;
         }
-
     }
 }
\ No newline at end of file

Edu.Repository/Question/RB_Question_BankRepository.cs

@@ -55,6 +55,5 @@ WHERE 1=1 ");
                 return GetPage<RB_Question_Bank_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
             }
         }
-
     }
 }
\ No newline at end of file

Edu.Repository/Reserve/RB_Reserve_ClassRepository.cs

@@ -130,7 +130,6 @@ WHERE 1=1
             var startTime = query.ClassDateStr + " " + query.ClassTime + ":00";
             var endTime= query.ClassDateStr + " " + query.EndTime + ":00";
             StringBuilder builder = new StringBuilder();
-            //CONCAT(substring(C.ClassDate,1,10),' ',C.ClassTime,':00') AS StartTime,CONCAT(substring(C.ClassDate,1,10),' ',C.EndTime,':00') AS EndTime
             builder.AppendFormat(@"
 SELECT 1
 FROM RB_Reserve_Class c

Edu.Repository/Reserve/RB_Visitor_ReserveRepository.cs

@@ -170,7 +170,6 @@ WHERE 1=1  {0}
             return Get<RB_Visitor_Reserve_Extend>(sql, parameters).ToList();
         }
 
-
         /// <summary>
         /// 根据约课信息获取访客列表
         /// </summary>

Edu.Repository/System/RB_MenuRepository.cs

 using Edu.Common.Enum;
-using Edu.Model.Entity.System;
 using Edu.Model.ViewModel.System;
 using System.Collections.Generic;
 using System.Linq;
@@ -17,7 +16,7 @@ namespace Edu.Repository.System
         /// <param name="isQueryPermission">是否只查询权限菜单</param>
         /// <param name="roleId">角色编号</param>
         /// <returns></returns>
-        public List<RB_Menu_ViewModel> GetMenuListRepository(RB_Menu_ViewModel query,bool isQueryPermission=false,int roleId=0)
+        public List<RB_Menu_ViewModel> GetMenuListRepository(RB_Menu_ViewModel query, bool isQueryPermission = false, int roleId = 0)
         {
             var parameters = new DynamicParameters();
             StringBuilder builder = new StringBuilder();
@@ -41,7 +40,7 @@ WHERE 1=1
                 }
                 if (query.MenuLevel > 0)
                 {
-                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Menu_ViewModel.MenuLevel),query.MenuLevel);
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Menu_ViewModel.MenuLevel), query.MenuLevel);
                 }
                 if (query.MenuId > 0)
                 {
@@ -60,11 +59,11 @@ WHERE 1=1
                     builder.AppendFormat(" AND {0}={1} ", nameof(RB_Menu_ViewModel.IsUserCenter), query.IsUserCenter);
                 }
             }
-            if (isQueryPermission && roleId>0)
+            if (isQueryPermission && roleId > 0)
             {
                 builder.AppendFormat(" AND MenuId IN(SELECT Menu_Id FROM RB_Role_Permission WHERE Role_Id={0}) ", roleId);
             }
-            return Get<RB_Menu_ViewModel>(builder.ToString(),parameters).ToList();
+            return Get<RB_Menu_ViewModel>(builder.ToString(), parameters).ToList();
         }
 
         /// <summary>
@@ -84,7 +83,6 @@ SELECT *
 FROM rb_menu
 WHERE 1=1 
 ");
-     
             if (query != null)
             {
                 if (!string.IsNullOrWhiteSpace(query.MenuName))
@@ -119,7 +117,7 @@ WHERE 1=1
                 }
             }
             builder.AppendFormat(" ORDER BY {0} DESC ", nameof(RB_Menu_ViewModel.MenuId));
-            return GetPage<RB_Menu_ViewModel>(pageIndex,pageSize,out rowsCount, builder.ToString(), parameters).ToList();
+            return GetPage<RB_Menu_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
         }
 
         /// <summary>
@@ -128,7 +126,7 @@ WHERE 1=1
         /// <param name="postIds"></param>
         /// <param name="menuType"></param>
         /// <returns></returns>
-        public List<RB_Menu_ViewModel> GetPostMenuListRepository(string postIds,int menuType, int teamType)
+        public List<RB_Menu_ViewModel> GetPostMenuListRepository(string postIds, int menuType, int teamType)
         {
             if (string.IsNullOrEmpty(postIds))
             {

Edu.Repository/System/RB_Menu_FunctionRepository.cs

@@ -91,7 +91,8 @@ WHERE 1=1
             builder.AppendFormat(@"
 SELECT A.*,IFNULL(B.MenuName,'') AS MenuName,IFNULL(B.MenuUrl,'') AS MenuUrl
 FROM RB_Menu_Function AS A LEFT JOIN rb_menu AS B ON A.MenuId=B.MenuId
-WHERE 1=1 AND A.Status=0 AND A.Id IN(SELECT Action_Id FROM rb_role_functionpermission WHERE Role_Id IN (SELECT RoleId FROM rb_post_role WHERE PostId IN({0})))
+WHERE 1=1 AND A.Status=0 
+      AND A.Id IN(SELECT Action_Id FROM rb_role_functionpermission WHERE Role_Id IN (SELECT RoleId FROM rb_post_role WHERE PostId IN({0})))
 ", postIds);
             return Get<RB_Menu_Function_ViewModel>(builder.ToString()).ToList();
         }
@@ -117,7 +118,8 @@ WHERE 1=1 AND A.Status=0 AND A.Id IN(SELECT Action_Id FROM rb_role_functionpermi
             builder.AppendFormat(@"
 SELECT 1
 FROM RB_Menu_Function AS A 
-WHERE 1=1 AND A.FunctionCode='{0}' AND A.Id IN(SELECT Action_Id FROM rb_role_functionpermission WHERE Role_Id IN (SELECT RoleId FROM rb_post_role WHERE PostId IN({1})))
+WHERE 1=1 AND A.FunctionCode='{0}' 
+      AND A.Id IN(SELECT Action_Id FROM rb_role_functionpermission WHERE Role_Id IN (SELECT RoleId FROM rb_post_role WHERE PostId IN({1})))
 ", actionCode.Trim(), postIds);
             var obj = base.ExecuteScalar(builder.ToString());
             if (obj != null)

Edu.Repository/System/RB_Menu_InformationRepository.cs

-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Edu.Model.Entity.System;
 using Edu.Model.ViewModel.System;
 
 namespace Edu.Repository.System
 {
-  public  class RB_Menu_InformationRepository:BaseRepository<RB_Menu_Information>
+    /// <summary>
+    /// 系统菜单消息（气泡）仓储层
+    /// </summary>
+    public class RB_Menu_InformationRepository : BaseRepository<RB_Menu_Information>
     {
         /// <summary>
         /// 根据where获取菜单列表

Edu.Repository/System/RB_RoleRepository.cs

@@ -33,10 +33,6 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND {0}={1} ", nameof(RB_Role_ViewModel.Group_Id), query.Group_Id);
                 }
-                if (query.School_Id > 0)
-                {
-                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Role_ViewModel.School_Id), query.School_Id);
-                }
                 if (query.RoleId > 0)
                 {
                     builder.AppendFormat(" AND {0}={1} ", nameof(RB_Role_ViewModel.RoleId), query.RoleId);
@@ -74,10 +70,6 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND {0}={1} ", nameof(RB_Role_ViewModel.Status), (int)query.Status);
                 }
-                //if (query.School_Id > 0)
-                //{
-                //    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Role_ViewModel.School_Id), query.School_Id);
-                //}
                 if (query.RoleId > 0)
                 {
                     builder.AppendFormat(" AND {0}={1} ", nameof(RB_Role_ViewModel.RoleId), query.RoleId);

Edu.Repository/System/RB_System_HolidayRepository.cs

-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using Edu.Model.Entity.System;
@@ -8,13 +7,6 @@ namespace Edu.Repository.System
 {
     public class RB_System_HolidayRepository : BaseRepository<RB_System_Holiday>
     {
-        /// <summary>
-        /// 表名称
-        /// </summary>
-        public string TableName { get { return nameof(RB_System_Holiday); } }
-
-
-
         /// <summary>
         /// 节假日列表
         /// </summary>
@@ -27,23 +19,19 @@ namespace Edu.Repository.System
         {
             StringBuilder sb = new StringBuilder();
             sb.AppendFormat(@" SELECT a.* from RB_System_Holiday as a  where 1=1");
-
             sb.AppendFormat(" AND A.{0}={1} ", nameof(RB_System_Holiday.Status), (int)Common.Enum.DateStateEnum.Normal);
             if (model.HolidayId > 0)
             {
                 sb.AppendFormat(" AND A.{0}={1} ", nameof(RB_System_Holiday.HolidayId), model.HolidayId);
             }
-
             if (model.Group_Id > 0)
             {
                 sb.AppendFormat(" AND A.{0}={1} ", nameof(RB_System_Holiday.Group_Id), model.Group_Id);
             }
-
             if (model.StartTime.HasValue)
             {
                 sb.AppendFormat(" AND DATE_FORMAT(A.{0}, '%y/%m/%d') >= DATE_FORMAT('{1}', '%y/%m/%d') ", nameof(RB_System_Holiday.StartTime), model.StartTime.Value.ToString("yyyy-MM-dd"));
             }
-
             if (model.EndTime.HasValue)
             {
                 sb.AppendFormat(" AND DATE_FORMAT(A.{0}, '%y/%m/%d') <= DATE_FORMAT('{1}', '%y/%m/%d') ", nameof(RB_System_Holiday.StartTime), model.EndTime.Value.ToString("yyyy-MM-dd"));
@@ -60,8 +48,6 @@ namespace Edu.Repository.System
             return GetPage<RB_System_Holiday>(pageIndex, pageSize, out count, sb.ToString()).ToList();
         }
 
-
-
         /// <summary>
         /// 判断某一天是否在节假日里
         /// </summary>
@@ -74,9 +60,6 @@ namespace Edu.Repository.System
             return Get<RB_System_Holiday>(sql).ToList();
         }
 
-
-
-
         /// <summary>
         /// 判断某一个时间段是否在节假日里
         /// </summary>
@@ -93,7 +76,5 @@ AND DATE_FORMAT(EndTime, '%y/%m/%d') >= DATE_FORMAT('{endTime}', '%y/%m/%d'))
 ) ";
             return Get<RB_System_Holiday>(sql).ToList();
         }
-
-
     }
 }

Edu.Repository/User/RB_AccountRemarkRepository.cs

@@ -73,7 +73,6 @@ namespace Edu.Repository.User
             return GetPage<RB_AccountRemark_ViewModel>(pageIndex, pageSize, out rowsCount, sql).ToList();
         }
 
-
         /// <summary>
         /// 获取分页列表
         /// </summary>
@@ -122,6 +121,7 @@ ORDER BY DATE_FORMAT(CreateTime,'%Y-%m-%d') DESC
 ";
             return GetPage<RB_AccountRemark_ViewList>(pageIndex, pageSize, out rowsCount, sql).ToList();
         }
+       
         /// <summary>
         /// 获取列表
         /// </summary>
@@ -163,4 +163,4 @@ ORDER BY DATE_FORMAT(CreateTime,'%Y-%m-%d') DESC
             return Get<RB_AccountRemark_ViewModel>(sql).ToList();
         }
     }
-}
+}
\ No newline at end of file