Skip to content

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

页面修改

parent 24e4c9e9
Hide whitespace changes
Inline Side-by-side
Showing with 145 additions and 10 deletions
Edu.Module.Course/EmployeeBonusModule.cs
View file @ 5c6c067b
...@@ -393,7 +393,7 @@ namespace Edu.Module.Course ...@@ -393,7 +393,7 @@ namespace Edu.Module.Course
CurGuestNum = curNum, CurGuestNum = curNum,
CurOrderMoney = curOrderMoney, CurOrderMoney = curOrderMoney,
Group_Id = GroupId, Group_Id = GroupId,
CurRewardMoney = GetStepAwardAmount(item, curNum),
CreateBy = 1, CreateBy = 1,
CreateTime = DateTime.Now, CreateTime = DateTime.Now,
UpdateBy = 1, UpdateBy = 1,
...@@ -405,6 +405,9 @@ namespace Edu.Module.Course ...@@ -405,6 +405,9 @@ namespace Edu.Module.Course
//ClueNumSalary = ClueCount > 5 ? item.ClueNumSalary : 0, //ClueNumSalary = ClueCount > 5 ? item.ClueNumSalary : 0,
IsIssue = 0 IsIssue = 0
}; };
//HK 2022-04-14去掉
//pModel.CurRewardMoney = GetStepAwardAmount(item, curNum);
pModel.CurRewardMoney = 0;
pModel.IsReach = pModel.CurOrderMoney > item.MonthGoalMoney ? 1 : 0; pModel.IsReach = pModel.CurOrderMoney > item.MonthGoalMoney ? 1 : 0;
//历史提成数据 //历史提成数据
......
Edu.Module.User/TeacherAssessmentModule.cs
View file @ 5c6c067b
using Edu.Common.Enum; using Edu.AOP.CustomerAttribute;
using Edu.Common.Enum;
using Edu.Model.CacheModel;
using Edu.Model.ViewModel.DataStatistics; using Edu.Model.ViewModel.DataStatistics;
using Edu.Model.ViewModel.User; using Edu.Model.ViewModel.User;
using Edu.Repository.DataStatistics; using Edu.Repository.DataStatistics;
...@@ -39,6 +41,11 @@ namespace Edu.Module.User ...@@ -39,6 +41,11 @@ namespace Edu.Module.User
/// </summary> /// </summary>
private readonly RB_AccountRepository accountRepository = new RB_AccountRepository(); private readonly RB_AccountRepository accountRepository = new RB_AccountRepository();
/// <summary>
/// 字典仓储层对象
/// </summary>
private readonly Rb_dictvalueRepository dictvalueRepository = new Rb_dictvalueRepository();
#region 基础配置 #region 基础配置
/// <summary> /// <summary>
...@@ -236,14 +243,44 @@ namespace Edu.Module.User ...@@ -236,14 +243,44 @@ namespace Edu.Module.User
return list; return list;
} }
/// <summary>
/// 获取字典
/// </summary>
/// <param name="group_Id"></param>
/// <param name="key"></param>
/// <returns></returns>
public List<RB_Dictvalue_Extend> GetDictValueListModule(int group_Id, string key)
{
return dictvalueRepository.GetList(new RB_Dictvalue_Extend() { RB_Group_id = group_Id, DictKey = key });
}
/// <summary> /// <summary>
/// 获取老师考核数据 /// 获取老师考核数据
/// </summary> /// </summary>
/// <param name="TeacherAccountId"></param> /// <param name="TeacherAccountId"></param>
/// <param name="YearStr"></param>
/// <param name="MonthStr"></param>
/// <param name="UserInfo"></param>
/// <returns></returns> /// <returns></returns>
public object GetTeacherAssessmentModule(int TeacherAccountId, int YearStr = 2022, int MonthStr = 4) public object GetTeacherAssessmentModule(int TeacherAccountId, int YearStr , int MonthStr, UserInfo userInfo)
{ {
object result = new object(); object result = new object();
int CheckType = 0;
//获取字典配置的教学主管和教务主管
var dicModel = GetDictValueListModule(userInfo.Group_Id, "TEACHER_ASSESSMENT").FirstOrDefault();
if (dicModel != null)
{
//教学主管
if (dicModel.Code.Equals(userInfo.Id))
{
CheckType = 1;
}
//教务主管
if (dicModel.Content.Equals(userInfo.Id))
{
CheckType = 2;
}
}
var extModel = teacher_AssessmentRepository.GetTeacherAssessmentEntityRepository(new RB_Teacher_Assessment_Extend() var extModel = teacher_AssessmentRepository.GetTeacherAssessmentEntityRepository(new RB_Teacher_Assessment_Extend()
{ {
YearStr = YearStr, YearStr = YearStr,
...@@ -277,15 +314,16 @@ namespace Edu.Module.User ...@@ -277,15 +314,16 @@ namespace Edu.Module.User
{ {
CheckId = 0, CheckId = 0,
CheckScore = 0, CheckScore = 0,
subItem.AssessmentTypeId, AssessmentSubtypeId = subItem.Id,
subItem.SubTypeName, subItem.SubTypeName,
OptionList= optionList, OptionList = optionList,
}; };
subList.Add(sObj); subList.Add(sObj);
} }
var obj = new var obj = new
{ {
item.TypeName, item.TypeName,
AssessmentTypeId = item.Id,
SubtypeList = subList SubtypeList = subList
}; };
list.Add(obj); list.Add(obj);
...@@ -309,7 +347,8 @@ namespace Edu.Module.User ...@@ -309,7 +347,8 @@ namespace Edu.Module.User
Other = extModel?.Other ?? "", Other = extModel?.Other ?? "",
TeacherSignDate = Common.ConvertHelper.FormatTime(extModel?.TeacherSignDate), TeacherSignDate = Common.ConvertHelper.FormatTime(extModel?.TeacherSignDate),
AuditStatus = extModel?.AuditStatus ?? 0, AuditStatus = extModel?.AuditStatus ?? 0,
DetailsList = list DetailsList = list,
CheckType,
}; };
return result; return result;
} }
...@@ -317,10 +356,54 @@ namespace Edu.Module.User ...@@ -317,10 +356,54 @@ namespace Edu.Module.User
/// <summary> /// <summary>
/// 保存老师业绩考核 /// 保存老师业绩考核
/// </summary> /// </summary>
/// <param name="model"></param>
/// <returns></returns> /// <returns></returns>
public bool SaveTeacherAssessmentModule() [TransactionCallHandler]
public virtual bool SaveTeacherAssessmentModule(RB_Teacher_Assessment_Extend model)
{ {
bool flag = false; bool flag = false;
if (model.Id > 0)
{
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_Teacher_Assessment_Extend.TeacherScore),model.TeacherScore },
{nameof(RB_Teacher_Assessment_Extend.JiaoWuScore),model.JiaoWuScore },
{nameof(RB_Teacher_Assessment_Extend.TotalScore),model.TotalScore },
};
flag = teacher_AssessmentRepository.Update(fileds, new WhereHelper(nameof(RB_Teacher_Assessment_Extend.Id), model.Id));
}
else
{
var newId = teacher_AssessmentRepository.Insert(model);
model.Id = newId;
flag = newId > 0;
}
if (flag && model.DetailsList != null && model.DetailsList.Count > 0)
{
foreach (var item in model.DetailsList)
{
item.TeacherAssessmentId = model.Id;
if (flag)
{
if (item.Id > 0)
{
Dictionary<string, object> subFileds = new Dictionary<string, object>()
{
{nameof(RB_Teacher_Assessment_Details_Extend.CheckId),item.CheckId},
{nameof(RB_Teacher_Assessment_Details_Extend.CheckScore),item.CheckScore},
{nameof(RB_Teacher_Assessment_Details_Extend.CheckType),item.CheckType},
};
flag = teacher_Assessment_DetailsRepository.Update(subFileds, new WhereHelper(nameof(RB_Teacher_Assessment_Details_Extend.Id), item.Id));
}
else
{
var newDetailId = teacher_Assessment_DetailsRepository.Insert(item);
item.Id = newDetailId;
flag = newDetailId > 0;
}
}
}
}
return flag; return flag;
} }
#endregion #endregion
......
Edu.WebApi/Controllers/DataService/TeacherAssessmentController.cs
View file @ 5c6c067b
...@@ -24,7 +24,7 @@ namespace Edu.WebApi.Controllers.DataService ...@@ -24,7 +24,7 @@ namespace Edu.WebApi.Controllers.DataService
/// <summary> /// <summary>
/// 老师考评类型配置处理类对象 /// 老师考评类型配置处理类对象
/// </summary> /// </summary>
private readonly TeacherAssessmentModule teacherAssessmentModule = new TeacherAssessmentModule(); private readonly TeacherAssessmentModule teacherAssessmentModule = AOP.AOPHelper.CreateAOPObject<TeacherAssessmentModule>();
#region 基础配置 #region 基础配置
...@@ -199,7 +199,9 @@ namespace Edu.WebApi.Controllers.DataService ...@@ -199,7 +199,9 @@ namespace Edu.WebApi.Controllers.DataService
public ApiResult GetTeacherAssessmentInfo() public ApiResult GetTeacherAssessmentInfo()
{ {
int TeacherAccountId = base.ParmJObj.GetInt("TeacherAccountId"); int TeacherAccountId = base.ParmJObj.GetInt("TeacherAccountId");
var obj = teacherAssessmentModule.GetTeacherAssessmentModule(TeacherAccountId); int YearStr = base.ParmJObj.GetInt("YearStr");
int MonthStr = base.ParmJObj.GetInt("MonthStr");
var obj = teacherAssessmentModule.GetTeacherAssessmentModule(TeacherAccountId, YearStr, MonthStr, base.UserInfo);
return ApiResult.Success(data: obj); return ApiResult.Success(data: obj);
} }
...@@ -210,7 +212,54 @@ namespace Edu.WebApi.Controllers.DataService ...@@ -210,7 +212,54 @@ namespace Edu.WebApi.Controllers.DataService
[HttpPost] [HttpPost]
public ApiResult SaveTeacherAssessmentInfo() public ApiResult SaveTeacherAssessmentInfo()
{ {
var flag = teacherAssessmentModule.SaveTeacherAssessmentModule(); var model = new RB_Teacher_Assessment_Extend()
{
Id = base.ParmJObj.GetInt("Id"),
YearStr=base.ParmJObj.GetInt("YearStr"),
MonthStr=base.ParmJObj.GetInt("MonthStr"),
TeacherAccountId=base.ParmJObj.GetInt("TeacherAccountId"),
};
model.DetailsList = new List<RB_Teacher_Assessment_Details_Extend>();
var detailsLists = base.ParmJObj.GetStringValue("DetailsList");
if (!string.IsNullOrEmpty(detailsLists))
{
JArray dArray = JArray.Parse(detailsLists);
if (dArray != null && dArray.Count > 0)
{
foreach (var item in dArray)
{
JObject sObj = JObject.Parse(item.ToString());
string subtypeListStr = sObj.GetStringValue("SubtypeList");
if (!string.IsNullOrEmpty(subtypeListStr))
{
JArray subArray = JArray.Parse(subtypeListStr);
if (subArray != null && subArray.Count > 0)
{
foreach (var subItem in subArray)
{
JObject tObj = JObject.Parse(subItem.ToString());
var dModel = new RB_Teacher_Assessment_Details_Extend()
{
Id = sObj.GetInt("Id"),
AssessmentTypeId = sObj.GetInt("AssessmentTypeId"),
AssessmentSubTypeId = tObj.GetInt("AssessmentSubtypeId"),
CheckId = tObj.GetInt("CheckId"),
CheckScore = tObj.GetDecimal("CheckScore"),
CheckType = base.ParmJObj.GetInt("CheckType"),
CreateTime = DateTime.Now
};
model.DetailsList.Add(dModel);
}
}
}
}
}
}
model.Group_Id = base.UserInfo.Group_Id;
model.School_Id = base.UserInfo.School_Id;
model.CreateBy = base.UserInfo.Id;
model.CreateTime = DateTime.Now;
var flag = teacherAssessmentModule.SaveTeacherAssessmentModule(model);
return flag ? ApiResult.Success() : ApiResult.Failed(); return flag ? ApiResult.Success() : ApiResult.Failed();
} }
......
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