新增配置

Edu.Common/Config.cs

@@ -498,6 +498,18 @@ namespace Edu.Common
             }
         }
 
+        /// <summary>
+        /// 教师考核审批流程Id
+        /// </summary>
+        public static int TeacherAssessmentFlowId
+        {
+            get
+            {
+                int.TryParse(ReadConfigKey("TeacherAssessmentFlowId"), out int TeacherAssessmentFlowId);
+                return TeacherAssessmentFlowId;
+            }
+        }
+
 
         /// <summary>
         /// okr关注事项配置

Edu.Common/Enum/Finance/ReceiptTypeEnum.cs

@@ -68,6 +68,12 @@ namespace Edu.Common.Enum.Finance
         /// 投稿审批
         /// </summary>
         [EnumField("VIP课程申请")]
-        VipCourse = 11
+        VipCourse = 11,
+
+        /// <summary>
+        /// 教师考核审批
+        /// </summary>
+        [EnumField("教师考核审批")]
+        TeacherAssessment =12,
     }
 }

Edu.Module.User/TeacherAssessmentModule.cs

@@ -2,9 +2,11 @@
 using Edu.Common.Enum;
 using Edu.Common.Enum.User;
 using Edu.Model.CacheModel;
+using Edu.Model.Entity.EduTask;
 using Edu.Model.ViewModel.DataStatistics;
 using Edu.Model.ViewModel.User;
 using Edu.Repository.DataStatistics;
+using Edu.Repository.EduTask;
 using Edu.Repository.User;
 using System;
 using System.Collections.Generic;
@@ -48,7 +50,12 @@ namespace Edu.Module.User
         /// </summary>
         private readonly Rb_dictvalueRepository dictvalueRepository = new Rb_dictvalueRepository();
 
-        
+        /// <summary>
+        /// 业务单据仓储层对象
+        /// </summary>
+        private readonly RB_Education_ReceiptRepository education_ReceiptRepository = new RB_Education_ReceiptRepository();
+
+
 
         #region 基础配置
 
@@ -556,6 +563,34 @@ namespace Edu.Module.User
             return flag;
 
         }
+
+        /// <summary>
+        /// 提交审批
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        public bool SubmitTeacherAssessmentApprovalModule(int Id, out string message)
+        {
+            var model = teacher_AssessmentRepository.GetEntity<RB_Teacher_Assessment_Extend>(Id);
+            var educationReceipt = new RB_Education_Receipt()
+            {
+                Id = 0,
+                Title = "教师考核审批",
+                ReceiptType = Common.Enum.Finance.ReceiptTypeEnum.TeacherAssessment,
+                RelationId = Id,
+                ClassId = 0,
+                Group_Id = model.Group_Id,
+                School_Id = model.School_Id,
+                CreateBy = model.CreateBy,
+                CreateTime = model.CreateTime,
+                UpdateBy = model.CreateBy,
+                UpdateTime = DateTime.Now,
+                VerifyStatus = Common.Enum.EduTask.EduTaskRrocessStatus.NotAudit,
+                ReceiptFile = ""
+            };
+            bool flag = education_ReceiptRepository.SetEducationReceiptRepository(educationReceipt, out message);
+            return flag;
+        }
         #endregion
     }
 }
\ No newline at end of file

Edu.Module.User/TeacherStaticModule.cs

@@ -2764,6 +2764,7 @@ namespace Edu.Module.User
         public bool CreateTeacherStaticModule(UserInfo user, string StartTime, string EndTime, bool isInit = true)
         {
             bool flag = true;
+
             //5,10,15,20
             var teacherList = accountRepository.GetEmployeeListRepository(new Employee_ViewModel()
             {
@@ -2785,13 +2786,13 @@ namespace Edu.Module.User
             int Days = (endTime - date).Days;
             for (int i = 0; i < Days; i++)
             {
-                
+       
                 var newDate = date.AddDays(i);
+                Common.Plugin.LogHelper.Write("开始:"+Common.ConvertHelper.FormatDate(newDate));
                 //获取老师迟到早退信息
                 checkList = Edu.ThirdCore.QYWinXin.QYWeiXinHelper.GetWeChatCheckList(workUserIds, newDate);
                 //获取老师与学员沟通次数
                 messageList = Edu.ThirdCore.QYWinXin.QYWeiXinHelper.GetWechatStudentStatic(workUserIds, newDate);
-                Thread.Sleep(1 * 2000);
                 int times = 1;
                 int newDay = newDate.Day;
                 //本月最后一天
@@ -3459,6 +3460,7 @@ namespace Edu.Module.User
                     thirdTimeStaticModel.CreateTime = DateTime.Now;
                     teacher_StaticRepository.Insert(thirdTimeStaticModel);
                 }
+                Common.Plugin.LogHelper.Write("结束:" + Common.ConvertHelper.FormatDate(newDate));
             }
             return flag;
         }

Edu.Repository/EduTask/RB_Education_ReceiptRepository.cs

@@ -408,6 +408,15 @@ WHERE 1=1
                     return false;
                 }
             }
+            else if (model.ReceiptType == Common.Enum.Finance.ReceiptTypeEnum.TeacherAssessment)
+            {
+                flowModel = flowRepository.GetFlowRepository(Common.Config.TeacherAssessmentFlowId);
+                if (flowModel == null)
+                {
+                    message = "未配置教师考核审核流程!";
+                    return false;
+                }
+            }
             if (flowModel?.FlowNodeList?.Count == 0)
             {
                 message = "未配置审核流程!";

Edu.WebApi/Controllers/DataService/TeacherAssessmentController.cs

@@ -193,7 +193,7 @@ namespace Edu.WebApi.Controllers.DataService
                     item.Help,
                     item.Suggest,
                     item.Other,
-                    TeacherSignDate= Common.ConvertHelper.FormatTime(item.TeacherSignDate)
+                    TeacherSignDate = Common.ConvertHelper.FormatTime(item.TeacherSignDate)
                 });
             }
             pageModel.Count = rowsCount;
@@ -348,6 +348,21 @@ namespace Edu.WebApi.Controllers.DataService
             bool flag = teacherAssessmentModule.TeacherSetHelpModule(model);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
+
+        /// <summary>
+        /// 提交审批
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SubmitTeacherAssessmentApproval()
+        {
+            var model = new RB_Teacher_Assessment_Extend()
+            {
+                Id = base.ParmJObj.GetInt("Id"),
+            };
+            bool flag = teacherAssessmentModule.SubmitTeacherAssessmentApprovalModule(model.Id,out string message);
+            return flag ? ApiResult.Success() : ApiResult.Failed(message: message);
+        }
         #endregion
     }
 }

Edu.WebApi/appsettings.json

@@ -120,5 +120,7 @@
   //Vip课程申请流程编号
   "VipCourseFlowId": 11,
   //甲鹤收款手续费
-  "IncomeFeeRate": "0.0025,0.0054,0.006,0.04,0.004"
+  "IncomeFeeRate": "0.0025,0.0054,0.006,0.04,0.004",
+  //教师考核审批流程编号
+  "TeacherAssessmentFlowId":12
 }
\ No newline at end of file