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>

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/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/ViewModel/Course/RB_Sell_Commission_Details_ViewModel.cs

@@ -27,6 +27,11 @@ namespace Edu.Model.ViewModel.Course
         /// </summary>
         public string ClassName { get; set; }
 
+        /// <summary>
+        /// 班号
+        /// </summary>
+        public string ClassNo { get; set; }
+
         /// <summary>
         /// 班级类型
         /// </summary>

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.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/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 = 39, 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;
 

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.Repository/Course/RB_ClassRepository.cs

@@ -234,6 +234,10 @@ 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} ='{1}' ", nameof(RB_Class_ViewModel.ClassNo), query.ClassNo);
+                }
                 if (!string.IsNullOrWhiteSpace(query.CourseName))
                 {
                     builder.AppendFormat(" AND B.{0} LIKE @CourseName ", nameof(RB_Course_ViewModel.CourseName));

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/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/Course/ClassController.cs

@@ -47,6 +47,7 @@ namespace Edu.WebApi.Controllers.Course
                 School_Id = base.ParmJObj.GetInt("School_Id"),
                 TeacherName = base.ParmJObj.GetStringValue("TeacherName"),
                 CourseName = base.ParmJObj.GetStringValue("CourseName"),
+                ClassNo = base.ParmJObj.GetStringValue("ClassNo")
             };
             query.Group_Id = base.UserInfo.Group_Id;
             List<object> result = new List<object>();

Edu.WebApi/Controllers/Course/SellCommissionController.cs

@@ -213,6 +213,7 @@ namespace Edu.WebApi.Controllers.Course
                 x.UserName,
                 x.ClassId,
                 x.ClassName,
+                x.ClassNo,
                 x.ClassType,
                 x.ClassTypeName,
                 x.OrderId,
@@ -262,6 +263,7 @@ namespace Edu.WebApi.Controllers.Course
                 x.UserName,
                 x.ClassId,
                 x.ClassName,
+                x.ClassNo,
                 x.ClassType,
                 x.ClassTypeName,
                 x.OrderId,
@@ -312,6 +314,7 @@ namespace Edu.WebApi.Controllers.Course
                     x.UserName,
                     x.ClassId,
                     x.ClassName,
+                    x.ClassNo,
                     x.ClassType,
                     x.ClassTypeName,
                     x.OrderId,
@@ -342,6 +345,7 @@ namespace Edu.WebApi.Controllers.Course
         /// </summary>
         /// <returns></returns>
         [HttpPost]
+        [Obsolete]
         public FileContentResult GetSellCommissionStatisticsToExcel() {
             var userInfo = base.UserInfo;
             var dmodel = JsonHelper.DeserializeObject<RB_Sell_Commission_Details_ViewModel>(RequestParm.Msg.ToString());
@@ -354,6 +358,7 @@ namespace Edu.WebApi.Controllers.Course
                     new ExcelColumn(value: "校区") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
                     new ExcelColumn(value: "部门") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
                     new ExcelColumn(value: "销售") { CellWidth = 25, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
+                    new ExcelColumn(value: "班号") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
                     new ExcelColumn(value: "班级") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
                     new ExcelColumn(value: "班级类型") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
                     new ExcelColumn(value: "学生数量") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
@@ -390,6 +395,7 @@ namespace Edu.WebApi.Controllers.Course
                             new ExcelColumn(value: item.SchoolName){ },
                             new ExcelColumn(value: item.DeptName){ },
                             new ExcelColumn(value: item.UserName){ },
+                            new ExcelColumn(value: item.ClassNo){ },
                             new ExcelColumn(value: item.ClassName + (item.IsContinueClass == 1 ? " 续班" : "")){ },
                             new ExcelColumn(value: item.ClassTypeName){ },
                             new ExcelColumn(value: item.StudentCount.ToString()){ },
@@ -438,6 +444,7 @@ namespace Edu.WebApi.Controllers.Course
                             new ExcelColumn(value: ""){ },
                             new ExcelColumn(value: ""){ },
                             new ExcelColumn(value: ""){ },
+                            new ExcelColumn(value: ""){ },
                             new ExcelColumn(value: TotalMoney.ToString("#0.00")){ },
                             new ExcelColumn(value: ""){ },
                             new ExcelColumn(value: ""){ },

Edu.WebApi/Controllers/Course/TeachingRewardsController.cs

@@ -266,6 +266,7 @@ namespace Edu.WebApi.Controllers.Course
                     x.TeacherName,
                     x.ClassId,
                     x.ClassName,
+                    x.ClassNo,
                     x.Type,
                     x.CourseHour,
                     x.DeductionHour,
@@ -308,6 +309,7 @@ namespace Edu.WebApi.Controllers.Course
                 ExcelRows = new List<ExcelColumn>(30) {
                     new ExcelColumn(value: "日期") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
                     new ExcelColumn(value: "老师") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
+                    new ExcelColumn(value: "班号") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
                     new ExcelColumn(value: "班级") { CellWidth = 25, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
                     new ExcelColumn(value: "类型") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
                     new ExcelColumn(value: "基础课时") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
@@ -331,6 +333,7 @@ namespace Edu.WebApi.Controllers.Course
                         ExcelRows = new List<ExcelColumn>(30) {
                             new ExcelColumn(value: item.Date.ToString("yyyyMMdd")){ },
                             new ExcelColumn(value: item.TeacherName){ },
+                            new ExcelColumn(value: item.ClassNo){ },
                             new ExcelColumn(value: item.ClassName){ },
                             new ExcelColumn(value: item.Type==1?"带班":"代课"){ },
                             new ExcelColumn(value: item.DeductionHour.ToString()){ },
@@ -355,6 +358,7 @@ namespace Edu.WebApi.Controllers.Course
                             new ExcelColumn(value: ""){ },
                             new ExcelColumn(value: ""){ },
                             new ExcelColumn(value: ""){ },
+                            new ExcelColumn(value: ""){ },
                         }
                 };
                 slist.Add(datarows);
@@ -370,6 +374,7 @@ namespace Edu.WebApi.Controllers.Course
                             new ExcelColumn(value: ""){ },
                             new ExcelColumn(value: ""){ },
                             new ExcelColumn(value: ""){ },
+                            new ExcelColumn(value: ""){ },
                         }
                 };
                 slist.Add(datarows);
@@ -387,6 +392,7 @@ namespace Edu.WebApi.Controllers.Course
                             new ExcelColumn(value: ""){ },
                             new ExcelColumn(value: ""){ },
                             new ExcelColumn(value: ""){ },
+                            new ExcelColumn(value: ""){ },
                         }
                     };
                     slist.Add(datarows);

Edu.WebApi/Controllers/Public/FlowController.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Edu.Common.API;
+using Edu.Common.Enum.User;
 using Edu.Common.Plugin;
 using Edu.Model.ViewModel.Flow;
 using Edu.Module.System;
@@ -10,6 +11,7 @@ using Edu.WebApi.Filter;
 using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json.Linq;
 
 namespace Edu.WebApi.Controllers.Public
 {
@@ -58,6 +60,38 @@ namespace Edu.WebApi.Controllers.Public
                 UpdateBy = base.UserInfo.Id,
                 UpdateTime = DateTime.Now,
             };
+            extModel.FlowNodeList = new List<RB_Flow_Node_ViewModel>();
+            JArray jArray = JArray.Parse(base.ParmJObj.GetStringValue("FlowNodeList"));
+            foreach (var jItem in jArray)
+            {
+                JObject jObj = JObject.Parse(jItem.ToString());
+                RB_Flow_Node_ViewModel model = new RB_Flow_Node_ViewModel()
+                {
+                    FlowId=jObj.GetInt("FlowId"),
+                    NodeId=jObj.GetInt("NodeId"),
+                    NodeName=jObj.GetStringValue("NodeName"),
+                    SortNum=jObj.GetInt("SortNum"),
+                };
+                model.FlowAduitList = new List<RB_Flow_AduitInfo_ViewModel>();
+                //审核人数组
+                JArray subArray= JArray.Parse(jObj.GetStringValue("FlowAduitList"));
+                foreach (var sItem in subArray)
+                {
+                    JObject sObj = JObject.Parse(sItem.ToString());
+                    model.FlowAduitList.Add(new RB_Flow_AduitInfo_ViewModel()
+                    {
+                        CheckId = sObj.GetInt("CheckId"),
+                        NodeId=sObj.GetInt("NodeId"),
+                        FlowId=sObj.GetInt("FlowId"),
+                        AduitName=sObj.GetStringValue("AduitName"),
+                        AuditType=(WFTAuditTypeEnum)sObj.GetInt("AuditType"),
+                        UserId=sObj.GetInt("UserId"),
+                        IsSpecNode=sObj.GetInt("IsSpecNode"),
+                        PostType=sObj.GetInt("PostType"),
+                        AuditWay=(WFTAuditWayEnum)sObj.GetInt("AuditWay"),
+                    });
+                }
+            }
             if (!string.IsNullOrEmpty(base.ParmJObj.GetStringValue("FlowNodeList")))
             {
                 try

Edu.WebApi/Controllers/Public/HolidayController.cs

@@ -161,11 +161,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
             {

Edu.WebApi/appsettings.json

@@ -36,6 +36,7 @@
   "sTenpayNotifyUrl": "http://eduapi.oytour.com/api/WeChatPay/WxPayCallback", //下单回调地址
   "sTenpayNotifyRefundUrl": "http://eduapi.oytour.com/api/WeChatPay/Refunds", //退款回调地址
   "FinanceDateBase": "reborn_finance",
+  "EduDateBase": "uat_reborn_edu",
   "JHTenantId": "15",
   "JHMallBaseId": "5",
   "RabbitMqConfig": {
@@ -77,5 +78,7 @@
   //连续缺课课时
   "AbsentHours": 12,
   //值班时间验证日期
-  "DutyDate": "2021-06-30"
+  "DutyDate": "2021-06-30",
+  //调课流程编号
+  "ChangeClassFlowId": 2
 }
\ No newline at end of file

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