From 696b7e25bf39a6acc415f57a3f7418bb7428d587 Mon Sep 17 00:00:00 2001 From: ndbs Date: Thu, 13 Oct 2022 15:35:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=BC=80=E6=8B=9B=E8=81=98=20?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=96=87=E4=BB=B6=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/HiringRegistration/Index.js | 35 +++++++++++++++++++ .../HiringRegistrationEntity.cs | 14 ++++++-- .../HiringRegistrationService.cs | 1 + .../WorkStaff/WorkStaffEntity.cs | 5 +++ .../WorkStaff/WorkStaffService.cs | 1 + 5 files changed, 54 insertions(+), 2 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/HiringRegistration/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/HiringRegistration/Index.js index 7ec782af9..5bfaeaf82 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/HiringRegistration/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/HiringRegistration/Index.js @@ -109,6 +109,33 @@ var bootstrap = function ($, learun) { { label: "邮政编码", name: "PostalCode", width: 100, align: "left" }, { label: "联系电话", name: "Mobile", width: 100, align: "left" }, { label: "实践与成绩", name: "Achievement", width: 100, align: "left" }, + { + label: "附件", name: "FilePath", width: 500, align: "center", + formatterAsync: function (callback, value, row, op, $cell) { + $.ajax({ + url: '/LR_SystemModule/Annexes/GetAnnexesFileList', + data: { folderId: value }, + type: 'GET', + dataType: "json", + async: false, + cache: false, + success: function (res) { + var bb = ''; + //$.each(res.data, function (i, item) { + // bb += item.F_FileName.substring(0, item.F_FileName.indexOf(".")) + ',' + //}) + $.each(res.data, function (i, item) { + bb += '' + + item.F_FileName.substring(0, item.F_FileName.indexOf(".")) + + ',   '; + }) + callback(bb); + } + }); + } + }, ], mainId: 'ID', isPage: true, @@ -127,3 +154,11 @@ var bootstrap = function ($, learun) { }; page.init(); } +function downLoad(fileId, fileTwo) { + if (fileTwo) { + top.learun.postFormSilence(top.$.rootUrl + '/PersonnelManagement/MP_QualityObjectives/AddRecord', { fileId: fileTwo }, function () { + + }); + } + top.learun.download({ url: top.$.rootUrl + '/LR_SystemModule/Annexes/DownAnnexesFile', param: { fileId: fileId, __RequestVerificationToken: $.lrToken }, method: 'POST' }); +} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/HiringRegistration/HiringRegistrationEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/HiringRegistration/HiringRegistrationEntity.cs index 534d4a7b4..c92b04097 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/HiringRegistration/HiringRegistrationEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/HiringRegistration/HiringRegistrationEntity.cs @@ -70,16 +70,26 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration [Column("MAJOR")] public string Major { get; set; } /// - /// 资格 + /// 职称 /// [Column("QUALIFICATION")] public string Qualification { get; set; } /// + /// 资格 + /// + [Column("NVQ")] + public string NVQ { get; set; } + /// /// 取得时间 /// [Column("GETTIME")] public DateTime? GetTime { get; set; } /// + /// 获取时间 + /// + [Column("GRADUATIONTIME")] + public DateTime? GraduationTime { get; set; } + /// /// 户籍所在地 /// [Column("DOMICILE")] @@ -143,7 +153,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// CreateTime /// [Column("CREATETIME")] - public string CreateTime { get; set; } + public DateTime? CreateTime { get; set; } /// /// Remark /// diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/HiringRegistration/HiringRegistrationService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/HiringRegistration/HiringRegistrationService.cs index 878f568c6..b2c83a02a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/HiringRegistration/HiringRegistrationService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/HiringRegistration/HiringRegistrationService.cs @@ -173,6 +173,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration else { entity.Create(); + entity.CreateTime = DateTime.Now; this.BaseRepository("CollegeMIS").Insert(entity); } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WorkStaff/WorkStaffEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WorkStaff/WorkStaffEntity.cs index e5e4599a7..16aed27dc 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WorkStaff/WorkStaffEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WorkStaff/WorkStaffEntity.cs @@ -146,6 +146,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [Column("FILEPATH")] public string FilePath { get; set; } + /// + /// CreateTime + /// + [Column("CREATETIME")] + public DateTime? CreateTime { get; set; } #endregion #region 扩展操作 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WorkStaff/WorkStaffService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WorkStaff/WorkStaffService.cs index 3d323e818..b64c4dda3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WorkStaff/WorkStaffService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WorkStaff/WorkStaffService.cs @@ -162,6 +162,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration else { entity.Create(); + entity.CreateTime = DateTime.Now; this.BaseRepository("CollegeMIS").Insert(entity); } }