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 14a26b38d..9728cb408 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 @@ -3,21 +3,25 @@ Layout = "~/Views/Shared/_Form.cshtml"; }
+
+
组织培训单位
+ +
教师姓名*
培训开始时间*
- +
培训结束时间*
- +
培训内容*
- +
培训机构*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTrain/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTrain/Index.js index f62d65d1f..569b4f213 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTrain/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTrain/Index.js @@ -69,6 +69,7 @@ var bootstrap = function ($, learun) { $('#gridtable').lrAuthorizeJfGrid({ url: top.$.rootUrl + '/PersonnelManagement/TeacherTrain/GetPageList', headData: [ + { label: "培训组织单位", name: "TTUnit", width: 100, align: "left" }, { label: "教师姓名", name: "EID", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { 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 bef77f791..78eead673 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 @@ -11,7 +11,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement /// 日 期:2019-03-19 11:34 /// 描 述:教师培训信息 /// - public class TeacherTrainEntity + public class TeacherTrainEntity { #region 实体成员 /// @@ -69,6 +69,12 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement /// [Column("TTLEVEL")] public int? TTLevel { get; set; } + /// + /// 培训组织单位 + /// + [Column("TTUNIT")] + public string TTUnit { get; set; } + #endregion #region 扩展操作 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherTrain/TeacherTrainService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherTrain/TeacherTrainService.cs index e4e1a386f..78b3cf34e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherTrain/TeacherTrainService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherTrain/TeacherTrainService.cs @@ -32,18 +32,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement { var strSql = new StringBuilder(); strSql.Append("SELECT "); - strSql.Append(@" - t.TTID, - t.EID, - t.TTStartTime, - t.TTEndTime, - t.TTContent, - t.TTOrganization, - t.TTWay, - t.TTCertificates, - t.TTComment, - t.TTLevel - "); + strSql.Append(@" * "); strSql.Append(" FROM TeacherTrain t "); strSql.Append(" WHERE 1=1 "); var queryParam = queryJson.ToJObject();