Skip to content

E
Education
Commit be9ac07d authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent a17ee4a2
Hide whitespace changes
Inline Side-by-side
Showing with 121 additions and 17 deletions
Edu.Model/Entity/DataStatistics/RB_Teacher_Assessment.cs
View file @ be9ac07d
......@@ -9,7 +9,7 @@ namespace Edu.Model.Entity.DataStatistics
/// 教师月度考核实体类
/// </summary>
[Serializable]
[DB(ConnectionName = "DataStatisticsConnection")]
[DB(ConnectionName = "DefaultConnection")]
public class RB_Teacher_Assessment
{
/// <summary>
......
Edu.Model/Entity/DataStatistics/RB_Teacher_Assessment_Details.cs
View file @ be9ac07d
......@@ -9,7 +9,7 @@ namespace Edu.Model.Entity.DataStatistics
/// 教师月度考核详情实体类
/// </summary>
[Serializable]
[DB(ConnectionName = "DataStatisticsConnection")]
[DB(ConnectionName = "DefaultConnection")]
public class RB_Teacher_Assessment_Details
{
/// <summary>
......
Edu.Model/ViewModel/DataStatistics/RB_Teacher_Assessment_Extend.cs
View file @ be9ac07d
......@@ -14,5 +14,15 @@ namespace Edu.Model.ViewModel.DataStatistics
/// 教师月度考核详情列表
/// </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
View file @ be9ac07d
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
View file @ be9ac07d
......@@ -13,11 +13,14 @@ namespace Edu.Repository.DataStatistics
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> GetTeacherAssessmentListRepository(RB_Teacher_Assessment_Extend query)
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(@"
......@@ -44,7 +47,7 @@ WHERE 1=1
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Teacher_Assessment_Extend.TeacherAccountId), query.TeacherAccountId);
}
}
return Get<RB_Teacher_Assessment_Extend>(builder.ToString()).ToList();
return GetPage<RB_Teacher_Assessment_Extend>(pageIndex,pageSize,out rowsCount,builder.ToString()).ToList();
}
}
}
Edu.WebApi/Controllers/DataService/TeacherAssessmentController.cs
View file @ be9ac07d
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
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment