新增查询条件

Edu.Model/ViewModel/DataStatistics/RB_Teacher_Assessment_Extend.cs

@@ -10,6 +10,11 @@ namespace Edu.Model.ViewModel.DataStatistics
     /// </summary>
     public class RB_Teacher_Assessment_Extend : RB_Teacher_Assessment
     {
+        /// <summary>
+        /// 考核编号【查询使用】
+        /// </summary>
+        public string QIds { get; set; }
+
         /// <summary>
         /// 教师月度考核详情列表
         /// </summary>

Edu.Module.EduTask/EducationReceiptModule.cs

@@ -9,6 +9,7 @@ using Edu.Model.Entity.EduTask;
 using Edu.Model.ViewModel.BackClass;
 using Edu.Model.ViewModel.Contract;
 using Edu.Model.ViewModel.Course;
+using Edu.Model.ViewModel.DataStatistics;
 using Edu.Model.ViewModel.EduTask;
 using Edu.Model.ViewModel.Exam;
 using Edu.Model.ViewModel.Grade;
@@ -18,6 +19,7 @@ using Edu.Model.ViewModel.WeChat;
 using Edu.Repository.BackClass;
 using Edu.Repository.Contract;
 using Edu.Repository.Course;
+using Edu.Repository.DataStatistics;
 using Edu.Repository.EduTask;
 using Edu.Repository.Exam;
 using Edu.Repository.Grade;
@@ -147,6 +149,11 @@ namespace Edu.Module.EduTask
         /// </summary>
         private readonly RB_Course_VipRepository course_VipRepository = new RB_Course_VipRepository();
 
+        /// <summary>
+        /// 教师月度考核仓储层对象
+        /// </summary>
+        private readonly RB_Teacher_AssessmentRepository teacher_AssessmentRepository = new RB_Teacher_AssessmentRepository();
+
 
         /// <summary>
         /// 获取教务单据分页列表
@@ -206,6 +213,8 @@ namespace Edu.Module.EduTask
                 
                 //vip课程申请
                 List<RB_Course_Vip_Extend> vipCourseApplyList = new List<RB_Course_Vip_Extend>();
+                //教师考核申请列表
+                List<RB_Teacher_Assessment_Extend> teacherAssessmentList = new List<RB_Teacher_Assessment_Extend>();
 
                 var groupList = list.GroupBy(qitem => new { qitem.ReceiptType }).Select(qitem => new { qitem.Key.ReceiptType });
                 string Ids = string.Join(",", list.Select(qitem => qitem.Id));
@@ -559,6 +568,17 @@ namespace Edu.Module.EduTask
                         });
                     }
                     #endregion
+
+                    #region 教师考核申请审批
+                    if (subItem.ReceiptType == Common.Enum.Finance.ReceiptTypeEnum.TeacherAssessment)
+                    {
+                        string assessmentIds = string.Join(",", list.Where(qitem => qitem.ReceiptType == subItem.ReceiptType).Select(qitem => qitem.RelationId));
+                        teacherAssessmentList = teacher_AssessmentRepository.GetTeacherAssessmentListRepository(new RB_Teacher_Assessment_Extend()
+                        {
+                            QIds = assessmentIds
+                        });
+                    }
+                    #endregion
                 }
 
                 foreach (var item in list)
@@ -695,12 +715,18 @@ namespace Edu.Module.EduTask
                         }
                         DataObj = touGao;
                     }
-
+                    //VIP课程申请
                     if (item.ReceiptType == Common.Enum.Finance.ReceiptTypeEnum.VipCourse)
                     {
                         var vipCourse = vipCourseApplyList?.Where(x => x.Id == item.RelationId)?.FirstOrDefault();
                         DataObj = vipCourse;
                     }
+                    //教师考核
+                    if (item.ReceiptType == Common.Enum.Finance.ReceiptTypeEnum.TeacherAssessment)
+                    {
+                        var assessObj = teacherAssessmentList?.Where(qitem => qitem.Id == item.RelationId)?.FirstOrDefault();
+                        DataObj = assessObj;
+                    }
                     object AuditObj = new object();
                     if (item.VerifyStatus == EduTaskRrocessStatus.NotAudit || item.VerifyStatus == EduTaskRrocessStatus.AuditIng)
                     {

Edu.Module.User/TeacherAssessmentModule.cs

@@ -569,7 +569,7 @@ namespace Edu.Module.User
         /// </summary>
         /// <param name="Id"></param>
         /// <returns></returns>
-        public bool SubmitTeacherAssessmentApprovalModule(int Id, out string message)
+        public bool SubmitTeacherAssessmentApprovalModule(UserInfo user,int Id, out string message)
         {
             var model = teacher_AssessmentRepository.GetEntity<RB_Teacher_Assessment_Extend>(Id);
             var educationReceipt = new RB_Education_Receipt()
@@ -579,11 +579,11 @@ namespace Edu.Module.User
                 ReceiptType = Common.Enum.Finance.ReceiptTypeEnum.TeacherAssessment,
                 RelationId = Id,
                 ClassId = 0,
-                Group_Id = model.Group_Id,
+                Group_Id = user.Group_Id,
                 School_Id = model.School_Id,
-                CreateBy = model.CreateBy,
-                CreateTime = model.CreateTime,
-                UpdateBy = model.CreateBy,
+                CreateBy = user.Id,
+                CreateTime = DateTime.Now,
+                UpdateBy = user.Id,
                 UpdateTime = DateTime.Now,
                 VerifyStatus = Common.Enum.EduTask.EduTaskRrocessStatus.NotAudit,
                 ReceiptFile = ""

Edu.Repository/DataStatistics/RB_Teacher_AssessmentRepository.cs

@@ -56,12 +56,13 @@ WHERE 1=1
         /// </summary>
         /// <param name="query"></param>
         /// <returns></returns>
-        public List<RB_Teacher_Assessment_Extend> GetTeacherAssessmentListRepository(  RB_Teacher_Assessment_Extend query)
+        public List<RB_Teacher_Assessment_Extend> GetTeacherAssessmentListRepository(RB_Teacher_Assessment_Extend query)
         {
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
-SELECT A.* 
-FROM RB_Teacher_Assessment AS A
+SELECT A.*,IFNULL(C.TeacherName,'') AS TeacherName
+FROM RB_Teacher_Assessment AS A LEFT JOIN rb_account AS B ON A.TeacherAccountId=B.Id
+     LEFT JOIN rb_teacher AS C ON B.AccountId=C.TId
 WHERE 1=1
 ");
             if (query != null)
@@ -82,6 +83,10 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Teacher_Assessment_Extend.TeacherAccountId), query.TeacherAccountId);
                 }
+                if (!string.IsNullOrEmpty(query.QIds))
+                {
+                    builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Teacher_Assessment_Extend.Id), query.QIds);
+                }
             }
             return Get<RB_Teacher_Assessment_Extend>(builder.ToString()).ToList();
         }

Edu.WebApi/Controllers/DataService/TeacherAssessmentController.cs

@@ -360,7 +360,8 @@ namespace Edu.WebApi.Controllers.DataService
             {
                 Id = base.ParmJObj.GetInt("Id"),
             };
-            bool flag = teacherAssessmentModule.SubmitTeacherAssessmentApprovalModule(model.Id,out string message);
+
+            bool flag = teacherAssessmentModule.SubmitTeacherAssessmentApprovalModule(base.UserInfo, model.Id,out string message);
             return flag ? ApiResult.Success() : ApiResult.Failed(message: message);
         }
         #endregion