diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherPunishment/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherPunishment/Form.cshtml index 63a6acaf1..495ed2fe0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherPunishment/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherPunishment/Form.cshtml @@ -3,25 +3,29 @@ Layout = "~/Views/Shared/_Form.cshtml"; }
-
+
教师*
-
+
-
+
+
处分文号
+ +
+
处分名称*
-
+
处分原因
- +
-
+
处分开始时间*
- +
-
+
处分结束时间*
- +
@Html.AppendJsFile("/Areas/PersonnelManagement/Views/TeacherPunishment/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherPunishment/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherPunishment/Index.js index 23fd491fb..720381623 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherPunishment/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherPunishment/Index.js @@ -78,10 +78,11 @@ var bootstrap = function ($, learun) { } }); }}, - { label: "处分名称", name: "PunishmentName", width: 100, align: "left"}, - { label: "处分原因", name: "Reason", width: 100, align: "left"}, - { label: "处分开始时间", name: "StartTime", width: 100, align: "left"}, - { label: "处分结束时间", name: "EndTime", width: 100, align: "left"}, + { label: "处分文号", name: "Proof", width: 200, align: "left"}, + { label: "处分名称", name: "PunishmentName", width: 200, align: "left"}, + { label: "处分原因", name: "Reason", width: 200, align: "left"}, + { label: "处分开始时间", name: "StartTime", width: 200, align: "left"}, + { label: "处分结束时间", name: "EndTime", width: 200, align: "left"}, ], mainId:'Id', isPage: true diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherPunishment/TeacherPunishmentEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherPunishment/TeacherPunishmentEntity.cs index d71d5a44c..ea84dadbe 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherPunishment/TeacherPunishmentEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherPunishment/TeacherPunishmentEntity.cs @@ -25,6 +25,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement [Column("EMPID")] public string EmpId { get; set; } /// + /// 文号 + /// + [Column("PROOF")] + public string Proof { get; set; } + /// /// 处分名称 /// [Column("PUNISHMENTNAME")] diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherPunishment/TeacherPunishmentService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherPunishment/TeacherPunishmentService.cs index 2ed02b692..ba616061e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherPunishment/TeacherPunishmentService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherPunishment/TeacherPunishmentService.cs @@ -32,14 +32,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement { var strSql = new StringBuilder(); strSql.Append("SELECT "); - strSql.Append(@" - t.Id, - t.EmpId, - t.PunishmentName, - t.Reason, - t.StartTime, - t.EndTime - "); + strSql.Append(@" * "); strSql.Append(" FROM TeacherPunishment t "); strSql.Append(" WHERE 1=1 "); var queryParam = queryJson.ToJObject();