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

Edu.Model/Entity/DataStatistics/RB_Teacher_Assessment.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.DataStatistics
+{
+    /// <summary>
+    /// 教师月度考核实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Teacher_Assessment
+    {
+		/// <summary>
+		/// 主键编号
+		/// </summary>
+		public int Id { get; set; }
+
+		/// <summary>
+		/// 年份
+		/// </summary>
+		public int YearStr { get; set; }
+
+		/// <summary>
+		/// 月份
+		/// </summary>
+		public int MonthStr { get; set; }
+
+		/// <summary>
+		/// 教师账号编号
+		/// </summary>
+		public int TeacherAccountId { get; set; }
+
+		/// <summary>
+		/// 教学主管考核得分合计
+		/// </summary>
+		public decimal TeacherScore { get; set; }
+
+		/// <summary>
+		/// 教务主管考核得分合计
+		/// </summary>
+		public decimal JiaoWuScore { get; set; }
+
+		/// <summary>
+		/// 最终考核得分合计(教學主管考核*30%+教务主管考核*70%)
+		/// </summary>
+		public decimal TotalScore { get; set; }
+
+		/// <summary>
+		/// 员工表现
+		/// </summary>
+		public string Behavior { get; set; }
+
+		/// <summary>
+		/// 主要优点
+		/// </summary>
+		public string Advantage { get; set; }
+
+		/// <summary>
+		/// 主要缺点
+		/// </summary>
+		public string ShortComing { get; set; }
+
+		/// <summary>
+		/// 发展潜力
+		/// </summary>
+		public string Potential { get; set; }
+
+		/// <summary>
+		/// 发展潜力其他
+		/// </summary>
+		public string PotentialOther { get; set; }
+
+		/// <summary>
+		/// 上级帮助
+		/// </summary>
+		public string Help { get; set; }
+
+		/// <summary>
+		/// 对公司发展建议
+		/// </summary>
+		public string Suggest { get; set; }
+
+		/// <summary>
+		/// 其他意见
+		/// </summary>
+		public string Other { get; set; }
+
+		/// <summary>
+		/// 教师填写日期
+		/// </summary>
+		public DateTime TeacherSignDate { get; set; }
+
+		/// <summary>
+		/// 审核状态
+		/// </summary>
+		public int AuditStatus { get; set; }
+
+		/// <summary>
+		/// 集团编号
+		/// </summary>
+		public int Group_Id { get; set; }
+
+		/// <summary>
+		/// 学校编号
+		/// </summary>
+		public int School_Id { get; set; }
+
+		/// <summary>
+		/// 创建人
+		/// </summary>
+		public int CreateBy { get; set; }
+
+		/// <summary>
+		/// 创建时间
+		/// </summary>
+		public DateTime CreateTime { get; set; }
+	}
+}

Edu.Model/Entity/DataStatistics/RB_Teacher_Assessment_Details.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.DataStatistics
+{
+    /// <summary>
+    /// 教师月度考核详情实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Teacher_Assessment_Details
+    {
+		/// <summary>
+		/// 主键编号
+		/// </summary>
+		public int Id { get; set; }
+
+		/// <summary>
+		/// 教师考评表编号
+		/// </summary>
+		public int TeacherAssessmentId { get; set; }
+
+		/// <summary>
+		/// 老师考评类型配置编号
+		/// </summary>
+		public int AssessmentTypeId { get; set; }
+
+		/// <summary>
+		/// 老师考评子类型配置编号
+		/// </summary>
+		public int AssessmentSubTypeId { get; set; }
+
+		/// <summary>
+		/// 选中项id(优秀、良好等)
+		/// </summary>
+		public int CheckId { get; set; }
+
+		/// <summary>
+		/// 考核类型(1-教学主管,2-教务主管)
+		/// </summary>
+		public int CheckType { get; set; }
+
+		/// <summary>
+		/// 得分
+		/// </summary>
+		public decimal CheckScore { get; set; }
+
+		/// <summary>
+		/// 打分时间
+		/// </summary>
+		public DateTime CreateTime { get; set; }
+
+	}
+}

Edu.Model/ViewModel/DataStatistics/RB_Teacher_Assessment_Details_Extend.cs

+using Edu.Model.Entity.DataStatistics;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Edu.Model.ViewModel.DataStatistics
+{
+    /// <summary>
+    /// 教师月度考核详情扩展实体类
+    /// </summary>
+    public class RB_Teacher_Assessment_Details_Extend : RB_Teacher_Assessment_Details
+    {
+        /// <summary>
+        /// 教师考评表编号【查询使用】
+        /// </summary>
+        public string QTeacherAssessmentIds { get; set; }
+    }
+}

Edu.Model/ViewModel/DataStatistics/RB_Teacher_Assessment_Extend.cs

+using Edu.Model.Entity.DataStatistics;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Edu.Model.ViewModel.DataStatistics
+{
+    /// <summary>
+    /// 教师月度考核扩展实体类
+    /// </summary>
+    public class RB_Teacher_Assessment_Extend : RB_Teacher_Assessment
+    {
+        /// <summary>
+        /// 教师月度考核详情列表
+        /// </summary>
+        public List<RB_Teacher_Assessment_Details_Extend> DetailsList { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public string CreateByName { get; set; }
+
+        /// <summary>
+        /// 教师姓名
+        /// </summary>
+        public string TeacherName { get; set; }
+    }
+}

Edu.Module.User/TeacherAssessmentModule.cs

 using Edu.Common.Enum;
 using Edu.Model.ViewModel.DataStatistics;
+using Edu.Model.ViewModel.User;
 using Edu.Repository.DataStatistics;
+using Edu.Repository.User;
 using System.Collections.Generic;
 using System.Linq;
 using VT.FW.DB;
@@ -22,6 +24,23 @@ namespace Edu.Module.User
         /// </summary>
         private readonly RB_Assessment_SubtypeRepository assessment_SubtypeRepository = new RB_Assessment_SubtypeRepository();
 
+        /// <summary>
+        /// 教师月度考核仓储层对象
+        /// </summary>
+        private readonly RB_Teacher_AssessmentRepository teacher_AssessmentRepository = new RB_Teacher_AssessmentRepository();
+
+        /// <summary>
+        /// 教师月度考核详情仓储层对象
+        /// </summary>
+        private readonly RB_Teacher_Assessment_DetailsRepository teacher_Assessment_DetailsRepository = new RB_Teacher_Assessment_DetailsRepository();
+
+        /// <summary>
+        /// 员工信息仓储层对象
+        /// </summary>
+        private readonly RB_AccountRepository accountRepository = new RB_AccountRepository();
+
+        #region 基础配置
+
         /// <summary>
         /// 获取老师考评配置列表
         /// </summary>
@@ -39,7 +58,7 @@ namespace Edu.Module.User
                 });
                 foreach (var item in list)
                 {
-                    var tempList= subList?.Where(qitem => qitem.AssessmentTypeId == item.Id)?.ToList() ?? new List<RB_Assessment_Subtype_Extend>();
+                    var tempList = subList?.Where(qitem => qitem.AssessmentTypeId == item.Id)?.ToList() ?? new List<RB_Assessment_Subtype_Extend>();
                     if (tempList != null && tempList.Count > 0)
                     {
                         foreach (var subItem in tempList)
@@ -127,7 +146,7 @@ namespace Edu.Module.User
             var extModel = assessment_TypeRepository.GetEntity<RB_Assessment_Type_Extend>(Id);
             if (extModel != null)
             {
-                var subList= GetAssessmentSubtypeListModule(new RB_Assessment_Subtype_Extend() { AssessmentTypeId = extModel.Id });
+                var subList = GetAssessmentSubtypeListModule(new RB_Assessment_Subtype_Extend() { AssessmentTypeId = extModel.Id });
                 if (subList != null && subList.Count > 0)
                 {
                     foreach (var subItem in subList)
@@ -196,5 +215,39 @@ namespace Edu.Module.User
             bool flag = assessment_SubtypeRepository.Update(fileds, new WhereHelper(nameof(RB_Assessment_Subtype_Extend.Id), Id));
             return flag;
         }
+
+        #endregion
+
+        #region 教师考核
+
+        /// <summary>
+        /// 获取教师月度考核分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Teacher_Assessment_Extend> GetTeacherAssessmentPageModule(int pageIndex, int pageSize, out long rowsCount, RB_Teacher_Assessment_Extend query)
+        {
+            var list = teacher_AssessmentRepository.GetTeacherAssessmentPageRepository(pageIndex, pageSize, out rowsCount, query);
+            if (list != null && list.Count > 0)
+            {
+                string teacherIds = string.Join(",", list.Select(qitem => qitem.TeacherAccountId));
+                List<Employee_ViewModel> empList = new List<Employee_ViewModel>();
+                if (!string.IsNullOrEmpty(teacherIds))
+                {
+                    empList= accountRepository.GetEmployeeListRepository(new Employee_ViewModel() { QIds = teacherIds });
+                }
+                foreach (var item in list)
+                {
+                    var tempEmp = empList?.FirstOrDefault(qitem => qitem.Id == item.TeacherAccountId);
+                    item.TeacherName = tempEmp?.EmployeeName ?? "";
+                }
+            }
+            return list;
+        }
+
+        #endregion
     }
 }
\ No newline at end of file

Edu.Repository/DataStatistics/RB_Teacher_AssessmentRepository.cs

+using Edu.Model.Entity.DataStatistics;
+using Edu.Model.ViewModel.DataStatistics;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Edu.Repository.DataStatistics
+{
+    /// <summary>
+    /// 教师月度考核仓储层
+    /// </summary>
+    public class RB_Teacher_AssessmentRepository : BaseRepository<RB_Teacher_Assessment>
+    {
+        /// <summary>
+        /// 获取教师月度考核分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Teacher_Assessment_Extend> GetTeacherAssessmentPageRepository(int pageIndex,int pageSize,out long rowsCount, RB_Teacher_Assessment_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT A.* 
+FROM RB_Teacher_Assessment AS A
+WHERE 1=1
+");
+            if (query != null)
+            {
+                if (query.Group_Id > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Teacher_Assessment_Extend.Group_Id), query.Group_Id);
+                }
+                if (query.YearStr > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Teacher_Assessment_Extend.YearStr), query.YearStr);
+                }
+                if (query.MonthStr > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Teacher_Assessment_Extend.MonthStr), query.MonthStr);
+                }
+                if (query.TeacherAccountId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Teacher_Assessment_Extend.TeacherAccountId), query.TeacherAccountId);
+                }
+            }
+            return GetPage<RB_Teacher_Assessment_Extend>(pageIndex,pageSize,out rowsCount,builder.ToString()).ToList();
+        }
+    }
+}

Edu.Repository/DataStatistics/RB_Teacher_Assessment_DetailsRepository.cs

+using Edu.Model.Entity.DataStatistics;
+using Edu.Model.ViewModel.DataStatistics;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Edu.Repository.DataStatistics
+{
+    /// <summary>
+    /// 教师月度考核详情仓储层
+    /// </summary>
+    public class RB_Teacher_Assessment_DetailsRepository : BaseRepository<RB_Teacher_Assessment_Details>
+    {
+        /// <summary>
+        /// 获取教师月度考核详情列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Teacher_Assessment_Details_Extend> GetTeacherAssessmentDetailsListRepository(RB_Teacher_Assessment_Details_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT A.*
+FROM RB_Teacher_Assessment_Details AS A
+WHERE 1=1
+");
+            if (query != null)
+            {
+                if (query.TeacherAssessmentId > 0)
+                {
+                    builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Teacher_Assessment_Details_Extend.TeacherAssessmentId), query.TeacherAssessmentId);
+                }
+                if (!string.IsNullOrEmpty(query.QTeacherAssessmentIds))
+                {
+                    builder.AppendFormat(@" AND A.{0} IN({1}) ", nameof(RB_Teacher_Assessment_Details_Extend.TeacherAssessmentId), query.QTeacherAssessmentIds);
+                }
+            }
+            return Get<RB_Teacher_Assessment_Details_Extend>(builder.ToString()).ToList();
+        }
+    }
+}

Edu.WebApi/Controllers/DataService/TeacherAssessmentController.cs

-using Edu.Common.API;
+using Edu.Cache.User;
+using Edu.Common.API;
 using Edu.Common.Plugin;
 using Edu.Model.ViewModel.DataStatistics;
 using Edu.Module.User;
@@ -25,6 +26,8 @@ namespace Edu.WebApi.Controllers.DataService
         /// </summary>
         private readonly TeacherAssessmentModule teacherAssessmentModule = new TeacherAssessmentModule();
 
+        #region 基础配置
+
         /// <summary>
         /// 获取教师考评配置列表
         /// </summary>
@@ -127,28 +130,63 @@ namespace Edu.WebApi.Controllers.DataService
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
 
+
         /// <summary>
-        /// 根据编号获取老师考评子类型配置
+        /// 根据编号删除老师考评子类型配置
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public ApiResult GetAssessmentSubtype()
+        public ApiResult RemoveAssessmentSubtype()
         {
             var Id = base.ParmJObj.GetInt("Id");
-            var extModel = teacherAssessmentModule.GetAssessmentSubtypeModule(Id);
-            return ApiResult.Success(data: extModel);
+            bool flag = teacherAssessmentModule.RemoveAssessmentSubtypeModule(Id);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
         }
 
+        #endregion
+
+        #region 教师考核
+
         /// <summary>
-        /// 根据编号删除老师考评子类型配置
+        /// 获取教师考核分页列表
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public ApiResult RemoveAssessmentSubtype()
+        public ApiResult GetTeacherAssessmentPage()
         {
-            var Id = base.ParmJObj.GetInt("Id");
-            bool flag = teacherAssessmentModule.RemoveAssessmentSubtypeModule(Id);
-            return flag ? ApiResult.Success() : ApiResult.Failed();
+            var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
+            var query = new RB_Teacher_Assessment_Extend()
+            {
+                YearStr = base.ParmJObj.GetInt("YearStr"),
+                MonthStr = base.ParmJObj.GetInt("MonthStr"),
+                TeacherAccountId = base.ParmJObj.GetInt("TeacherAccountId"),
+            };
+            query.Group_Id = base.UserInfo.Group_Id;
+            List<object> result = new List<object>();
+            var list = teacherAssessmentModule.GetTeacherAssessmentPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
+            foreach (var item in list)
+            {
+                if (item.CreateBy > 0)
+                {
+                    item.CreateByName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName ?? "";
+                }
+                result.Add(new
+                {
+                    item.Id,
+                    item.YearStr,
+                    item.MonthStr,
+                    item.TeacherAccountId,
+                    item.TeacherName,
+                    item.TeacherScore,
+                    item.JiaoWuScore,
+                    item.TotalScore,
+                    CreateTimeStr = Common.ConvertHelper.FormatTime(item.CreateTime)
+                });
+            }
+            pageModel.Count = rowsCount;
+            pageModel.PageData = result;
+            return ApiResult.Success(data: pageModel);
         }
+        #endregion
     }
 }