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

Edu.Model/Entity/DataStatistics/RB_Assessment_Subtype.cs

+using Edu.Common.Enum;
+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_Assessment_Subtype
+    {
+		/// <summary>
+		/// 教师考评子类型主键编号
+		/// </summary>
+		public int Id { get; set; }
+
+		/// <summary>
+		/// 教师考评类型编号
+		/// </summary>
+		public int AssessmentTypeId { get; set; }
+
+		/// <summary>
+		/// 子类型名称
+		/// </summary>
+		public string SubTypeName { 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; }
+
+		/// <summary>
+		/// 修改人
+		/// </summary>
+		public int UpdateBy { get; set; }
+
+		/// <summary>
+		/// 更新时间
+		/// </summary>
+		public DateTime UpdateTime { get; set; }
+
+		/// <summary>
+		/// 删除状态(0-正常,1-禁用)
+		/// </summary>
+		public DateStateEnum Status { get; set; }
+
+		/// <summary>
+		/// 考评类型JSON字符串
+		/// </summary>
+		public string Options { get; set; }
+
+		/// <summary>
+		/// 排序
+		/// </summary>
+		public int SortNum { get; set; }
+	}
+}

Edu.Model/Entity/DataStatistics/RB_Assessment_Type.cs

+using Edu.Common.Enum;
+using System;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.DataStatistics
+{
+    /// <summary>
+    /// 老师考评类型配置表实体类
+    /// </summary>
+    [Serializable]
+	[DB(ConnectionName = "DefaultConnection")]
+	public class RB_Assessment_Type
+    {
+		/// <summary>
+		/// 教师考评类型主键编号
+		/// </summary>
+		public int Id { get; set; }
+
+		/// <summary>
+		/// 考评类型名称
+		/// </summary>
+		public string TypeName { 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; }
+
+		/// <summary>
+		/// 修改人
+		/// </summary>
+		public int UpdateBy { get; set; }
+
+		/// <summary>
+		/// 更新时间
+		/// </summary>
+		public DateTime UpdateTime { get; set; }
+
+		/// <summary>
+		/// 删除状态(0-正常,1-禁用)
+		/// </summary>
+		public DateStateEnum Status { get; set; }
+
+		/// <summary>
+		/// 排序
+		/// </summary>
+		public int SortNum { get; set; }
+	}
+}

Edu.Model/ViewModel/DataStatistics/RB_Assessment_Subtype_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_Assessment_Subtype_Extend : RB_Assessment_Subtype
+    {
+        /// <summary>
+        /// 考评项目列表
+        /// </summary>
+        public List<SubtypeItem> OptionList { get; set; }
+    }
+
+    /// <summary>
+    /// 考评具体项
+    /// </summary>
+    public class SubtypeItem
+    {
+        /// <summary>
+        /// 等级名称
+        /// </summary>
+        public string LevelTitle { get; set; }
+
+        /// <summary>
+        /// 等级描述
+        /// </summary>
+        public string LevelDesc { get; set; }
+
+        /// <summary>
+        /// 等级得分
+        /// </summary>
+        public decimal LevelScore { get; set; }
+    }
+}

Edu.Model/ViewModel/DataStatistics/RB_Assessment_Type_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_Assessment_Type_Extend : RB_Assessment_Type
+    {
+        /// <summary>
+        /// 子类型列表
+        /// </summary>
+        public List<RB_Assessment_Subtype_Extend> SubtypeList { get; set; }
+    }
+}

Edu.Module.User/TeacherAssessmentModule.cs

+using Edu.Common.Enum;
+using Edu.Model.ViewModel.DataStatistics;
+using Edu.Repository.DataStatistics;
+using System.Collections.Generic;
+using VT.FW.DB;
+
+namespace Edu.Module.User
+{
+    /// <summary>
+    /// 老师考评类型配置处理类
+    /// </summary>
+    public class TeacherAssessmentModule
+    {
+        /// <summary>
+        /// 老师考评类型配置表仓储层对象
+        /// </summary>
+        private RB_Assessment_TypeRepository assessment_TypeRepository = new RB_Assessment_TypeRepository();
+
+        /// <summary>
+        /// 老师考评子类型配置表仓储层对象
+        /// </summary>
+        private RB_Assessment_SubtypeRepository assessment_SubtypeRepository = new RB_Assessment_SubtypeRepository();
+
+        /// <summary>
+        /// 获取老师考评配置列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Assessment_Type_Extend> GetAssessmentTypeListModule(RB_Assessment_Type_Extend query)
+        {
+            var list = assessment_TypeRepository.GetAssessmentTypeListRepository(query);
+            return list;
+        }
+
+        /// <summary>
+        /// 新增修改老师考评类型
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool SetAssessmentTypeModule(RB_Assessment_Type_Extend model)
+        {
+            bool flag = false;
+            if (model.Id > 0)
+            {
+                Dictionary<string, object> fileds = new Dictionary<string, object>()
+                {
+                    {nameof(RB_Assessment_Type_Extend.TypeName),model.TypeName },
+                    {nameof(RB_Assessment_Type_Extend.UpdateBy),model.UpdateBy },
+                    {nameof(RB_Assessment_Type_Extend.UpdateTime),model.UpdateTime },
+                    {nameof(RB_Assessment_Type_Extend.SortNum),model.SortNum },
+                };
+                flag = assessment_TypeRepository.Update(fileds, new WhereHelper(nameof(RB_Assessment_Type_Extend.Id), model.Id));
+            }
+            else
+            {
+                var newId = assessment_TypeRepository.Insert(model);
+                model.Id = newId;
+                flag = newId > 0;
+            }
+            return flag;
+        }
+
+        /// <summary>
+        /// 根据编号获取老师考评类型
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        public RB_Assessment_Type_Extend GetAssessmentTypeModule(object Id)
+        {
+            var extModel = assessment_TypeRepository.GetEntity<RB_Assessment_Type_Extend>(Id);
+            return extModel;
+        }
+
+        /// <summary>
+        /// 根据编号删除老师考评类型
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        public bool RemoveAssessmentTypeModule(object Id)
+        {
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+            {
+                {nameof(RB_Assessment_Type_Extend.Status),(int)DateStateEnum.Delete }
+            };
+            bool flag = assessment_TypeRepository.Update(fileds, new WhereHelper(nameof(RB_Assessment_Type_Extend.Id), Id));
+            return flag;
+        }
+
+        /// <summary>
+        /// 获取老师考评子类型配置列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Assessment_Subtype_Extend> GetAssessmentSubtypeListModule(RB_Assessment_Subtype_Extend query)
+        {
+            var subList = assessment_SubtypeRepository.GetAssessmentSubtypeListRepository(query);
+            return subList;
+        }
+
+        /// <summary>
+        /// 新增修改老师考评子类型配置
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool SetAssessmentSubtypeModule(RB_Assessment_Subtype_Extend model)
+        {
+            bool flag = false;
+            if (model.Id > 0)
+            {
+                Dictionary<string, object> fileds = new Dictionary<string, object>()
+                {
+                    {nameof(RB_Assessment_Subtype_Extend.SubTypeName),model.SubTypeName },
+                    {nameof(RB_Assessment_Subtype_Extend.Options),model.Options },
+                    {nameof(RB_Assessment_Subtype_Extend.UpdateBy),model.UpdateBy },
+                    {nameof(RB_Assessment_Subtype_Extend.UpdateTime),model.UpdateTime },
+                    {nameof(RB_Assessment_Subtype_Extend.SortNum),model.SortNum },
+                };
+                flag = assessment_SubtypeRepository.Update(fileds, new WhereHelper(nameof(RB_Assessment_Subtype_Extend.Id), model.Id));
+            }
+            else
+            {
+                var newId = assessment_SubtypeRepository.Insert(model);
+                model.Id = newId;
+                flag = newId > 0;
+            }
+            return flag;
+        }
+
+        /// <summary>
+        /// 根据编号获取老师考评子类型配置
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public RB_Assessment_Subtype_Extend GetAssessmentSubtypeModule(object id)
+        {
+            var extModel = assessment_SubtypeRepository.GetEntity<RB_Assessment_Subtype_Extend>(id);
+            return extModel;
+        }
+
+        /// <summary>
+        /// 根据编号删除老师考评子类型配置
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        public bool RemoveAssessmentSubtypeModule(object Id)
+        {
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+            {
+                {nameof(RB_Assessment_Subtype_Extend.Status),(int)DateStateEnum.Delete }
+            };
+            bool flag = assessment_SubtypeRepository.Update(fileds, new WhereHelper(nameof(RB_Assessment_Subtype_Extend.Id), Id));
+            return flag;
+        }
+    }
+}
\ No newline at end of file

Edu.Repository/DataStatistics/RB_Assessment_SubtypeRepository.cs

+using Edu.Common.Enum;
+using Edu.Model.Entity.DataStatistics;
+using Edu.Model.ViewModel.DataStatistics;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using VT.FW.DB.Dapper;
+
+namespace Edu.Repository.DataStatistics
+{
+    /// <summary>
+    /// 老师考评子类型配置表仓储层
+    /// </summary>
+    public class RB_Assessment_SubtypeRepository : BaseRepository<RB_Assessment_Subtype>
+    {
+        /// <summary>
+        /// 获取老师考评子类型配置列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Assessment_Subtype_Extend> GetAssessmentSubtypeListRepository(RB_Assessment_Subtype_Extend query)
+        {
+            var parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT A.*
+FROM RB_Assessment_Subtype AS A
+WHERE 1=1
+");
+            builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Assessment_Subtype_Extend.Status), (int)DateStateEnum.Normal);
+            if (query != null)
+            {
+                if (query.Group_Id > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Assessment_Subtype_Extend.Group_Id), query.Group_Id);
+                }
+                if (query.AssessmentTypeId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Assessment_Subtype_Extend.AssessmentTypeId), query.AssessmentTypeId);
+                }
+                if (!string.IsNullOrEmpty(query.SubTypeName))
+                {
+                    builder.AppendFormat(" AND A.{0} LIKE @SubTypeName ", nameof(RB_Assessment_Subtype_Extend.SubTypeName));
+                    parameters.Add("SubTypeName", "%" + query.SubTypeName.Trim() + "%");
+                }
+            }
+            builder.AppendFormat(" ORDER BY A.{0} ASC ", nameof(RB_Assessment_Subtype_Extend.SortNum));
+            return Get<RB_Assessment_Subtype_Extend>(builder.ToString(), parameters).ToList();
+        }
+    }
+}

Edu.Repository/DataStatistics/RB_Assessment_TypeRepository.cs

+using Edu.Common.Enum;
+using Edu.Model.Entity.DataStatistics;
+using Edu.Model.ViewModel.DataStatistics;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using VT.FW.DB.Dapper;
+
+namespace Edu.Repository.DataStatistics
+{
+    /// <summary>
+    /// 老师考评类型配置表仓储层
+    /// </summary>
+    public class RB_Assessment_TypeRepository : BaseRepository<RB_Assessment_Type>
+    {
+        /// <summary>
+        /// 获取老师考评类型配置列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Assessment_Type_Extend> GetAssessmentTypeListRepository(RB_Assessment_Type_Extend query)
+        {
+            var parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT A.*
+FROM RB_Assessment_Type AS A
+WHERE 1=1
+");
+            builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Assessment_Type_Extend.Status), (int)DateStateEnum.Normal);
+            if (query != null)
+            {
+                if (query.Group_Id > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Assessment_Type_Extend.Group_Id), query.Group_Id);
+                }
+                if (!string.IsNullOrEmpty(query.TypeName))
+                {
+                    builder.AppendFormat(" AND A.{0} LIKE @TypeName ", nameof(RB_Assessment_Type_Extend.TypeName));
+                    parameters.Add("TypeName", "%" + query.TypeName.Trim() + "%");
+                }
+            }
+            builder.AppendFormat(" ORDER BY A.{0} ASC ", nameof(RB_Assessment_Type_Extend.SortNum));
+            return Get<RB_Assessment_Type_Extend>(builder.ToString(), parameters).ToList();
+        }
+    }
+}

Edu.WebApi/Controllers/DataService/DataServiceController.cs

@@ -16,7 +16,7 @@ namespace Edu.WebApi.Controllers.DataService
     [EnableCors("AllowCors")]
     public class DataServiceController : BaseController
     {
-        private DataServiceModule dataServiceModule = new DataServiceModule();
+        private readonly DataServiceModule dataServiceModule = new DataServiceModule();
 
         /// <summary>
         /// 获取总经理视图数据

Edu.WebApi/Controllers/DataService/TeacherAssessmentController.cs

+using Edu.Common.API;
+using Edu.Common.Plugin;
+using Edu.Model.ViewModel.DataStatistics;
+using Edu.Module.User;
+using Edu.WebApi.Filter;
+using Microsoft.AspNetCore.Cors;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Edu.WebApi.Controllers.DataService
+{
+    [Route("api/[controller]/[action]")]
+    [ApiExceptionFilter]
+    [ApiController]
+    [EnableCors("AllowCors")]
+    public class TeacherAssessmentController : BaseController
+    {
+        /// <summary>
+        /// 老师考评类型配置处理类对象
+        /// </summary>
+        private readonly TeacherAssessmentModule teacherAssessmentModule = new TeacherAssessmentModule();
+
+        /// <summary>
+        /// 获取教师考评配置列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetAssessmentTypeList()
+        {
+            var query = new RB_Assessment_Type_Extend()
+            {
+                TypeName = ParmJObj.GetStringValue("TypeName")
+            };
+            query.Group_Id = base.UserInfo.Group_Id;
+            var result = teacherAssessmentModule.GetAssessmentTypeListModule(query);
+            return ApiResult.Success(data: result);
+        }
+
+        /// <summary>
+        /// 新增修改考评类型配置
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetAssessmentType()
+        {
+            var model = new RB_Assessment_Type_Extend()
+            {
+                Id = base.ParmJObj.GetInt("Id"),
+                TypeName = ParmJObj.GetStringValue("TypeName"),
+                SortNum = base.ParmJObj.GetInt("SortNum"),
+            };
+            model.Group_Id = base.UserInfo.Group_Id;
+            model.CreateBy = base.UserInfo.Id;
+            model.UpdateBy = base.UserInfo.Id;
+            model.CreateTime = DateTime.Now;
+            model.UpdateTime = DateTime.Now;
+            model.Status = Common.Enum.DateStateEnum.Normal;
+            var flag = teacherAssessmentModule.SetAssessmentTypeModule(model);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
+        /// <summary>
+        /// 根据编号获取老师考评类型
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetAssessmentType()
+        {
+            var Id = base.ParmJObj.GetInt("Id");
+            var extModel = teacherAssessmentModule.GetAssessmentTypeModule(Id);
+            return ApiResult.Success(data: extModel);
+        }
+
+        /// <summary>
+        /// 根据编号删除老师考评类型
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult RemoveAssessmentType()
+        {
+            var Id = base.ParmJObj.GetInt("Id");
+            var flag = teacherAssessmentModule.RemoveAssessmentTypeModule(Id);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
+
+        /// <summary>
+        /// 新增修改老师考评子类型配置
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetAssessmentSubtype()
+        {
+            var model = new RB_Assessment_Subtype_Extend()
+            {
+                Id = base.ParmJObj.GetInt("Id"),
+                AssessmentTypeId = base.ParmJObj.GetInt("AssessmentTypeId"),
+                SubTypeName = base.ParmJObj.GetStringValue("SubTypeName"),
+                SortNum = base.ParmJObj.GetInt("SortNum"),
+            };
+            List<SubtypeItem> OptionList = new List<SubtypeItem>();
+            string options = base.ParmJObj.GetStringValue("OptionList");
+            if (!string.IsNullOrEmpty(options))
+            {
+                try
+                {
+                    OptionList = Common.Plugin.JsonHelper.DeserializeObject<List<SubtypeItem>>(options);
+                }
+                catch
+                {
+
+                }
+            }
+            model.Options = Common.Plugin.JsonHelper.Serialize(OptionList);
+            model.Group_Id = base.UserInfo.Group_Id;
+            model.CreateBy = base.UserInfo.Id;
+            model.UpdateBy = base.UserInfo.Id;
+            model.CreateTime = DateTime.Now;
+            model.UpdateTime = DateTime.Now;
+            model.Status = Common.Enum.DateStateEnum.Normal;
+            var flag = teacherAssessmentModule.SetAssessmentSubtypeModule(model);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
+        /// <summary>
+        /// 根据编号获取老师考评子类型配置
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetAssessmentSubtype()
+        {
+            var Id = base.ParmJObj.GetInt("Id");
+            var extModel = teacherAssessmentModule.GetAssessmentSubtypeModule(Id);
+            return ApiResult.Success(data: extModel);
+        }
+
+        /// <summary>
+        /// 根据编号删除老师考评子类型配置
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult RemoveAssessmentSubtype()
+        {
+            var Id = base.ParmJObj.GetInt("Id");
+            bool flag = teacherAssessmentModule.RemoveAssessmentSubtypeModule(Id);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+    }
+}