页面修改

Edu.Model/Entity/DataStatistics/RB_Teacher_Assessment.cs

-using System;
+using Edu.Common.Enum.EduTask;
+using System;
 using System.Collections.Generic;
 using System.Text;
 using VT.FW.DB;
@@ -95,7 +96,7 @@ namespace Edu.Model.Entity.DataStatistics
 		/// <summary>
 		/// 审核状态
 		/// </summary>
-		public int AuditStatus { get; set; }
+		public EduTaskRrocessStatus AuditStatus { get; set; }
 
 		/// <summary>
 		/// 集团编号
@@ -116,5 +117,15 @@ namespace Edu.Model.Entity.DataStatistics
 		/// 创建时间
 		/// </summary>
 		public DateTime CreateTime { get; set; }
-	}
+
+		/// <summary>
+		/// 教学主管是否打分
+		/// </summary>
+		public int IsTeacherFinish { get; set; }
+
+		/// <summary>
+		/// 教务主管是否打分
+		/// </summary>
+        public int IsJiaoWuFinish { get; set; }
+    }
 }

Edu.Module.User/TeacherAssessmentModule.cs

 using Edu.AOP.CustomerAttribute;
 using Edu.Common.Enum;
+using Edu.Common.Enum.EduTask;
 using Edu.Common.Enum.User;
 using Edu.Model.CacheModel;
 using Edu.Model.Entity.EduTask;
@@ -462,6 +463,8 @@ namespace Edu.Module.User
                 Other = extModel?.Other ?? "",
                 TeacherSignDate = Common.ConvertHelper.FormatTime(extModel?.TeacherSignDate),
                 AuditStatus = extModel?.AuditStatus ?? 0,
+                IsJiaoWuFinish = extModel?.IsJiaoWuFinish ?? 0,
+                IsTeacherFinish = extModel?.IsTeacherFinish ?? 0,
                 DetailsList = list,
                 S_JiaoXue_Time = Common.ConvertHelper.FormatTime(S_JiaoXue_Time),
                 S_JiaoXue_CreateByName = empList?.Where(qitem => qitem.Id == S_JiaoXue_Id)?.FirstOrDefault()?.EmployeeName ?? "",
@@ -487,6 +490,8 @@ namespace Edu.Module.User
                     {nameof(RB_Teacher_Assessment_Extend.TeacherScore),model.TeacherScore },
                     {nameof(RB_Teacher_Assessment_Extend.JiaoWuScore),model.JiaoWuScore },
                     {nameof(RB_Teacher_Assessment_Extend.TotalScore),model.TotalScore },
+                    {nameof(RB_Teacher_Assessment_Extend.IsTeacherFinish),model.IsTeacherFinish },
+                    {nameof(RB_Teacher_Assessment_Extend.IsJiaoWuFinish),model.IsJiaoWuFinish },
                 };
                 flag = teacher_AssessmentRepository.Update(fileds, new WhereHelper(nameof(RB_Teacher_Assessment_Extend.Id), model.Id));
             }
@@ -569,7 +574,7 @@ namespace Edu.Module.User
         /// </summary>
         /// <param name="Id"></param>
         /// <returns></returns>
-        public bool SubmitTeacherAssessmentApprovalModule(UserInfo user,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()
@@ -588,7 +593,12 @@ namespace Edu.Module.User
                 VerifyStatus = Common.Enum.EduTask.EduTaskRrocessStatus.NotAudit,
                 ReceiptFile = ""
             };
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+            {
+                {nameof(RB_Teacher_Assessment_Extend.AuditStatus),(int) EduTaskRrocessStatus.AuditIng}
+            };
             bool flag = education_ReceiptRepository.SetEducationReceiptRepository(educationReceipt, out message);
+            flag = teacher_AssessmentRepository.Update(fileds, new WhereHelper(nameof(RB_Teacher_Assessment_Extend.Id), Id));
             return flag;
         }
         #endregion

Edu.WebApi/Controllers/DataService/TeacherAssessmentController.cs

@@ -193,7 +193,9 @@ namespace Edu.WebApi.Controllers.DataService
                     item.Help,
                     item.Suggest,
                     item.Other,
-                    TeacherSignDate = Common.ConvertHelper.FormatTime(item.TeacherSignDate)
+                    TeacherSignDate = Common.ConvertHelper.FormatTime(item.TeacherSignDate),
+                    item.AuditStatus,
+                    AuditStatusName=item.AuditStatus.ToName(),
                 });
             }
             pageModel.Count = rowsCount;
@@ -222,6 +224,7 @@ namespace Edu.WebApi.Controllers.DataService
         [HttpPost]
         public ApiResult GetTeacherAssessmentDetail()
         {
+          
             int Id = base.ParmJObj.GetInt("Id");
             var model = teacherAssessmentModule.GetTeacherAssessmentDetailModule(Id);
             return ApiResult.Success(data: model);
@@ -242,6 +245,8 @@ namespace Edu.WebApi.Controllers.DataService
                 TeacherAccountId = base.ParmJObj.GetInt("TeacherAccountId"),
                 TeacherScore = base.ParmJObj.GetDecimal("TeacherScore"),
                 JiaoWuScore = base.ParmJObj.GetDecimal("JiaoWuScore"),
+                IsTeacherFinish = base.ParmJObj.GetInt("IsJiaoWuFinish"),
+                IsJiaoWuFinish = base.ParmJObj.GetInt("IsJiaoWuFinish")
             };
 
             if (model.YearStr <= 0 || model.MonthStr <= 0)
@@ -253,6 +258,14 @@ namespace Edu.WebApi.Controllers.DataService
                 return ApiResult.Failed(message: "请选择老师!");
             }
             CheckTypeEnum CheckType = (CheckTypeEnum)base.ParmJObj.GetInt("CheckType");
+            if (CheckType == CheckTypeEnum.JiaoXueManager)
+            {
+                model.IsTeacherFinish = 1;
+            }
+            if (CheckType == CheckTypeEnum.JiaoWuManager)
+            {
+                model.IsJiaoWuFinish = 1;
+            }
             model.DetailsList = new List<RB_Teacher_Assessment_Details_Extend>();
             var detailsLists = base.ParmJObj.GetStringValue("DetailsList");
             if (!string.IsNullOrEmpty(detailsLists))