Skip to content

E
Education
Commit 21f1905a authored by liudong1993's avatar liudong1993
Browse files
Options

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

parents 73c93b80 41e1f16b
Hide whitespace changes
Inline Side-by-side
Showing with 173 additions and 57 deletions
Edu.Module.Course/OrderModule.cs
View file @ 21f1905a
...@@ -1745,6 +1745,12 @@ namespace Edu.Module.Course ...@@ -1745,6 +1745,12 @@ namespace Edu.Module.Course
{ {
bool flag = false; bool flag = false;
message = ""; message = "";
List<RB_Student_ViewModel> StuList = new List<RB_Student_ViewModel>();
//查询学生列表
if (!string.IsNullOrEmpty(demodel.StuIds))
{
StuList = studentRepository.GetStudentListRepository(new RB_Student_ViewModel() { Group_Id = demodel.Group_Id, StuIds = demodel.StuIds, School_Id = -1 });
}
var studyModel = studyAbroadRepository.GetEntity(demodel.SourceId); var studyModel = studyAbroadRepository.GetEntity(demodel.SourceId);
if (studyModel == null) if (studyModel == null)
{ {
...@@ -1856,6 +1862,10 @@ namespace Edu.Module.Course ...@@ -1856,6 +1862,10 @@ namespace Edu.Module.Course
message = "留学就业产品不正确"; message = "留学就业产品不正确";
return flag; return flag;
} }
if (StuList != null && StuList.FirstOrDefault().CreateType == StuCreateTypeEnum.CustomerInput)
{
demodel.CustomerId = StuList.FirstOrDefault().CustomerId;
}
int OrderId = orderRepository.Insert(demodel); int OrderId = orderRepository.Insert(demodel);
demodel.OrderId = OrderId; demodel.OrderId = OrderId;
flag = OrderId > 0; flag = OrderId > 0;
...@@ -1864,58 +1874,53 @@ namespace Edu.Module.Course ...@@ -1864,58 +1874,53 @@ namespace Edu.Module.Course
System.Threading.Tasks.Task.Run(() => SetReturnOrderCommission(demodel)); System.Threading.Tasks.Task.Run(() => SetReturnOrderCommission(demodel));
} }
} }
//添加学员
if (!string.IsNullOrEmpty(demodel.StuIds)) foreach (var item in StuList)
{ {
//查询学生列表 var guestModel = new RB_Order_Guest_ViewModel()
var StuList = studentRepository.GetStudentListRepository(new RB_Student_ViewModel() { Group_Id = demodel.Group_Id, StuIds = demodel.StuIds, School_Id = -1 });
foreach (var item in StuList)
{ {
var guestModel = new RB_Order_Guest_ViewModel() Id = 0,
{ OrderId = demodel.OrderId,
Id = 0, ClassId = 0,
OrderId = demodel.OrderId, GuestName = item.StuName,
ClassId = 0, GuestState = GuestStateEnum.Normal,
GuestName = item.StuName, Profession = item?.StuProfession ?? "",
GuestState = GuestStateEnum.Normal, Sex = (item?.StuSex ?? 1) + 1,
Profession = item?.StuProfession ?? "", Age = item.StuBirth.HasValue ? DateTime.Now.Year - item.StuBirth.Value.Year : 18,
Sex = (item?.StuSex ?? 1) + 1, Mobile = item?.StuTel ?? "",
Age = item.StuBirth.HasValue ? DateTime.Now.Year - item.StuBirth.Value.Year : 18, Basics = "",
Mobile = item?.StuTel ?? "", Education = item?.StuEducation ?? GuestEducationEnum.N2,
Basics = "", GuestSource = demodel.OrderSource,
Education = item?.StuEducation ?? GuestEducationEnum.N2, LearningGoals = item?.StuPurpose ?? 0,
GuestSource = demodel.OrderSource, Contact = item?.StuContract ?? "",
LearningGoals = item?.StuPurpose ?? 0, ContactMobile = item?.StuContractMobile ?? "",
Contact = item?.StuContract ?? "", Status = 0,
ContactMobile = item?.StuContractMobile ?? "", Group_Id = demodel.Group_Id,
Status = 0, School_Id = demodel.School_Id,
Group_Id = demodel.Group_Id, CreateBy = demodel.CreateBy,
School_Id = demodel.School_Id, CreateTime = demodel.CreateTime,
CreateBy = demodel.CreateBy, UpdateBy = demodel.UpdateBy,
CreateTime = demodel.CreateTime, UpdateTime = demodel.UpdateTime,
UpdateBy = demodel.UpdateBy, DropOutRemark = "",
UpdateTime = demodel.UpdateTime, IDCard = item?.StuIDCard ?? "",
DropOutRemark = "", Domicile = item?.StuIDCardAddress ?? "",
IDCard = item?.StuIDCard ?? "", ContactAddress = item?.StuAddress ?? "",
Domicile = item?.StuIDCardAddress ?? "", SourceId = demodel.SourceId,
ContactAddress = item?.StuAddress ?? "", GraduatedSchool = "",
SourceId = demodel.SourceId, GraduatedMajor = "",
GraduatedSchool = "", VolunteerMajor = "",
GraduatedMajor = "", Price = 0,
VolunteerMajor = "", StudyRemark = "",
Price = 0, CompleteHours = 0,
StudyRemark = "", MakeUpHours = 0,
CompleteHours = 0, StuIcon = item.StuIcon,
MakeUpHours = 0, TotalHours = 0,
StuIcon = item.StuIcon, RenewState = 1,
TotalHours = 0, QQ = item.QQ,
RenewState = 1, WeChatNo = item.WeChatNo,
QQ = item.QQ, StudentId = item.StuId
WeChatNo = item.WeChatNo, };
StudentId = item.StuId SetOrderGuestInfo(guestModel, out string Nmessage);
};
SetOrderGuestInfo(guestModel, out string Nmessage);
}
} }
#region 添加销售备注 和日志 #region 添加销售备注 和日志
......
Edu.Module.User/TeacherAssessmentModule.cs
View file @ 21f1905a
...@@ -6,6 +6,7 @@ using Edu.Model.ViewModel.DataStatistics; ...@@ -6,6 +6,7 @@ using Edu.Model.ViewModel.DataStatistics;
using Edu.Model.ViewModel.User; using Edu.Model.ViewModel.User;
using Edu.Repository.DataStatistics; using Edu.Repository.DataStatistics;
using Edu.Repository.User; using Edu.Repository.User;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using VT.FW.DB; using VT.FW.DB;
...@@ -263,7 +264,7 @@ namespace Edu.Module.User ...@@ -263,7 +264,7 @@ namespace Edu.Module.User
/// <param name="MonthStr"></param> /// <param name="MonthStr"></param>
/// <param name="UserInfo"></param> /// <param name="UserInfo"></param>
/// <returns></returns> /// <returns></returns>
public object GetTeacherAssessmentModule(int TeacherAccountId, int YearStr , int MonthStr, UserInfo userInfo) public object GetTeacherAssessmentModule(int TeacherAccountId, int YearStr, int MonthStr, UserInfo userInfo)
{ {
object result = new object(); object result = new object();
CheckTypeEnum CheckType = 0; CheckTypeEnum CheckType = 0;
...@@ -274,7 +275,7 @@ namespace Edu.Module.User ...@@ -274,7 +275,7 @@ namespace Edu.Module.User
//教学主管 //教学主管
if (dicModel.Code.Equals(userInfo.Id.ToString())) if (dicModel.Code.Equals(userInfo.Id.ToString()))
{ {
CheckType = CheckTypeEnum.JiaoXueManager; CheckType = CheckTypeEnum.JiaoXueManager;
} }
//教务主管 //教务主管
if (dicModel.Content.Equals(userInfo.Id.ToString())) if (dicModel.Content.Equals(userInfo.Id.ToString()))
...@@ -296,6 +297,7 @@ namespace Edu.Module.User ...@@ -296,6 +297,7 @@ namespace Edu.Module.User
}); });
var typeList = GetAssessmentTypeListModule(new RB_Assessment_Type_Extend() { }); var typeList = GetAssessmentTypeListModule(new RB_Assessment_Type_Extend() { });
List<object> list = new List<object>(); List<object> list = new List<object>();
foreach (var item in typeList) foreach (var item in typeList)
{ {
List<object> subList = new List<object>(); List<object> subList = new List<object>();
...@@ -321,9 +323,9 @@ namespace Edu.Module.User ...@@ -321,9 +323,9 @@ namespace Edu.Module.User
} }
var sObj = new var sObj = new
{ {
Id=tempDetail?.Id??0, Id = tempDetail?.Id ?? 0,
CheckId = tempDetail?.CheckId??0, CheckId = tempDetail?.CheckId ?? 0,
CheckScore = tempDetail?.CheckScore??0, CheckScore = tempDetail?.CheckScore ?? 0,
AssessmentSubtypeId = subItem.Id, AssessmentSubtypeId = subItem.Id,
subItem.SubTypeName, subItem.SubTypeName,
OptionList = optionList, OptionList = optionList,
...@@ -363,6 +365,105 @@ namespace Edu.Module.User ...@@ -363,6 +365,105 @@ namespace Edu.Module.User
return result; return result;
} }
/// <summary>
/// 获取老师考核数据
/// </summary>
/// <param name="Id"></param>
/// <returns></returns>
public object GetTeacherAssessmentDetailModule(int Id)
{
object result = new object();
var extModel = teacher_AssessmentRepository.GetEntity<RB_Teacher_Assessment_Extend>(Id);
var detailsList = teacher_Assessment_DetailsRepository.GetTeacherAssessmentDetailsListRepository(new RB_Teacher_Assessment_Details_Extend()
{
TeacherAssessmentId = (extModel?.Id ?? 0),
});
var typeList = GetAssessmentTypeListModule(new RB_Assessment_Type_Extend() { });
List<object> list = new List<object>();
DateTime? S_JiaoWu_Time = null;
DateTime? S_JiaoXue_Time = null;
int S_JiaoWu_Id = 0;
int S_JiaoXue_Id = 0;
foreach (var item in typeList)
{
List<object> subList = new List<object>();
foreach (var subItem in item.SubtypeList)
{
var tempDetail = detailsList.Where(qitem => qitem.AssessmentTypeId == item.Id && qitem.AssessmentSubTypeId == subItem.Id)?.ToList();
List<object> optionList = new List<object>();
foreach (var tItem in subItem.OptionList)
{
bool IsCheck = false;
if (tempDetail?.Where(qitem => qitem.CheckId == tItem.LevelId)?.Count() > 0)
{
IsCheck = true;
}
optionList.Add(new
{
tItem.LevelId,
tItem.LevelTitle,
tItem.LevelDesc,
IsCheck,
tItem.LevelScore,
});
}
var temp_JiaoXue = tempDetail?.Where(qitem => qitem.CheckType == CheckTypeEnum.JiaoXueManager)?.FirstOrDefault();
var temp_JiaoWu = tempDetail?.Where(qitem => qitem.CheckType == CheckTypeEnum.JiaoWuManager)?.FirstOrDefault();
S_JiaoWu_Id = temp_JiaoWu?.CreateBy ?? 0;
S_JiaoWu_Time = temp_JiaoWu?.CreateTime ?? null;
S_JiaoXue_Id = temp_JiaoXue?.CreateBy ?? 0;
S_JiaoXue_Time = temp_JiaoXue?.CreateTime ?? null;
var sObj = new
{
CheckId = tempDetail.Select(qitem => qitem.CheckId),
S_JiaoWuScore = temp_JiaoWu?.CheckScore ?? 0,
S_TeacherScore = temp_JiaoXue?.CheckScore ?? 0,
AssessmentSubtypeId = subItem.Id,
subItem.SubTypeName,
OptionList = optionList,
};
subList.Add(sObj);
}
var obj = new
{
item.TypeName,
AssessmentTypeId = item.Id,
SubtypeList = subList
};
list.Add(obj);
}
var empList = accountRepository.GetEmployeeListRepository(new Employee_ViewModel() { QIds = S_JiaoWu_Id + "," + S_JiaoXue_Id });
result = new
{
Id = extModel?.Id ?? 0,
YearStr = extModel?.YearStr ?? 0,
MonthStr = extModel?.MonthStr ?? 0,
TeacherAccountId = extModel?.TeacherAccountId ?? 0,
TeacherScore = extModel?.TeacherScore ?? 0,
JiaoWuScore = extModel?.JiaoWuScore ?? 0,
TotalScore = extModel?.TotalScore ?? 0,
Behavior = extModel?.Behavior ?? "",
Advantage = extModel?.Advantage ?? "",
ShortComing = extModel?.ShortComing ?? "",
Potential = extModel?.Potential ?? "",
PotentialOther = extModel?.PotentialOther ?? "",
Help = extModel?.Help ?? "",
Suggest = extModel?.Suggest ?? "",
Other = extModel?.Other ?? "",
TeacherSignDate = Common.ConvertHelper.FormatTime(extModel?.TeacherSignDate),
AuditStatus = extModel?.AuditStatus ?? 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 ?? "",
S_JiaoWu_Time = Common.ConvertHelper.FormatTime(S_JiaoWu_Time),
S_JiaoWu_CreateByName = empList?.Where(qitem => qitem.Id == S_JiaoWu_Id)?.FirstOrDefault()?.EmployeeName ?? "",
};
return result;
}
/// <summary> /// <summary>
/// 保存老师业绩考核 /// 保存老师业绩考核
/// </summary> /// </summary>
...@@ -416,6 +517,9 @@ namespace Edu.Module.User ...@@ -416,6 +517,9 @@ namespace Edu.Module.User
} }
return flag; return flag;
} }
#endregion #endregion
} }
} }
\ No newline at end of file
Edu.WebApi/Controllers/DataService/TeacherAssessmentController.cs
View file @ 21f1905a
...@@ -206,9 +206,16 @@ namespace Edu.WebApi.Controllers.DataService ...@@ -206,9 +206,16 @@ namespace Edu.WebApi.Controllers.DataService
return ApiResult.Success(data: obj); return ApiResult.Success(data: obj);
} }
/// <summary>
/// 根据编号获取教师考核详情
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetTeacherAssessmentDetail() public ApiResult GetTeacherAssessmentDetail()
{ {
return ApiResult.Failed(); int Id = base.ParmJObj.GetInt("Id");
var model = teacherAssessmentModule.GetTeacherAssessmentDetailModule(Id);
return ApiResult.Success(data: model);
} }
/// <summary> /// <summary>
...@@ -258,7 +265,7 @@ namespace Edu.WebApi.Controllers.DataService ...@@ -258,7 +265,7 @@ namespace Edu.WebApi.Controllers.DataService
JObject tObj = JObject.Parse(subItem.ToString()); JObject tObj = JObject.Parse(subItem.ToString());
var dModel = new RB_Teacher_Assessment_Details_Extend() var dModel = new RB_Teacher_Assessment_Details_Extend()
{ {
Id = sObj.GetInt("Id"), Id = tObj.GetInt("Id"),
AssessmentTypeId = sObj.GetInt("AssessmentTypeId"), AssessmentTypeId = sObj.GetInt("AssessmentTypeId"),
AssessmentSubTypeId = tObj.GetInt("AssessmentSubtypeId"), AssessmentSubTypeId = tObj.GetInt("AssessmentSubtypeId"),
CheckId = tObj.GetInt("CheckId"), CheckId = tObj.GetInt("CheckId"),
......
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