From 85d7397c4cbddcdfb5efd60cc62d59ba5b3da675 Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Tue, 26 Jul 2022 14:47:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=99=E5=B8=88=E8=BF=9B=E4=BF=AE=E5=9F=B9?= =?UTF-8?q?=E8=AE=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/TeacherTrainController.cs | 16 +++++++++---- .../Views/TeacherTrain/Form.cshtml | 6 ++++- .../DataCollection/DataCollectionService.cs | 23 ++++++++++++------- .../TeacherTrain/TeacherTrainEntity.cs | 10 ++++++++ 4 files changed, 41 insertions(+), 14 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherTrainController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherTrainController.cs index 4e077d511..d65e7c2b0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherTrainController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeacherTrainController.cs @@ -26,7 +26,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers [HttpGet] public ActionResult Index() { - return View(); + return View(); } /// /// 表单页 @@ -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(); - teacherTrainIBLL.SaveEntity(keyValue,entity); + if (string.IsNullOrEmpty(keyValue)) + { + entity.TTEnCode = CommonHelper.CreateNo(); + } + + teacherTrainIBLL.SaveEntity(keyValue, entity); return Success("保存成功!"); } #endregion diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTrain/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTrain/Form.cshtml index 3565206ae..8aae66314 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTrain/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTrain/Form.cshtml @@ -35,10 +35,14 @@
所获证书*
-
+
培训级别*
+
+
培训人数*
+ +
备注
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/DataCollection/DataCollectionService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/DataCollection/DataCollectionService.cs index c4aad960b..0a0c40281 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/DataCollection/DataCollectionService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/DataCollection/DataCollectionService.cs @@ -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(x => x.F_DeleteMark == 0 && x.F_EnabledMark == 1).FirstOrDefault(); - //教材数据 - var textBookInfo = this.BaseRepository("CollegeMIS").FindList(x => x.IsValid == true && x.IsDel == 0); + //教师培训数据 + var teacherTrain = this.BaseRepository().FindList(); ParamModel paramModel = new ParamModel(); paramModel.dataObjName = "ods_jxpxsj"; var list = new List(); - 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); } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherTrain/TeacherTrainEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherTrain/TeacherTrainEntity.cs index 78eead673..618e27c53 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherTrain/TeacherTrainEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherTrain/TeacherTrainEntity.cs @@ -25,6 +25,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement [Column("EID")] public string EID { get; set; } /// + /// TTEnCode + /// + [Column("TTENCODE")] + public string TTEnCode { get; set; } + /// /// EName /// [Column("ENAME")] @@ -74,6 +79,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement /// [Column("TTUNIT")] public string TTUnit { get; set; } + /// + /// 当日培训参与老师数 + /// + [Column("TTEMPNUM")] + public int? TTEmpNum { get; set; } #endregion