Explorar el Código

教师进修培训

临城职教中职
zhangli hace 2 años
padre
commit
85d7397c4c
Se han modificado 4 ficheros con 41 adiciones y 14 borrados
  1. +11
    -5
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherTrainController.cs
  2. +5
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTrain/Form.cshtml
  3. +15
    -8
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/DataCollection/DataCollectionService.cs
  4. +10
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherTrain/TeacherTrainEntity.cs

+ 11
- 5
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherTrainController.cs Ver fichero

@@ -26,7 +26,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
[HttpGet]
public ActionResult Index()
{
return View();
return View();
}
/// <summary>
/// 表单页
@@ -35,7 +35,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
[HttpGet]
public ActionResult Form()
{
return View();
return View();
}
#endregion

@@ -69,8 +69,9 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
[AjaxOnly]
public ActionResult GetFormData(string keyValue)
{
var TeacherTrainData = teacherTrainIBLL.GetTeacherTrainEntity( keyValue );
var jsonData = new {
var TeacherTrainData = teacherTrainIBLL.GetTeacherTrainEntity(keyValue);
var jsonData = new
{
TeacherTrain = TeacherTrainData,
};
return Success(jsonData);
@@ -102,7 +103,12 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
public ActionResult SaveForm(string keyValue, string strEntity)
{
TeacherTrainEntity entity = strEntity.ToObject<TeacherTrainEntity>();
teacherTrainIBLL.SaveEntity(keyValue,entity);
if (string.IsNullOrEmpty(keyValue))
{
entity.TTEnCode = CommonHelper.CreateNo();
}

teacherTrainIBLL.SaveEntity(keyValue, entity);
return Success("保存成功!");
}
#endregion


+ 5
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTrain/Form.cshtml Ver fichero

@@ -35,10 +35,14 @@
<div class="lr-form-item-title">所获证书<font face="宋体">*</font></div>
<input id="TTCertificates" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
</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 id="TTLevel" isvalid="yes" checkexpession="NotNull"></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="lr-form-item-title">备注</div>
<input id="TTComment" type="text" class="form-control" />


+ 15
- 8
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/DataCollection/DataCollectionService.cs Ver fichero

@@ -12,6 +12,7 @@ using Learun.Application.Organization;
using Learun.Application.Base.SystemModule;
using Learun.Application.TwoDevelopment.EducationalAdministration;
using Learun.Cache.Redis;
using Learun.Application.TwoDevelopment.PersonnelManagement;

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 textBookInfo = this.BaseRepository("CollegeMIS").FindList<TextBookInfoEntity>(x => x.IsValid == true && x.IsDel == 0);
//教师培训数据
var teacherTrain = this.BaseRepository().FindList<TeacherTrainEntity>();

ParamModel paramModel = new ParamModel();
paramModel.dataObjName = "ods_jxpxsj";

var list = new List<object>();
foreach (var book in textBookInfo)
foreach (var data in teacherTrain)
{
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);
}


+ 10
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherTrain/TeacherTrainEntity.cs Ver fichero

@@ -25,6 +25,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
[Column("EID")]
public string EID { get; set; }
/// <summary>
/// TTEnCode
/// </summary>
[Column("TTENCODE")]
public string TTEnCode { get; set; }
/// <summary>
/// EName
/// </summary>
[Column("ENAME")]
@@ -74,6 +79,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
/// </summary>
[Column("TTUNIT")]
public string TTUnit { get; set; }
/// <summary>
/// 当日培训参与老师数
/// </summary>
[Column("TTEMPNUM")]
public int? TTEmpNum { get; set; }

#endregion



Cargando…
Cancelar
Guardar