@@ -26,7 +26,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers | |||||
[HttpGet] | [HttpGet] | ||||
public ActionResult Index() | public ActionResult Index() | ||||
{ | { | ||||
return View(); | |||||
return View(); | |||||
} | } | ||||
/// <summary> | /// <summary> | ||||
/// 表单页 | /// 表单页 | ||||
@@ -35,7 +35,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers | |||||
[HttpGet] | [HttpGet] | ||||
public ActionResult Form() | public ActionResult Form() | ||||
{ | { | ||||
return View(); | |||||
return View(); | |||||
} | } | ||||
#endregion | #endregion | ||||
@@ -69,8 +69,9 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers | |||||
[AjaxOnly] | [AjaxOnly] | ||||
public ActionResult GetFormData(string keyValue) | public ActionResult GetFormData(string keyValue) | ||||
{ | { | ||||
var TeacherTrainData = teacherTrainIBLL.GetTeacherTrainEntity( keyValue ); | |||||
var jsonData = new { | |||||
var TeacherTrainData = teacherTrainIBLL.GetTeacherTrainEntity(keyValue); | |||||
var jsonData = new | |||||
{ | |||||
TeacherTrain = TeacherTrainData, | TeacherTrain = TeacherTrainData, | ||||
}; | }; | ||||
return Success(jsonData); | return Success(jsonData); | ||||
@@ -102,7 +103,12 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers | |||||
public ActionResult SaveForm(string keyValue, string strEntity) | public ActionResult SaveForm(string keyValue, string strEntity) | ||||
{ | { | ||||
TeacherTrainEntity entity = strEntity.ToObject<TeacherTrainEntity>(); | TeacherTrainEntity entity = strEntity.ToObject<TeacherTrainEntity>(); | ||||
teacherTrainIBLL.SaveEntity(keyValue,entity); | |||||
if (string.IsNullOrEmpty(keyValue)) | |||||
{ | |||||
entity.TTEnCode = CommonHelper.CreateNo(); | |||||
} | |||||
teacherTrainIBLL.SaveEntity(keyValue, entity); | |||||
return Success("保存成功!"); | return Success("保存成功!"); | ||||
} | } | ||||
#endregion | #endregion | ||||
@@ -35,10 +35,14 @@ | |||||
<div class="lr-form-item-title">所获证书<font face="宋体">*</font></div> | <div class="lr-form-item-title">所获证书<font face="宋体">*</font></div> | ||||
<input id="TTCertificates" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" /> | <input id="TTCertificates" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" /> | ||||
</div> | </div> | ||||
<div class="col-xs-12 lr-form-item" data-table="TeacherTrain"> | |||||
<div class="col-xs-6 lr-form-item" data-table="TeacherTrain"> | |||||
<div class="lr-form-item-title">培训级别<font face="宋体">*</font></div> | <div class="lr-form-item-title">培训级别<font face="宋体">*</font></div> | ||||
<div id="TTLevel" isvalid="yes" checkexpession="NotNull"></div> | <div id="TTLevel" isvalid="yes" checkexpession="NotNull"></div> | ||||
</div> | </div> | ||||
<div class="col-xs-6 lr-form-item" data-table="TeacherTrain"> | |||||
<div class="lr-form-item-title">培训人数<font face="宋体">*</font></div> | |||||
<input id="TTEmpNum" type="number" class="form-control" isvalid="yes" checkexpession="NotNull" /> | |||||
</div> | |||||
<div class="col-xs-12 lr-form-item" data-table="TeacherTrain"> | <div class="col-xs-12 lr-form-item" data-table="TeacherTrain"> | ||||
<div class="lr-form-item-title">备注</div> | <div class="lr-form-item-title">备注</div> | ||||
<input id="TTComment" type="text" class="form-control" /> | <input id="TTComment" type="text" class="form-control" /> | ||||
@@ -12,6 +12,7 @@ using Learun.Application.Organization; | |||||
using Learun.Application.Base.SystemModule; | using Learun.Application.Base.SystemModule; | ||||
using Learun.Application.TwoDevelopment.EducationalAdministration; | using Learun.Application.TwoDevelopment.EducationalAdministration; | ||||
using Learun.Cache.Redis; | using Learun.Cache.Redis; | ||||
using Learun.Application.TwoDevelopment.PersonnelManagement; | |||||
namespace Learun.Application.TwoDevelopment.LR_Desktop | namespace Learun.Application.TwoDevelopment.LR_Desktop | ||||
{ | { | ||||
@@ -449,22 +450,28 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop | |||||
{ | { | ||||
//校区信息 | //校区信息 | ||||
var company = this.BaseRepository().FindList<CompanyEntity>(x => x.F_DeleteMark == 0 && x.F_EnabledMark == 1).FirstOrDefault(); | var company = this.BaseRepository().FindList<CompanyEntity>(x => x.F_DeleteMark == 0 && x.F_EnabledMark == 1).FirstOrDefault(); | ||||
//教材数据 | |||||
var textBookInfo = this.BaseRepository("CollegeMIS").FindList<TextBookInfoEntity>(x => x.IsValid == true && x.IsDel == 0); | |||||
//教师培训数据 | |||||
var teacherTrain = this.BaseRepository().FindList<TeacherTrainEntity>(); | |||||
ParamModel paramModel = new ParamModel(); | ParamModel paramModel = new ParamModel(); | ||||
paramModel.dataObjName = "ods_jxpxsj"; | paramModel.dataObjName = "ods_jxpxsj"; | ||||
var list = new List<object>(); | var list = new List<object>(); | ||||
foreach (var book in textBookInfo) | |||||
foreach (var data in teacherTrain) | |||||
{ | { | ||||
var param = new | var param = new | ||||
{ | { | ||||
//gzzyqksjid = book.ID, | |||||
//xxjgdm = company.F_USCreditCode, | |||||
//xxjgmc = company.F_FullName, | |||||
//sjcjsj = DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss") | |||||
gzzyqksjid = data.TTID, | |||||
xxjgdm = company.F_USCreditCode, | |||||
xxjgmc = company.F_FullName, | |||||
jxpxhdbh = data.TTEnCode, | |||||
jxpxhdmc = data.TTContent, | |||||
jxpxhdzt = "", | |||||
jxpxhdnrjj = "", | |||||
jxpxhdsj = data.TTStartTime, | |||||
zjr = "", | |||||
drpxhdcyjss = data.TTEmpNum, | |||||
sjcjsj = DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss") | |||||
}; | }; | ||||
list.Add(param); | list.Add(param); | ||||
} | } | ||||
@@ -25,6 +25,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement | |||||
[Column("EID")] | [Column("EID")] | ||||
public string EID { get; set; } | public string EID { get; set; } | ||||
/// <summary> | /// <summary> | ||||
/// TTEnCode | |||||
/// </summary> | |||||
[Column("TTENCODE")] | |||||
public string TTEnCode { get; set; } | |||||
/// <summary> | |||||
/// EName | /// EName | ||||
/// </summary> | /// </summary> | ||||
[Column("ENAME")] | [Column("ENAME")] | ||||
@@ -74,6 +79,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement | |||||
/// </summary> | /// </summary> | ||||
[Column("TTUNIT")] | [Column("TTUNIT")] | ||||
public string TTUnit { get; set; } | public string TTUnit { get; set; } | ||||
/// <summary> | |||||
/// 当日培训参与老师数 | |||||
/// </summary> | |||||
[Column("TTEMPNUM")] | |||||
public int? TTEmpNum { get; set; } | |||||
#endregion | #endregion | ||||