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

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/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.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;
 

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(@"

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.WebApi/Controllers/Public/HolidayController.cs

@@ -160,11 +160,9 @@ namespace Edu.WebApi.Controllers.Public
             }
             catch (Exception ex)
             {
-
+                Common.Plugin.LogHelper.Write(ex, "GetHolidayList");
             }
-
             List<RB_System_Holiday> list = holidayModule.GetPageList(pmodel.PageIndex, pmodel.PageSize, dmodel, out long count);
-
             pmodel.Count = Convert.ToInt32(count.ToString());
             pmodel.PageData = list.Select(x => new
             {

education.sln

@@ -64,7 +64,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Edu.Module.Duty", "Edu.Modu
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Edu.Module.Advertising", "Edu.Module.Advertising\Edu.Module.Advertising.csproj", "{43408243-8E36-4F9E-84C0-998CE383EC53}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Edu.Module.EduTask", "Edu.Module.EduTask\Edu.Module.EduTask.csproj", "{FEDB8D19-2C7E-4393-8D91-332256EC89CC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Edu.Module.EduTask", "Edu.Module.EduTask\Edu.Module.EduTask.csproj", "{FEDB8D19-2C7E-4393-8D91-332256EC89CC}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution