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

Edu.Common/Config.cs

@@ -356,6 +356,18 @@ namespace Edu.Common
             }
         }
 
+        /// <summary>
+        /// 调课流程编号
+        /// </summary>
+        public static int ChangeClassFlowId
+        {
+            get
+            {
+                int.TryParse(ReadConfigKey("ChangeClassFlowId"), out int ChangeClassFlowId);
+                return ChangeClassFlowId;
+            }
+        }
+
         /// <summary>
         /// okr关注事项配置
         /// </summary>
@@ -617,5 +629,16 @@ namespace Edu.Common
                 return "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
             }
         }
+
+        /// <summary>
+        /// 公告字典中的key
+        /// </summary>
+        public static string Notice_BaseKey
+        {
+            get
+            {
+                return ReadConfigKey("Notice_BaseKey");
+            }
+        }
     }
 }
\ No newline at end of file

Edu.Common/Enum/Course/BackClassEnum.cs

 using Edu.Common.Plugin;
-using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace Edu.Common.Enum.Course
 {
-    /// <summary>
-    /// 退课状态枚举
-    /// </summary>
-   public enum BackClassAuditStatusEnum
-    { 
-        /// <summary>
-        /// 审核中
-        /// </summary>
-        [EnumField("审核中")]
-        InReview = 1,
-        /// <summary>
-        /// 通过 
-        /// </summary>
-        [EnumField("通过")]
-        Pass = 2,
-        /// <summary>
-        /// 驳回 
-        /// </summary>
-        [EnumField("驳回")]
-        Rejected = 3,
-        /// <summary>
-        /// 作废
-        /// </summary>
-        [EnumField("作废")]
-        Delete = 4,
-    }
 
     /// <summary>
     /// 教务单据切换枚举

Edu.Common/Enum/Finance/WFRrocessStatus.cs

@@ -15,26 +15,30 @@ namespace Edu.Common.Enum.Finance
         /// </summary>
         [EnumField("未审核")]
         NotAudit = 1,
+
         /// <summary>
         /// 通过
         /// </summary>
         [EnumField("审核通过")]
         AuditThrough = 2,
+
         /// <summary>
         /// 不通过
         /// </summary>
         [EnumField("审核不通过")]
         AuditNotThrough = 3,
+
         /// <summary>
         /// 驳回 
         /// </summary>
         [EnumField("驳回")]
         Rejected = 4,
+
         /// <summary>
         /// 他人已审核（仅限审核记录表） 
         /// </summary>
         [EnumField("他人已审核")]
         OtherHaveAudit = 5
-
+      
     }
 }

Edu.Common/Enum/User/NoticeStateEnum.cs

@@ -22,5 +22,10 @@ namespace Edu.Common.Enum.User
         /// </summary>
         [EnumField("撤回")]
         Cancel = 3,
+        /// <summary>
+        /// 待审核
+        /// </summary>
+        [EnumField("待审核")]
+        Review = 4,
     }
 }

Edu.Common/Enum/User/WFAuditStatus.cs → Edu.Common/Enum/User/UserWFAuditStatus.cs

@@ -6,7 +6,7 @@ namespace Edu.Common.Enum.User
     /// <summary>
     /// 工作申请流审核状态
     /// </summary>
-    public enum WFAuditStatus
+    public enum UserWFAuditStatus
     {
         /// <summary>
         /// 审核中
@@ -34,6 +34,7 @@ namespace Edu.Common.Enum.User
         [EnumField("通过")]
         Through = 5
     }
+
     /// <summary>
     /// 流程审核状态
     /// </summary>
@@ -63,8 +64,13 @@ namespace Edu.Common.Enum.User
         /// 他人已审核（仅限审核记录表） 
         /// </summary>
         [EnumField("他人已审核")]
-        OtherHaveAudit = 5
+        OtherHaveAudit = 5,
 
+        /// <summary>
+        /// 作废【HK2021-07-13新增】 
+        /// </summary>
+        [EnumField("作废")]
+        Invalid =6,
     }
 
     /// <summary>
@@ -110,42 +116,5 @@ namespace Edu.Common.Enum.User
         Cancel = 2
     }
     #endregion
-    #region 财务
-    /// <summary>
-    /// 财务审核状态
-    /// </summary>
-    public enum FinanceAuditStatus
-    {
-        /// <summary>
-        /// 暂存
-        /// </summary>
-        [EnumField("制单人暂存")]
-        Temporary = 0,
-        /// <summary>
-        /// 审核中
-        /// </summary>
-        [EnumField("审核中")]
-        InReview = 1,
-        /// <summary>
-        /// 通过 
-        /// </summary>
-        [EnumField("通过")]
-        Pass = 2,
-        /// <summary>
-        /// 驳回 
-        /// </summary>
-        [EnumField("驳回")]
-        Rejected = 3,
-        /// <summary>
-        /// 作废
-        /// </summary>
-        [EnumField("作废")]
-        Delete = 4,
-        /// <summary>
-        /// 出纳暂存
-        /// </summary>
-        [EnumField("出纳暂存")]
-        CTemporary = 5
-    }
-    #endregion
+
 }

Edu.Common/Enum/User/WFTAuditTypeEnum.cs

@@ -18,11 +18,18 @@ namespace Edu.Common.Enum.User
         [EnumField("指定成员")]
         SpecifiedMember = 2,
         /// <summary>
-        /// 角色
+        /// 指定角色
         /// </summary>
-        [EnumField("角色")]
-        Role = 3
+        [EnumField("指定角色")]
+        Role = 3,
+
+        /// <summary>
+        /// 系统角色
+        /// </summary>
+        [EnumField("系统角色")]
+        Post =4,
     }
+
     /// <summary>
     /// 审核方式
     /// </summary>

Edu.Model/Entity/Course/RB_Student_BackClass.cs

-using Edu.Common.Enum.Course;
+using Edu.Common.Enum.User;
 using System;
-using System.Collections.Generic;
-using System.Text;
 using VT.FW.DB;
 
 namespace Edu.Model.Entity.Course
@@ -76,7 +74,7 @@ namespace Edu.Model.Entity.Course
 		/// <summary>
 		/// 审核状态
 		/// </summary>
-		public BackClassAuditStatusEnum AuditStatus { get; set; }
+		public WFRrocessStatus AuditStatus { get; set; }
 
 		/// <summary>
 		/// 抄送人(多个逗号分隔)

Edu.Model/Entity/EduTask/RB_Change_ClassPlan.cs

 using System;
 using System.Collections.Generic;
 using System.Text;
+using VT.FW.DB;
 
 namespace Edu.Model.Entity.EduTask
 {
     /// <summary>
     /// 上课计划调整实体类
     /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
     public class RB_Change_ClassPlan
     {
-		/// <summary>
-		/// 主键(调课编号)
-		/// </summary>
-		public int Id { get; set; }
+        /// <summary>
+        /// 主键(调课编号)
+        /// </summary>
+        public int Id { get; set; }
 
-		/// <summary>
-		/// 班级编号
-		/// </summary>
-		public int ClassId { get; set; }
+        /// <summary>
+        /// 班级编号
+        /// </summary>
+        public int ClassId { get; set; }
 
-		/// <summary>
-		/// 课程编号
-		/// </summary>
-		public int CourseId { get; set; }
+        /// <summary>
+        /// 课程编号
+        /// </summary>
+        public int CourseId { get; set; }
 
-		/// <summary>
-		/// 调动类型(1-课程，2-老师，3-教室,4-取消课程)
-		/// </summary>
-		public int ChangeType { get; set; }
+        /// <summary>
+        /// 调动类型(1-课程，2-老师，3-教室,4-取消课程)
+        /// </summary>
+        public int ChangeType { get; set; }
 
-		/// <summary>
-		/// 调动选项(1-固定日期，2-全局调整)
-		/// </summary>
-		public int MoveType { get; set; }
+        /// <summary>
+        /// 调动选项(1-固定日期，2-全局调整)
+        /// </summary>
+        public int MoveType { get; set; }
 
-		/// <summary>
-		/// 集团编号
-		/// </summary>
-		public int Group_Id { get; set; }
+        /// <summary>
+        /// 集团编号
+        /// </summary>
+        public int Group_Id { get; set; }
 
-		/// <summary>
-		/// 学校编号
-		/// </summary>
-		public int School_Id { get; set; }
+        /// <summary>
+        /// 学校编号
+        /// </summary>
+        public int School_Id { get; set; }
 
-		/// <summary>
-		/// 创建人
-		/// </summary>
-		public int CreateBy { get; set; }
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public int CreateBy { get; set; }
 
-		/// <summary>
-		/// 创建时间
-		/// </summary>
-		public DateTime CreateTime { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime { get; set; }
 
-		/// <summary>
-		/// 修改人
-		/// </summary>
-		public int UpdateBy { get; set; }
+        /// <summary>
+        /// 修改人
+        /// </summary>
+        public int UpdateBy { get; set; }
 
-		/// <summary>
-		/// 更新时间
-		/// </summary>
-		public DateTime UpdateTime { get; set; }
+        /// <summary>
+        /// 更新时间
+        /// </summary>
+        public DateTime UpdateTime { get; set; }
 
-		/// <summary>
-		/// 原数据
-		/// </summary>
-		public string SourceData { get; set; }
+        /// <summary>
+        /// 原数据
+        /// </summary>
+        public string SourceData { get; set; }
 
-		/// <summary>
-		/// 目标数据
-		/// </summary>
-		public string TargetData { get; set; }
-	}
+        /// <summary>
+        /// 目标数据
+        /// </summary>
+        public string TargetData { get; set; }
+
+        /// <summary>
+        /// 调课备注
+        /// </summary>
+        public string Remarks { get; set; }
+    }
 }

Edu.Model/Entity/EduTask/RB_Education_Receipt.cs

 using Edu.Common.Enum.Finance;
 using System;
-using System.Collections.Generic;
-using System.Text;
 using VT.FW.DB;
 
 namespace Edu.Model.Entity.EduTask
@@ -81,6 +79,6 @@ namespace Edu.Model.Entity.EduTask
 		/// <summary>
 		/// 审核状态(见枚举)
 		/// </summary>
-		public WFRrocessStatus VerifyStatus { get; set; }
+		public Edu.Common.Enum.User.WFRrocessStatus VerifyStatus { get; set; }	        
 	}
 }

Edu.Model/Entity/EduTask/RB_Education_Record.cs

@@ -25,7 +25,7 @@ namespace Edu.Model.Entity.EduTask
 
 
 		/// <summary>
-		///  审核id
+		/// 审核id【教务单据审核人员信息表主键编号，RB_Education_Relevance：Id 】
 		/// </summary>
 		public int AuditId { get; set; }
 
@@ -64,10 +64,6 @@ namespace Edu.Model.Entity.EduTask
 		/// </summary>
 		public int AuditEmId { get; set; }
 
-
-		/// <summary>
-		/// 审核节点编号
-		/// </summary>
-		public int BackrelevanceId { get; set; }
+ 
 	}
 }

Edu.Model/Entity/EduTask/RB_Education_Relevance.cs

@@ -24,7 +24,7 @@ namespace Edu.Model.Entity.EduTask
 		public int ConditionId { get; set; }
 
 		/// <summary>
-		/// 审核人类型  1主管(指定一级) 2 指定成员  3角色
+		/// 审核人类型【1主管(指定一级),2-指定成员,3-指定角色,4-系统角色】
 		/// </summary>
 		public WFTAuditTypeEnum AuditType { get; set; }
 
@@ -49,7 +49,7 @@ namespace Edu.Model.Entity.EduTask
 		public string AuditDescription { get; set; }
 
 		/// <summary>
-		/// 工作流id
+		/// 审核流程编号
 		/// </summary>
 		public int WorkFlowId { get; set; }
 
@@ -79,7 +79,7 @@ namespace Edu.Model.Entity.EduTask
 		public int SpecialNode { get; set; }
 
 		/// <summary>
-		/// 多个定角色编号
+		/// 指定角色编号
 		/// </summary>
 		public string PostIds { get; set; }
 
@@ -87,5 +87,10 @@ namespace Edu.Model.Entity.EduTask
 		/// 指定的人员编号
 		/// </summary>
 		public string UserIds { get; set; }
+
+		/// <summary>
+		/// 系统角色编号
+		/// </summary>
+		public string SysPostIds { get; set; }
 	}
 }
\ No newline at end of file

Edu.Model/Entity/Flow/RB_Flow_AduitInfo.cs

@@ -39,7 +39,7 @@ namespace Edu.Model.Entity.Flow
 		public WFTAuditTypeEnum AuditType { get; set; }
 
 		/// <summary>
-		/// 审核人员编号(AuditType为1时使用）
+		/// 审核人员编号(AuditType为2时使用）
 		/// </summary>
 		public int UserId { get; set; }
 
@@ -49,7 +49,7 @@ namespace Edu.Model.Entity.Flow
 		public int IsSpecNode { get; set; }
 
 		/// <summary>
-		/// 1-班级教师，2-关联销售，3-分区校长,4-教务长 AuditType为2时使用
+		///  AuditType=3【1-班级教师，2-关联销售，3-分区校长,4-教务长】AuditType=4【系统角色】
 		/// </summary>
 		public int PostType { get; set; }
 

Edu.Model/Entity/User/Rb_Workflow_Askforleave.cs

@@ -72,7 +72,7 @@ namespace Edu.Model.Entity.User
         /// <summary>
         /// 1审核中  2 撤回  3 驳回  4 不通过  5 通过
         /// </summary>        
-        public WFAuditStatus? Status
+        public UserWFAuditStatus? Status
         {
             get;
             set;

Edu.Model/Entity/User/Rb_Workflow_Evection.cs

@@ -48,7 +48,7 @@ namespace Edu.Model.Entity.User
         /// <summary>
         /// 1审核中  2 撤回  3 驳回  4 不通过  5 通过
         /// </summary>        
-        public WFAuditStatus? Status
+        public UserWFAuditStatus? Status
         {
             get;
             set;

Edu.Model/Entity/User/Rb_Workflow_GoOut.cs

@@ -64,7 +64,7 @@ namespace Edu.Model.Entity.User
         /// <summary>
         /// 1审核中  2 撤回  3 驳回  4 不通过  5 通过
         /// </summary>        
-        public WFAuditStatus? Status
+        public UserWFAuditStatus? Status
         {
             get;
             set;

Edu.Model/Entity/User/Rb_Workflow_Reissuecard.cs

@@ -48,7 +48,7 @@ namespace Edu.Model.Entity.User
         /// <summary>
         /// 1审核中  2 撤回  3 驳回  4 不通过  5 通过
         /// </summary>        
-        public WFAuditStatus? Status
+        public UserWFAuditStatus? Status
         {
             get;
             set;

Edu.Model/ViewModel/Course/Class_LessonPlan_ViewModel.cs

@@ -84,6 +84,23 @@ namespace Edu.Model.ViewModel.Course
 
 
         #region 展示无逻辑
+
+
+        /// <summary>
+        /// 0-未备课，1-已备课
+        /// </summary>
+        public int BeiKeStatus { get; set; }
+
+        /// <summary>
+        /// 0-未反馈，1-已反馈
+        /// </summary>
+        public int FanKuiStatus { get; set; }
+
+        /// <summary>
+        /// 总评分
+        /// </summary>
+        public decimal TotalScore { get; set; }
+
         /// <summary>
         /// 老师名称
         /// </summary>

Edu.Model/ViewModel/Course/RB_Sell_Commission_Details_ViewModel.cs

@@ -13,6 +13,12 @@ namespace Edu.Model.ViewModel.Course
         /// 用户名称
         /// </summary>
         public string UserName { get; set; }
+
+        /// <summary>
+        /// 用户ids
+        /// </summary>
+        public string UserIds { get; set; }
+
         /// <summary>
         /// 部门名称
         /// </summary>
@@ -27,6 +33,11 @@ namespace Edu.Model.ViewModel.Course
         /// </summary>
         public string ClassName { get; set; }
 
+        /// <summary>
+        /// 班号
+        /// </summary>
+        public string ClassNo { get; set; }
+
         /// <summary>
         /// 班级类型
         /// </summary>

Edu.Model/ViewModel/EduTask/RB_Change_ClassPlan_ViewModel.cs

@@ -10,6 +10,64 @@ namespace Edu.Model.ViewModel.EduTask
     /// </summary>
     public class RB_Change_ClassPlan_ViewModel : RB_Change_ClassPlan
     {
+        /// <summary>
+        /// 调课计划编号
+        /// </summary>
+        public string Q_Change_ClassPlan_Ids { get; set; }
+
+        /// <summary>
+        /// 班级名称
+        /// </summary>
+        public string ClassName { get; set; }
+
+        /// <summary>
+        /// 调动类型字符串
+        /// </summary>
+        public string ChangeTypeStr
+        {
+            get
+            {
+                string str = "";
+                if (this.ChangeType == 1)
+                {
+                    str = "课程";
+                }
+                else if (this.ChangeType == 2)
+                {
+                    str = "老师";
+                }
+                else if (this.ChangeType == 3)
+                {
+                    str = "教室";
+                }
+                else if (this.ChangeType == 4)
+                {
+                    str = "取消课程";
+                }
+                return str;
+            }
+        }
+
+        /// <summary>
+        /// 调动选项字符串
+        /// </summary>
+        public string MoveTypeStr
+        {
+            get
+            {
+                string str = "";
+                if (this.MoveType == 1)
+                {
+                    str = "固定日期";
+                }
+                else if (this.MoveType == 2)
+                {
+                    str = "全局调整";
+                }
+                return str;
+            }
+        }
+
         /// <summary>
         /// 调整原数据信息
         /// </summary>
@@ -20,6 +78,11 @@ namespace Edu.Model.ViewModel.EduTask
         /// 调整新数据信息
         /// </summary>
         public List<ChangePlanItem> NewChangePlanItemList { get; set; }
+
+        /// <summary>
+        /// 全局修改上课时间
+        /// </summary>
+        public AllChangePlanItem AllChangePlanModel { get; set; }
     }
 
     public class ChangePlanItem
@@ -51,4 +114,100 @@ namespace Edu.Model.ViewModel.EduTask
 
 
     }
+
+
+    /// <summary>
+    /// 全局调课修改
+    /// </summary>
+    public class AllChangePlanItem
+    {
+
+        /// <summary>
+        /// 总课时
+        /// </summary>
+        public decimal ClassHours { get; set; }
+
+        /// <summary>
+        /// 课时分钟数
+        /// </summary>
+        public int ClassHourMinute { get; set; }
+        /// <summary>
+        /// 开课时间
+        /// </summary>
+        public string OpenTimeStr { get; set; }
+
+        /// <summary>
+        /// 老师编号
+        /// </summary>
+        public int TeacherId { get; set; }
+
+        /// <summary>
+        /// 教室编号
+        /// </summary>
+        public int ClassRoomId { get; set; }
+
+        /// 选中的周几/或日期数组
+        /// </summary>
+        public List<string> WeekDayList { get; set; }
+
+        /// <summary>
+        ///班级计划默认上课时间
+        /// </summary>
+        public List<ClassTimeItem> DefaultTimeList { get; set; }
+
+        /// <summary>
+        /// 默认选中的日期、周
+        /// </summary>
+//public string DateJson { get; set; }
+
+
+        /// <summary>
+        /// 排课方式(1-周，2-月，3-固定日期，4-约课)
+        /// </summary>
+        public Common.Enum.Course.ClassStyleEnum ClassStyle { get; set; }
+
+
+        /// <summary>
+		/// 默认时间字符串JSON
+		/// </summary>
+	//	public string DefaultTimeJson { get; set; }
+    }
+
+    ///<summary>
+    /// 上课时间配置项
+    /// </summary>
+    public class ClassTimeItem
+    {
+
+        /// <summary>
+        /// 上课日期【ClassStyle:1-周(1,2...);2和3(具体日期)；4(暂无)】
+        /// </summary>
+        public List<string> DateList { get; set; }
+
+        /// <summary>
+        /// 具体上课时间
+        /// </summary>
+        public List<TimeItem> TimeList { get; set; }
+    }
+
+    /// <summary>
+    /// 上课时间对象
+    /// </summary>
+    public class TimeItem
+    {
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        public string StartTime { get; set; }
+
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        public string EndTime { get; set; }
+
+        /// <summary>
+        /// 消耗课时
+        /// </summary>
+        public decimal TimeHour { get; set; }
+    }
 }

Edu.Model/ViewModel/EduTask/RB_Education_Receipt_ViewModel.cs

@@ -14,5 +14,15 @@ namespace Edu.Model.ViewModel.EduTask
         /// 是否特殊节点
         /// </summary>
         public int SpecialNode { get; set; }
+
+        /// <summary>
+        /// 班级名称
+        /// </summary>
+        public string ClassName { get; set; }
+
+        /// <summary>
+        /// 班级编号
+        /// </summary>
+        public string ClassNo { get; set; }
     }
 }

Edu.Model/ViewModel/EduTask/RB_Education_Record_ViewModel.cs

@@ -11,6 +11,19 @@ namespace Edu.Model.ViewModel.EduTask
     /// </summary>
     public class RB_Education_Record_ViewModel : RB_Education_Record
     {
- 
+        /// <summary>
+        /// 查询单号【逗号分隔】
+        /// </summary>
+        public string QConditionIds { get; set; }
+
+        /// <summary>
+        /// 审核节点名称
+        /// </summary>
+        public string AuditNode { get; set; }
+
+        /// <summary>
+        /// 新审核人员编号
+        /// </summary>
+        public int NewAuditEmId { get; set; }
     }
 }
\ No newline at end of file

Edu.Model/ViewModel/EduTask/RB_Education_Relevance_ViewModel.cs

@@ -11,5 +11,9 @@ namespace Edu.Model.ViewModel.EduTask
     /// </summary>
     public class RB_Education_Relevance_ViewModel : RB_Education_Relevance
     {
+        /// <summary>
+        /// 多个单据查询【逗号分隔】
+        /// </summary>
+        public string QConditionIds { get; set; }
     }
 }

Edu.Model/ViewModel/Flow/RB_Flow_AduitInfo_ViewModel.cs

@@ -19,5 +19,10 @@ namespace Edu.Model.ViewModel.Flow
         /// 流程编号【查询使用】
         /// </summary>
         public string QFlowIds { get; set; }
+
+        /// <summary>
+        /// 系统角色对应人员编号【逗号分割】
+        /// </summary>
+        public string PostUserIds { get; set; }
     }
 }

Edu.Model/ViewModel/User/RB_Account_ViewModel.cs

@@ -68,6 +68,11 @@ namespace Edu.Model.ViewModel.User
         /// </summary>
         public int Post_Id { get; set; }
 
+        /// <summary>
+        /// 岗位编号
+        /// </summary>
+        public string QPostIds { get; set; }
+
         /// <summary>
         /// 部门名称
         /// </summary>

Edu.Model/ViewModel/User/Rb_Workflow_Auditrecord_Extend.cs

@@ -55,7 +55,7 @@ namespace Edu.Model.ViewModel.User
         /// <summary>
         ///  申请状态 1审核中  2 撤回  3 驳回  4 不通过  5 通过
         /// </summary>        
-        public WFAuditStatus? Status
+        public UserWFAuditStatus? Status
         {
             get;
             set;

Edu.Model/ViewModel/User/Rb_Workflow_MyAuditRelation_Extend.cs

@@ -36,7 +36,7 @@ namespace Edu.Model.ViewModel.User
         /// <summary>
         /// 审批 申请状态 1审核中  2 撤回  3 驳回  4 不通过  5 通过
         /// </summary>        
-        public WFAuditStatus? Status
+        public UserWFAuditStatus? Status
         {
             get;
             set;

Edu.Module.Course/ClassModule.cs

@@ -7,6 +7,7 @@ using Edu.Model.ViewModel.Course;
 using Edu.Model.ViewModel.Reserve;
 using Edu.Model.ViewModel.User;
 using Edu.Repository.Course;
+using Edu.Repository.Finance;
 using Edu.Repository.Log;
 using Edu.Repository.Reserve;
 using Edu.Repository.User;
@@ -96,6 +97,10 @@ namespace Edu.Module.Course
         /// </summary>
         private readonly RB_Class_ConfigRepository class_ConfigRepository = new RB_Class_ConfigRepository();
 
+        /// <summary>
+        /// 教育月结轧账
+        /// </summary>
+        private readonly RB_RollingAccountRepository rollingAccountRepository = new RB_RollingAccountRepository();
 
         /// <summary>
         /// 课程基础配置
@@ -150,7 +155,7 @@ namespace Edu.Module.Course
         /// <returns></returns>
         public List<RB_Class_ViewModel> GetClassListModule(RB_Class_ViewModel query)
         {
-            var list= classRepository.GetClassListRepository(query);
+            var list = classRepository.GetClassListRepository(query);
             if (list != null && list.Count > 0)
             {
                 string classIds = string.Join(",", list.Select(qitem => qitem.ClassId));
@@ -182,7 +187,7 @@ namespace Edu.Module.Course
                     {
                         foreach (var sItem in tempPlanList)
                         {
-                            sItem.PlanTimeList=timeList?.Where(qitem => qitem.ClassId == item.ClassId && qitem.ClassPlanId == sItem.ClassPlanId)?.OrderBy(qitem => qitem.StartTime)?.ToList()??new List<RB_Class_Time_ViewModel> ();
+                            sItem.PlanTimeList = timeList?.Where(qitem => qitem.ClassId == item.ClassId && qitem.ClassPlanId == sItem.ClassPlanId)?.OrderBy(qitem => qitem.StartTime)?.ToList() ?? new List<RB_Class_Time_ViewModel>();
                         }
                     }
                     item.ClassPlanList = tempPlanList ?? new List<RB_Class_Plan_ViewModel>();
@@ -263,22 +268,25 @@ namespace Edu.Module.Course
                 var classOrderList = new List<RB_Order_ViewModel>();
                 var stepPriceList = new List<RB_Class_StepPrice_ViewModel>();
                 var otherCourseList = new List<RB_Class_Course_Extend>();
+                var planList = new List<RB_Class_Plan_ViewModel>();
                 string ids = string.Join(",", list.Select(qitem => qitem.ClassId));
                 if (!string.IsNullOrEmpty(ids))
                 {
                     classTimeList = class_TimeRepository.GetClassTimeListRepository(ids);
                     classOrderList = orderRepository.GetClassOrderPeopleNumRepository(ids);
                     otherCourseList = GetClassCourseListModule(new RB_Class_Course_Extend() { QClassIds = ids });
+                    planList=class_PlanRepository.GetClassPlanMaxDataRepository(new RB_Class_Plan_ViewModel()
+                    {
+                        QClassIds = ids
+                    });
                 }
                 if (isGetStepPrice)
                 {
                     stepPriceList = class_StepPriceRepository.GetClassStepPriceListRepository(new RB_Class_StepPrice_ViewModel() { QClassIds = ids })?.ToList() ?? new List<RB_Class_StepPrice_ViewModel>();
                 }
-
                 //课程计划上课日期
                 foreach (var item in list)
                 {
-                    item.FinishTimeStr = Common.ConvertHelper.FormatDate(item.EndClassDate);
                     item.NewPlanDateTime = classTimeList?.Where(qitem => qitem.ClassId == item.ClassId)?.FirstOrDefault()?.NewPlanDateTime;
                     item.OrderStudentCount = classOrderList?.Where(qitem => qitem.ClassId == item.ClassId)?.FirstOrDefault()?.GuestNum ?? 0;
                     if (isGetStepPrice)
@@ -286,6 +294,12 @@ namespace Edu.Module.Course
                         item.ClassStepPriceList = stepPriceList?.Where(qitem => qitem.ClassId == item.ClassId)?.ToList() ?? new List<RB_Class_StepPrice_ViewModel>();
                     }
                     item.OtherCourseList = otherCourseList?.Where(qitem => qitem.ClassId == item.ClassId)?.ToList() ?? new List<RB_Class_Course_Extend>();
+                    var tempData = planList.Where(qitem => qitem.ClassId == item.ClassId)?.FirstOrDefault();
+                    if (tempData != null)
+                    {
+                        item.EndClassDate = tempData.ClassDate;
+                    }
+                    item.FinishTimeStr = Common.ConvertHelper.FormatDate(item.EndClassDate);
                 }
             }
             return list;
@@ -1050,20 +1064,31 @@ namespace Edu.Module.Course
         /// <param name="ClassPlanId"></param>
         /// <param name="UserInfo">用户信息</param>
         /// <returns></returns>
-        public bool RemoveClassPlanModule(int ClassPlanId, UserInfo UserInfo)
+        [TransactionCallHandler]
+        public virtual bool RemoveClassPlanModule(int ClassPlanId, UserInfo UserInfo,out string message)
         {
+            bool flag = false;
+            message = "";
             var planModel = class_PlanRepository.GetEntity(ClassPlanId);
-            classLogRepository.AddClassLogRepository(new Model.Entity.Log.RB_Class_Log()
-            {
-                LogType = Common.Enum.Course.ClassLogTypeEnum.Class,
-                LogContent = "删除【" + Common.ConvertHelper.FormatDate(planModel?.ClassDate) + "】上课计划",
-                ClassId = planModel.ClassId,
-                CreateBy = UserInfo.Id,
-                Group_Id = UserInfo.Group_Id,
-                School_Id = UserInfo.School_Id,
-            });
-            UpdateClassEndDateModule(planModel.ClassId);
-            return class_PlanRepository.DeleteOne(new WhereHelper(nameof(RB_Class_Plan_ViewModel.ClassPlanId), ClassPlanId));
+            if (planModel != null)
+            {
+                classLogRepository.AddClassLogRepository(new Model.Entity.Log.RB_Class_Log()
+                {
+                    LogType = Common.Enum.Course.ClassLogTypeEnum.Class,
+                    LogContent = "删除【" + Common.ConvertHelper.FormatDate(planModel?.ClassDate) + "】上课计划",
+                    ClassId = planModel.ClassId,
+                    CreateBy = UserInfo.Id,
+                    Group_Id = UserInfo.Group_Id,
+                    School_Id = UserInfo.School_Id,
+                });
+                flag = UpdateClassEndDateModule(planModel.ClassId);
+                flag = class_PlanRepository.DeleteOne(new WhereHelper(nameof(RB_Class_Plan_ViewModel.ClassPlanId), ClassPlanId));
+            }
+            else
+            {
+                message = "此上课计划不存在,请刷新后再试!";
+            }
+            return flag;
         }
 
         /// <summary>
@@ -1873,7 +1898,7 @@ namespace Edu.Module.Course
                     {
                         LessonPlanId = ClassLessonPlanRepository.Insert(item);
                         flag = LessonPlanId > 0;
-                       
+
                     }
                     if (flag)
                     {
@@ -2259,6 +2284,15 @@ namespace Edu.Module.Course
             return classHours;
         }
 
+        /// <summary>
+        /// 班级签到完成学习分钟数以及课时
+        /// </summary>
+        /// <param name="classIds">班级编号</param>
+        /// <returns></returns>
+        public List<GuestFinishMinute_ViewModel> GetClassFinishMinutesRepository(string classIds)
+        {
+            return classCheckRepository.GetClassFinishMinutesRepository(classIds);
+        }
 
         /// <summary>
         /// 更新课堂随拍
@@ -3161,5 +3195,29 @@ namespace Edu.Module.Course
         }
         #endregion
 
+
+        #region 财务轧账
+        /// <summary>
+        /// 验证是否可以修改签到数据
+        /// </summary>
+        /// <param name="monthStr"></param>
+        /// <param name="schoolId"></param>
+        /// <param name="group_Id"></param>
+        /// <returns></returns>
+        public string ValidateClassCheckFinance(string monthStr, int schoolId, int group_Id)
+        {
+            var ralist = rollingAccountRepository.GetList(new Model.ViewModel.Finance.RB_RollingAccount_Extend() { GroupId = group_Id, Month = monthStr, State = 1 });
+            if (ralist.Any())
+            {
+                if (ralist.Where(x => x.SchoolIds == "-1" || ("," + x.SchoolIds + ",").Contains("," + schoolId + ",")).Any())
+                {
+                    return "该单据所在交易日期已关帐,无法修改签到数据";
+                }
+            }
+            return "";
+        }
+
+        #endregion
+
     }
 }

Edu.Module.Course/OrderModule.cs

@@ -496,11 +496,11 @@ namespace Edu.Module.Course
                     {
                         if (demodel.EffectTime < Convert.ToDateTime(Common.ConvertHelper.FormatDate(DateTime.Now)))
                         {
-                            demodel.EffectStatus = 0;
+                            demodel.EffectStatus = 1;
                         }
                         else
                         {
-                            demodel.EffectStatus = 1;
+                            demodel.EffectStatus = 0;
                         }
                     }
                     else

Edu.Module.Course/OrderModule2.cs

 using Edu.Model.CacheModel;
 using Edu.Model.ViewModel.Course;
 using Edu.Repository.Course;
-using Edu.Repository.Flow;
-using Edu.Repository.User;
 using System;
 using System.Collections.Generic;
-using System.Text;
 using System.Linq;
-using Edu.Model.Entity.Course;
 using VT.FW.DB;
 using Edu.Model.Entity.EduTask;
 using Edu.Repository.EduTask;
+using Edu.Common.Enum.User;
 
 namespace Edu.Module.Course
 {
@@ -112,7 +109,7 @@ namespace Edu.Module.Course
             var backClassModel = new RB_Student_BackClass_ViewModel()
             {
                 BackId = 0,
-                AuditStatus = Common.Enum.Course.BackClassAuditStatusEnum.InReview,
+                AuditStatus = WFRrocessStatus.NotAudit,
                 BackMoney = Math.Round(backMoney, 2),
                 BackNum = "T" + backNum,
                 ClassId = orderModel.ClassId,
@@ -148,7 +145,7 @@ namespace Edu.Module.Course
                     UpdateBy=userinfo.Id,
                     UpdateTime=DateTime.Now,
                     RecipientIds="",
-                    VerifyStatus= Common.Enum.Finance.WFRrocessStatus.NotAudit
+                    VerifyStatus= Common.Enum.User.WFRrocessStatus.NotAudit
                 }, out message);
                 if (flag)
                 {

Edu.Module.Course/SellCommissionModule.cs

@@ -354,6 +354,7 @@ namespace Edu.Module.Course
                     item.DeptName = dlist.Where(x => x.DeptId == item.Depart_Id).FirstOrDefault()?.DeptName ?? "";
                     item.SchoolName = slist.Where(x => x.SId == item.School_Id).FirstOrDefault()?.SName ?? "";
                     item.ClassName = clist.Where(x => x.ClassId == item.ClassId).FirstOrDefault()?.ClassName ?? "";
+                    item.ClassNo = clist.Where(x => x.ClassId == item.ClassId).FirstOrDefault()?.ClassNo ?? "";
                     item.ClassTypeName = ctlist.Where(x => x.CTypeId == item.ClassType).FirstOrDefault()?.CTypeName ?? "";
                 }
             }
@@ -391,6 +392,7 @@ namespace Edu.Module.Course
                     item.DeptName = dlist.Where(x => x.DeptId == item.Depart_Id).FirstOrDefault()?.DeptName ?? "";
                     item.SchoolName = slist.Where(x => x.SId == item.School_Id).FirstOrDefault()?.SName ?? "";
                     item.ClassName = clist.Where(x => x.ClassId == item.ClassId).FirstOrDefault()?.ClassName ?? "";
+                    item.ClassNo = clist.Where(x => x.ClassId == item.ClassId).FirstOrDefault()?.ClassNo ?? "";
                     item.ClassTypeName = ctlist.Where(x => x.CTypeId == item.ClassType).FirstOrDefault()?.CTypeName ?? "";
                 }
             }

Edu.Module.Course/StudentBillModule.cs

@@ -83,7 +83,6 @@ namespace Edu.Module.Course
         /// </summary>
         private readonly RB_Course_PreferentialRepository   course_PreferentialRepository = new RB_Course_PreferentialRepository();
 
-      
         /// <summary>
         /// 计算学员退课金额
         /// </summary>
@@ -119,70 +118,6 @@ namespace Edu.Module.Course
             return obj;
         }
 
-
-        /// <summary>
-        /// 获取退课单据信息
-        /// </summary>
-        /// <param name="backId"></param>
-        /// <returns></returns>
-        public object GetStuBackInfoModule(int backId)
-        {
-            var obj = new List<object>();
-            ////获取单据实体类
-            //var backModel = student_BackClassRepository.GetEntity(backId);
-            ////获取审核记录
-            //var aurList = student_BackRecordRepository.GetStudentBackRecordListRepository(new RB_Student_BackRecord_ViewModel()
-            //{
-            //    ConditionId = backId,
-            //});
-            ////审核关联列表
-            //var arList = student_BackRelevanceRepository.GetStudentBackRelevanceListRepository(new RB_Education_Relevance_ViewModel()
-            //{
-            //    ConditionId = backId
-            //});
-
-            //obj.Add(new
-            //{
-            //    NodeName = "制单人",
-            //    AduitStatus = 2,
-            //    AuditWayName = "",
-            //    AduitStatusName = "发起",
-            //    SubList = new List<object>()
-            //    {
-            //       new{
-            //             AduitName= UserReidsCache.GetUserLoginInfo(backModel.CreateBy)?.AccountName ?? "",
-            //             Description=backModel.ApplyReason,
-            //             CreateTime=Common.ConvertHelper.FormatTime(backModel.CreateTime),
-            //             AuditStatus=WFRrocessStatus.AuditThrough,
-            //             AuditStatusName = WFRrocessStatus.AuditThrough.ToName(),
-            //          }
-            //    }
-            //});
-
-            //var existsList = arList.Where(qitem => aurList.Any(oldItem => qitem.Id == oldItem.BackrelevanceId));
-            //foreach (var item in existsList)
-            //{
-            //    obj.Add(new
-            //    {
-            //        NodeName = item.AuditDescription,
-            //        AduitStatus = item.Stauts,
-            //        AduitStatusName = GetWFRrocessStatusStrModule(item.Stauts),
-            //        AuditWayName = item.AuditWay != WFTAuditWayEnum.Successively ? item.AuditWay.ToName() : "",
-            //        SubList = aurList.Where(qitem => qitem.AuditId == item.Id).Select(qitem => new
-            //        {
-            //            AduitName = UserReidsCache.GetUserLoginInfo(qitem.AuditEmId)?.AccountName ?? "",
-            //            Description = !string.IsNullOrEmpty(qitem.Description) ? qitem.Description : "无",
-            //            CreateTime = Common.ConvertHelper.FormatTime(qitem.UpdateTime),
-            //            qitem.AuditStatus,
-            //            AuditStatusName = GetWFRrocessStatusStrModule(qitem.AuditStatus),
-            //        })
-            //    });
-            //}
-            return obj;
-        }
-
-
-
         /// <summary>
         /// 退课一键制单
         /// </summary>
@@ -196,7 +131,7 @@ namespace Edu.Module.Course
         public string SetStudentBackFinance(int backClassId, int IsPublic, int CurrencyId, int clientType, int clientId, UserInfo userInfo)
         {
             var backModel = student_BackClassRepository.GetEntity(backClassId);
-            if (backModel == null || backModel.AuditStatus != BackClassAuditStatusEnum.Pass) { return "退课流程未审核通过"; }
+            if (backModel == null || backModel.AuditStatus != WFRrocessStatus.AuditThrough) { return "退课流程未审核通过"; }
             if (backModel.FinanceId > 0) { return "已制单，无法再次生成财务单据"; }
             var guestModel = order_GuestRepository.GetEntity(backModel.GuestId);
             if (guestModel == null || guestModel.GuestState != 2) { return "客人名单状态不正确"; }

Edu.Module.Course/TeachingRewardsModule.cs

@@ -103,6 +103,10 @@ namespace Edu.Module.Course
         /// 财务配置
         /// </summary>
         private readonly RB_Finance_ConfigRepository finance_ConfigRepository = new RB_Finance_ConfigRepository();
+        /// <summary>
+        /// 财务单据
+        /// </summary>
+        private readonly RB_FinanceRepository financeRepository = new RB_FinanceRepository();
 
 
         #region 教务配置
@@ -336,7 +340,8 @@ namespace Edu.Module.Course
                 //获取所有的教师
                 string teacherIds = string.Join(",", list.Select(x => x.TeacherIds));
                 var tlist = teacherRepository.GetTeacherListRepository(new RB_Teacher_ViewModel() { Group_Id = dmodel.Group_Id, QTIds = teacherIds });
-
+                //查询财务单据
+                var financeList = financeRepository.GetListSingle(new RB_Finance_Extend() { RB_Group_Id = dmodel.Group_Id, FinanceType = 2, OtherType = 26, ReFinanceIds = bonusIds, IsSelectNormal = 1 });
                 foreach (var item in list)
                 {
                     item.TeacherList = new List<RB_Teaching_BonusDetail_ViewModel>();
@@ -353,6 +358,12 @@ namespace Edu.Module.Course
                             TeacherName = teacherName,
                             Money = money
                         });
+                        //财务单据
+                        var flist = financeList.Where(x => x.ReFinanceId == item.Id).Select(x => x.FrID);
+                        if (flist.Any())
+                        {
+                            item.FinanceId = string.Join(",", flist);
+                        }
                     }
                 }
             }

Edu.Module.EduTask/ChangeClassPlanModule.cs

 using Edu.Model.Entity.EduTask;
 using Edu.Model.ViewModel.EduTask;
 using Edu.Repository.EduTask;
-using Edu.Repository.Flow;
-using System;
 using System.Collections.Generic;
-using System.Text;
 using VT.FW.AOP.CustomerAttribute;
 using VT.FW.DB;
 
@@ -38,6 +35,12 @@ namespace Edu.Module.EduTask
         }
 
 
+
+        public bool UpdateChangeClassPlan(int id) {
+
+            return change_ClassPlanRepository.UpdateChangeClassPlan(id);
+        }
+
         /// <summary>
         /// 新增修改调课计划
         /// </summary>
@@ -72,13 +75,14 @@ namespace Edu.Module.EduTask
                          Title="调课申请",
                          ReceiptType= Common.Enum.Finance.ReceiptTypeEnum.ChangeClass,
                          RelationId=newId,
+                         ClassId=extModel.ClassId,
                          Group_Id=extModel.Group_Id,
                          School_Id=extModel.School_Id,
                          CreateBy=extModel.CreateBy,
                          CreateTime=extModel.CreateTime,
                          UpdateBy=extModel.UpdateBy,
                          UpdateTime=extModel.UpdateTime,
-                         VerifyStatus= Common.Enum.Finance.WFRrocessStatus.NotAudit
+                         VerifyStatus= Common.Enum.User.WFRrocessStatus.NotAudit
                     };
                     flag= education_ReceiptRepository.SetEducationReceiptRepository(educationReceipt,out string message);
                 }

Edu.Module.Finance/FinanceModule.cs

@@ -2942,6 +2942,7 @@ namespace Edu.Module.Finance
                         }
                     }
                 }
+                dmodel.SchoolIds = string.Join(",", dmodel.SchoolList.Select(x => x.SId));
                 Dictionary<string, object> keyValues = new Dictionary<string, object>() {
                     { nameof(RB_RollingAccount_Extend.Month), dmodel.Month},
                     { nameof(RB_RollingAccount_Extend.SchoolIds), dmodel.SchoolIds},
@@ -2971,6 +2972,7 @@ namespace Edu.Module.Finance
                         }
                     }
                 }
+                dmodel.SchoolIds = string.Join(",", dmodel.SchoolList.Select(x => x.SId));
                 bool flag = rollingAccountRepository.Insert(dmodel) >0;
                 return flag ? "" : "出错了，请联系管理员";
             }

Edu.Module.System/HolidayModule.cs

@@ -100,5 +100,18 @@ namespace Edu.Module.System
             return holidayRepository.Update(fileds, new WhereHelper(nameof(HolidayId), HolidayId));
         }
 
+
+
+        /// <summary>
+        ///批量新增节假日
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool SetHoliday(List<RB_System_Holiday> list)
+        {
+            return holidayRepository.InsertBatch(list);
+        }
+
+
     }
 }

Edu.Module.User/AttendanceModule.cs

@@ -52,6 +52,20 @@ namespace Edu.Module.User
             return dictvalueRepository.GetList(new RB_Dictvalue_Extend() { RB_Group_id = group_Id, DictKey = key });
         }
 
+        /// <summary>
+        /// 更新公告审核人
+        /// </summary>
+        /// <param name="Content"></param>
+        /// <returns></returns>
+        public bool SetContent(string Content)
+        {
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+                {
+                    {nameof(RB_Dictvalue_Extend.Content),Content }
+                };
+            return dictvalueRepository.Update(fileds, new WhereHelper(nameof(RB_Dictvalue_Extend.DictKey), Edu.Common.Config.Notice_BaseKey));
+        }
+
         #endregion
 
         /// <summary>

Edu.Repository/Course/RB_ClassRepository.cs

@@ -234,6 +234,11 @@ WHERE 1=1
                     builder.AppendFormat(" AND A.{0} LIKE @ClassName ", nameof(RB_Class_ViewModel.ClassName));
                     parameters.Add("ClassName", "%" + query.ClassName.Trim() + "%");
                 }
+                if (!string.IsNullOrEmpty(query.ClassNo))
+                {
+                    builder.AppendFormat(" AND A.{0} LIKE @ClassNo ", nameof(RB_Class_ViewModel.ClassNo));
+                    parameters.Add("ClassNo", "%" + query.ClassNo.Trim() + "%");
+                }
                 if (!string.IsNullOrWhiteSpace(query.CourseName))
                 {
                     builder.AppendFormat(" AND B.{0} LIKE @CourseName ", nameof(RB_Course_ViewModel.CourseName));

Edu.Repository/Course/RB_Class_CheckRepository.cs

@@ -182,9 +182,9 @@ WHERE A.`Status`=0  ");
             }
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
-SELECT A.ClassId,SUM(A.FinishMinutes) AS FinishMinutes FROM
+SELECT A.ClassId,SUM(A.FinishMinutes) AS FinishMinutes,SUM(A.CurrentDeductionHours) AS FinishClassHours FROM
 (
-    SELECT A.ClassId,A.ClassDate,B.ClassPlanId,C.ClassTimeId
+    SELECT A.ClassId,A.ClassDate,B.ClassPlanId,C.ClassTimeId,a.CurrentDeductionHours
     ,TIMESTAMPDIFF(MINUTE,(DATE_FORMAT(CONCAT('2021-01-01 ',C.StartTime,':00'),'%Y-%m-%d %H:%i')),(DATE_FORMAT(CONCAT('2021-01-01 ',C.EndTime,':00'), '%Y-%m-%d %H:%i'))) AS FinishMinutes
     FROM rb_class_check AS A INNER JOIN rb_class_plan AS B ON A.ClassId=B.ClassId AND A.ClassDate=B.ClassDate AND B.`Status`=0
           INNER JOIN rb_class_time AS C ON B.ClassPlanId=C.ClassPlanId

Edu.Repository/Course/RB_Class_ConfigRepository.cs

@@ -60,8 +60,12 @@ WHERE 1=1
         /// <returns></returns>
         public int GetClassMinutesRepository(int classId)
         {
-            var BasicMinutes = classRepository.GetEntity(classId)?.ClassHourMinute ?? 45;
-            return BasicMinutes;
+            var classMinutes= classRepository.GetEntity(classId)?.ClassHourMinute ?? 0;
+            if (classMinutes <= 0)
+            {
+                classMinutes = 45;
+            }
+            return classMinutes;
         }
     }
 }

Edu.Repository/Course/RB_Class_PlanRepository.cs

@@ -410,7 +410,7 @@ LEFT JOIN rb_class as class on a.ClassId=class.ClassId
      LEFT JOIN rb_teacher AS T ON A.TeacherId=T.TId
 LEFT JOIN (SELECT ClassPlanId,COUNT(*) as LessonPlanNum from rb_class_lessonplan where `Status`=0  GROUP BY ClassPlanId)as lp on a.ClassPlanId=lp.ClassPlanId
  LEFT JOIN (SELECT ClassPlanId,COUNT(*) as LessonPlanSummaryNum from rb_class_lessonplan where `Status`=0  and  ISNULL(Summary)=0 and LENGTH(trim(Summary))>0  GROUP BY ClassPlanId)as lps on a.ClassPlanId=lps.ClassPlanId
-WHERE 1=1 and class.ClassStatus=2 and  t.`Status`=0 and  a.`Status`=0 ORDER BY a.ClassId,a.ClassDate) as a where 1=1 
+WHERE 1=1 and class.ClassStatus in(1,2) and  t.`Status`=0 and  a.`Status`=0 ORDER BY a.ClassId,a.ClassDate) as a where 1=1 
                         ");
             builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.Status), (int)DateStateEnum.Normal);
             if (query != null)
@@ -590,7 +590,7 @@ SELECT A.ClassPlanId, A.ClassId,A.ClassDate,A.ClassRoomId,B.ClassName,C.CourseNa
      ,TIMESTAMPDIFF(MINUTE, CONCAT('2020-12-16',' ',F.StartTime), CONCAT('2020-12-16',' ',F.EndTime)) AS minNum,F.StartTime,F.EndTime,B.CompleteProgress,plan.TotalPlanNum  
 FROM  rb_class_plan AS A INNER JOIN rb_class AS B ON A.ClassId=B.ClassId
       LEFT JOIN rb_course AS C ON B.CouseId=C.CourseId
-	  LEFT JOIN rb_teacher AS D ON B.Teacher_Id=D.TId
+	  LEFT JOIN rb_teacher AS D ON A.TeacherId=D.TId
 	  LEFT JOIN rb_class_room AS E ON A.ClassRoomId=E.RoomId
     LEFT JOIN rb_class_time F on A.ClassPlanId = F.ClassPlanId
 LEFT JOIN ((SELECT ClassId,COUNT(*) as TotalPlanNum from rb_class_plan where `Status`=0  GROUP BY ClassId)) as plan on plan.ClassId=a.ClassId

Edu.Repository/Course/RB_Class_RoomRepository.cs

@@ -68,7 +68,8 @@ WHERE 1=1
 SELECT A.* 
 FROM RB_Class_Room AS A
 WHERE 1=1 
-");
+"); 
+            builder.AppendFormat(" AND A.{0}<>{1} ", nameof(RB_Class_Room_ViewModel.Status), (int)(DateStateEnum.Delete));
             if (query != null)
             {
                 if (query.Group_Id > 0)

Edu.Repository/Course/RB_Education_ContractRepository.cs

@@ -170,7 +170,7 @@ namespace Edu.Repository.Course
         public List<RB_Education_Contract_ViewModel> GetContractPageListForFinance(int pageIndex, int pageSize, out long rowsCount, RB_Education_Contract_ViewModel demodel, string datebaseStr)
         {
             DynamicParameters parameters = new DynamicParameters();
-            string where = $@" 1=1";
+            string where = $@" 1=1 and o.OrderState <> 3";//排除取消订单
             where += $@" AND c.{nameof(RB_Education_Contract_ViewModel.Status)} <>4 ";//只查询已审核通过的
             if (demodel.Group_Id > 0)
             {

Edu.Repository/Course/RB_Sell_Commission_DetailsRepository.cs

@@ -35,6 +35,10 @@ namespace Edu.Repository.Course
             {
                 where += $@" and r.{nameof(RB_Sell_Commission_Details_ViewModel.UserId)} ={demodel.UserId}";
             }
+            if (!string.IsNullOrEmpty(demodel.UserIds))
+            {
+                where += $@" and r.{nameof(RB_Sell_Commission_Details_ViewModel.UserId)} in({demodel.UserIds})";
+            }
             if (demodel.ClassId > 0)
             {
                 where += $@" and r.{nameof(RB_Sell_Commission_Details_ViewModel.ClassId)} ={demodel.ClassId}";

Edu.Repository/Course/RB_Student_BackClassRepository.cs

-using Edu.Model.Entity.Course;
+using Edu.Common.Enum.Course;
+using Edu.Model.Entity.Course;
+using Edu.Model.Entity.EduTask;
 using Edu.Model.ViewModel.Course;
+using Edu.Model.ViewModel.EduTask;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using VT.FW.DB;
 using VT.FW.DB.Dapper;
 
 namespace Edu.Repository.Course
@@ -13,6 +17,16 @@ namespace Edu.Repository.Course
     /// </summary>
     public class RB_Student_BackClassRepository : BaseRepository<RB_Student_BackClass>
     {
+        /// <summary>
+        /// 订单学员仓储层对象
+        /// </summary>
+        private readonly RB_Order_GuestRepository order_GuestRepository = new RB_Order_GuestRepository();
+
+        /// <summary>
+        /// 订单仓储层对象
+        /// </summary>
+        private readonly RB_OrderRepository orderRepository = new RB_OrderRepository();
+
         /// <summary>
         /// 获取学员退课单据列表
         /// </summary>
@@ -62,5 +76,62 @@ WHERE 1=1  ");
             }
             return result + 1;
         }
+
+        /// <summary>
+        /// 更新退课相关信息
+        /// </summary>
+        /// <param name="receiptModel"></param>
+        /// <param name="auditModel"></param>
+        /// <returns></returns>
+        public bool UpdateStudentBackClassRepository(RB_Education_Receipt receiptModel, EduReceiptAudit auditModel)
+        {
+            var backModel = base.GetEntity(receiptModel.RelationId);
+            Dictionary<string, object> backFileds = new Dictionary<string, object>()
+            {
+               {nameof(RB_Student_BackClass_ViewModel.AuditStatus),auditModel.AuditStatus }
+            };
+            if (!string.IsNullOrEmpty(auditModel.RecipientIds))
+            {
+                backFileds.Add(nameof(RB_Student_BackClass_ViewModel.RecipientIds), auditModel.RecipientIds);
+            }
+            //特殊节点更新时间退课金额
+            if (auditModel.SpecialNode == 1)
+            {
+                backFileds.Add(nameof(RB_Student_BackClass_ViewModel.RealityBackMoney), auditModel.BackMoney);
+            }
+            bool flag = base.Update(backFileds, new WhereHelper(nameof(RB_Student_BackClass_ViewModel.BackId), backModel.BackId));
+            if (flag)
+            {
+                var guestList = order_GuestRepository.GetOrderGuestListRepository(new RB_Order_Guest_ViewModel() { OrderId = backModel.OrderId });
+                if (guestList != null && guestList.Where(qitem => qitem.GuestState == 2).Count() == guestList.Count())
+                {
+                    //更新订单为退学状态
+                    Dictionary<string, object> orderFileds = new Dictionary<string, object>()
+                    {
+                        {nameof(RB_Order.OrderState),OrderStateEnum.DropOut }
+                    };
+                    flag = orderRepository.Update(orderFileds, new WhereHelper(nameof(RB_Order.OrderId), backModel.OrderId));
+                }
+            }
+            if (flag)
+            {
+                int GuestState = 0;
+                if (auditModel.AuditStatus == 2)
+                {
+                    GuestState = 2;
+                }
+                if (auditModel.AuditStatus == 3)
+                {
+                    GuestState = 4;
+                }
+                ///更新学员退课状态
+                Dictionary<string, object> guestFileds = new Dictionary<string, object>()
+                {
+                    {nameof(RB_Order_Guest_ViewModel.GuestState),GuestState }
+                };
+                flag = order_GuestRepository.Update(guestFileds, new WhereHelper(nameof(RB_Order_Guest_ViewModel.Id), backModel.GuestId));
+            }
+            return flag;
+        }
     }
 }
\ No newline at end of file

Edu.Repository/Course/RB_Student_MakeupRepository.cs

@@ -114,9 +114,11 @@ WHERE 1=1
         /// <returns></returns>
         public int CheckStudentMakeUpExistsRepository(RB_Student_Makeup model)
         {
-            List<WhereHelper> whereHelpers = new List<WhereHelper>();
-            whereHelpers.Add(new WhereHelper(nameof(RB_Student_Makeup.ClassCheckId), model.ClassCheckId));
-            whereHelpers.Add(new WhereHelper(nameof(RB_Student_Makeup.OrderGuestId), model.OrderGuestId));
+            List<WhereHelper> whereHelpers = new List<WhereHelper>
+            {
+                new WhereHelper(nameof(RB_Student_Makeup.ClassCheckId), model.ClassCheckId),
+                new WhereHelper(nameof(RB_Student_Makeup.OrderGuestId), model.OrderGuestId)
+            };
             return base.Exists("Id", whereHelpers);
         }
     }

Edu.Repository/Course/RB_Teaching_BonusDetailRepository.cs

@@ -154,7 +154,7 @@ where {where} order by bd.Date asc";
                 where += $@" and b.{nameof(RB_Teaching_BonusDetail.Type)} ={demodel.Type}";
             }
 
-            string sql = $@" select b.*,t.TeacherName,c.ClassName from RB_Teaching_BonusDetail b
+            string sql = $@" select b.*,t.TeacherName,c.ClassName,c.ClassNo from RB_Teaching_BonusDetail b
 left join rb_teacher t on b.TeacherId = t.TId
 left join rb_class c on b.ClassId = c.ClassId
 where {where} order by b.TeacherId asc,b.Date asc";

Edu.Repository/Duty/RB_VisitorRepository.cs

@@ -56,7 +56,7 @@ WHERE 1=1
                 }
                 if(!string.IsNullOrEmpty(query.QReserveClassIds))
                 {
-                    builder.AppendFormat(@" AND A.Id IN(SELECT Visitor_Id FROM rb_visitor_reserve WHERE ReserveClassId IN({1}) )",query.QReserveClassIds);
+                    builder.AppendFormat(@" AND A.Id IN(SELECT Visitor_Id FROM rb_visitor_reserve WHERE ReserveClassId IN({0}) )",query.QReserveClassIds);
                 }
             }
             return GetPage<RB_Visitor_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();

Edu.Repository/EduTask/RB_Education_RecordRepository.cs

@@ -21,19 +21,23 @@ namespace Edu.Repository.EduTask
         {
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
-SELECT * 
-FROM RB_Education_Record
+SELECT A.*,IFNULL(B.AuditDescription,'') AS AuditNode
+FROM RB_Education_Record AS A LEFT JOIN rb_education_relevance AS B ON A.AuditId=B.Id
 WHERE 1=1
 ");
             if (query != null)
             {
                 if (query.ConditionId > 0)
                 {
-                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Education_Record_ViewModel.ConditionId), query.ConditionId);
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Education_Record_ViewModel.ConditionId), query.ConditionId);
+                }
+                if (!string.IsNullOrEmpty(query.QConditionIds))
+                {
+                    builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Education_Record_ViewModel.ConditionId), query.QConditionIds);
                 }
                 if (query.AuditStatus > 0)
                 {
-                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Education_Record_ViewModel.AuditStatus), query.AuditStatus);
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Education_Record_ViewModel.AuditStatus), query.AuditStatus);
                 }
             }
             return Get<RB_Education_Record_ViewModel>(builder.ToString()).ToList();

Edu.Repository/EduTask/RB_Education_RelevanceRepository.cs

@@ -19,7 +19,7 @@ namespace Edu.Repository.EduTask
         /// </summary>
         /// <param name="query"></param>
         /// <returns></returns>
-        public List<RB_Education_Relevance_ViewModel> GetStudentBackRelevanceListRepository(RB_Education_Relevance_ViewModel query)
+        public List<RB_Education_Relevance_ViewModel> GetEducationRelevanceListRepository(RB_Education_Relevance_ViewModel query)
         {
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
@@ -33,6 +33,14 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND {0}={1} ", nameof(RB_Education_Relevance_ViewModel.ConditionId), query.ConditionId);
                 }
+                if (query.Id > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Education_Relevance_ViewModel.Id), query.Id);
+                }
+                if (!string.IsNullOrEmpty(query.QConditionIds))
+                {
+                    builder.AppendFormat(" AND {0} IN({1}) ", nameof(RB_Education_Relevance_ViewModel.ConditionId), query.QConditionIds);
+                }
             }
             builder.AppendFormat(" ORDER BY Sort ASC ");
             return Get<RB_Education_Relevance_ViewModel>(builder.ToString()).ToList();

Edu.Repository/User/RB_AccountRepository.cs

@@ -115,6 +115,10 @@ WHERE 1=1
                 {
                     where.AppendFormat(" AND B.{0}={1} ", nameof(RB_Account_ViewModel.Post_Id), query.Post_Id);
                 }
+                if (!string.IsNullOrEmpty(query.QPostIds))
+                {
+                    where.AppendFormat(" AND B.{0} IN({1}) ", nameof(RB_Account_ViewModel.Post_Id), query.QPostIds);
+                }
                 if (query.Dept_Id > 0)
                 {
                     where.AppendFormat(" AND B.{0}={1} ", nameof(RB_Account_ViewModel.Dept_Id), query.Dept_Id);

Edu.Repository/User/Rb_Workflow_CopyToPeopleRepository.cs

@@ -61,15 +61,15 @@ namespace Edu.Repository.User
                 }
                 if (appAuditStatus == AppAuditStatusEnum.AuditComplete)
                 {
-                    sb.Append($" AND (`Status`={(int)WFAuditStatus.Through} Or `Status`={(int)WFAuditStatus.NotThrough})");
+                    sb.Append($" AND (`Status`={(int)UserWFAuditStatus.Through} Or `Status`={(int)UserWFAuditStatus.NotThrough})");
                 }
                 else if (appAuditStatus == AppAuditStatusEnum.InComplete)
                 {
-                    sb.Append($" AND `Status`={(int)WFAuditStatus.InReview}");
+                    sb.Append($" AND `Status`={(int)UserWFAuditStatus.InReview}");
                 }
                 else if (appAuditStatus == AppAuditStatusEnum.ToWithdraw)
                 {
-                    sb.Append($" AND `Status`={(int)WFAuditStatus.ToWithdraw}");
+                    sb.Append($" AND `Status`={(int)UserWFAuditStatus.ToWithdraw}");
                 }
             }
             sb.Append($" ORDER BY AuditCreateTime DESC");