From 3fa41a9b8c2de8cc55828ad8549012d7bd2cd909 Mon Sep 17 00:00:00 2001 From: dyy <18335927079@163.com> Date: Mon, 31 Aug 2020 16:48:23 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=95=99=E5=B8=88=E8=81=8C=E7=A7=B0?= =?UTF-8?q?=E8=AF=84=E5=AE=9A=E7=AE=A1=E7=90=86=EF=BC=9A=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=B5=84=E6=96=99=E4=B8=8A=E4=BC=A0=EF=BC=9B=E5=AD=A6=E7=B1=8D?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=AE=A1=E7=90=86=EF=BC=9A=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=AE=80=E5=8E=86=E8=A1=A8=E6=89=93=E5=8D=B0=EF=BC=9B=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E6=8E=A7=E4=BB=B6=EF=BC=9A=E5=A2=9E=E5=8A=A0=E9=A2=84?= =?UTF-8?q?=E8=A7=88=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/StuInfoBasicController.cs | 44 ++++++ .../OpenLessonPlanOfElective/MergeIndex.js | 24 +-- .../Views/StuInfoBasic/Index.cshtml | 1 + .../Views/StuInfoBasic/Index.js | 19 +++ .../Views/StuInfoBasic/Print.cshtml | 148 ++++++++++++++++++ .../Views/StuInfoBasic/Print.css | 81 ++++++++++ .../Controllers/ResourceFileController.cs | 29 +++- .../Controllers/AnnexesController.cs | 110 ++++++++++++- .../Views/Annexes/UploadForm.js | 3 + .../Views/TeacherTitleEvaluation/Form.cshtml | 37 +++-- .../Views/TeacherTitleEvaluation/Form.js | 4 + .../Views/TeacherTitleEvaluation/Index.js | 8 +- .../Learun.Application.Web.csproj | 2 + .../LR_Content/plugin/uploader/lr-uploader.js | 46 +++++- .../SystemModule/Annexes/AnnexesFileBLL.cs | 16 +- .../SystemModule/Annexes/AnnexesFileIBLL.cs | 4 +- .../Annexes/AnnexesFileService.cs | 11 +- .../File/FilePreview/FilePreviewBLL.cs | 18 +++ .../File/FilePreview/FilePreviewIBLL.cs | 5 + .../OpenLessonPlanOfElectiveService.cs | 6 +- .../StuEncourgement/StuEncourgementBLL.cs | 23 +++ .../StuEncourgement/StuEncourgementIBLL.cs | 6 + .../StuEncourgement/StuEncourgementService.cs | 26 ++- .../StuInfoBasic/StuInfoBasicEntity.cs | 15 ++ .../StuPunishment/StuPunishmentBLL.cs | 23 +++ .../StuPunishment/StuPunishmentIBLL.cs | 6 + .../StuPunishment/StuPunishmentService.cs | 24 +++ .../TeacherTitleEvaluationEntity.cs | 20 +++ .../TeacherTitleEvaluationService.cs | 7 +- 29 files changed, 710 insertions(+), 56 deletions(-) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Print.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Print.css diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasicController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasicController.cs index 42c14e0fc..bb578e616 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasicController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasicController.cs @@ -7,6 +7,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using Learun.Application.Base.SystemModule; +using static Learun.Application.TwoDevelopment.EducationalAdministration.StuInfoBasicEntity; namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { @@ -22,6 +23,9 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers private StuInfoBasicIBLL stuInfoBasicIBLL = new StuInfoBasicBLL(); private ArrangeLessonSyncIBLL arrangeLessonSyncIBLL = new ArrangeLessonSyncBLL(); private AnnexesFileIBLL annexesFileIbll = new AnnexesFileBLL(); + private StuEncourgementIBLL stuEncourgementIBLL = new StuEncourgementBLL(); + private StuPunishmentIBLL stuPunishmentIBLL = new StuPunishmentBLL(); + private StuScoreIBLL stuScoreIBLL = new StuScoreBLL(); #region 视图功能 @@ -96,8 +100,48 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + /// + /// 打印 + /// + /// + [HttpGet] + public ActionResult Print(string keyValue) + { + var stuInfoBasicEntity = stuInfoBasicIBLL.GetStuInfoBasicEntity(keyValue); + if (stuInfoBasicEntity == null) + { + return View(new StuInfoBasicEntity()); + } + //头像 + stuInfoBasicEntity.Photo = annexesFileIbll.GetEntityByFolderId(stuInfoBasicEntity.Photo)?.F_FilePath; + if (!string.IsNullOrEmpty(stuInfoBasicEntity.Photo)) + { + stuInfoBasicEntity.Photo = stuInfoBasicEntity.Photo.Substring(stuInfoBasicEntity.Photo.IndexOf("Resource") - 1); + } + //奖罚情况 + stuInfoBasicEntity.StuEncourgementList = stuEncourgementIBLL.GetEncourgementListByStuNo(stuInfoBasicEntity.StuNo).OrderBy(x => x.AcademicYearNo).ThenBy(x => x.Semester).ToList(); + stuInfoBasicEntity.StuPunishmentList = stuPunishmentIBLL.GetPunishmentListByStuNo(stuInfoBasicEntity.StuNo).OrderBy(x => x.AcademicYearNo).ThenBy(x => x.Semester).ToList(); + //学习成绩 + stuInfoBasicEntity.StuScoreClassOneList = stuScoreIBLL.GetAllScoreListByStuNo(stuInfoBasicEntity.StuNo) + .Where(x => x.AcademicYearNo != null && x.Semester != null && x.Score != null) + .GroupBy(x => new { x.AcademicYearNo, x.Semester }) + .Select(x => new StuScoreClassOne() + { + AcademicYearNo = x.Key.AcademicYearNo, + Semester = x.Key.Semester, + StuScoreList = x.Select(y => new StuScoreEntity() + { + LessonNo = y.LessonNo, + LessonName = y.LessonName, + Score = y.Score + }).OrderBy(xx => xx.LessonNo).ToList() + }).OrderBy(xx => xx.AcademicYearNo).ThenBy(xx => xx.Semester).ToList(); + + return View(stuInfoBasicEntity); + } #endregion + #region 获取数据 /// /// 生成帐号 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OpenLessonPlanOfElective/MergeIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OpenLessonPlanOfElective/MergeIndex.js index 055f0fb1b..a0be91c73 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OpenLessonPlanOfElective/MergeIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OpenLessonPlanOfElective/MergeIndex.js @@ -218,18 +218,18 @@ var bootstrap = function ($, learun) { { label: "通过人数", name: "StuNum", width: 60, align: "left" }, { label: "已报人数(预)", name: "StuNumOfApplyPre", width: 80, align: "left" }, { label: "通过人数(预)", name: "StuNumPre", width: 80, align: "left" }, - { - label: "选课专业", name: "ElectiveMajorList", width: 150, align: "left",formatter: function (cellvalue,row) { - var str = ""; - for (var i = 0; i < row.ElectiveMajorList.length; i++) { - str += row.ElectiveMajorList[i].Grade + "级" + row.ElectiveMajorList[i].MajorName; - if (i != row.ElectiveMajorList.length - 1) { - str += ","; - } - } - return str; - } - } + //{ + // label: "选课专业", name: "ElectiveMajorList", width: 150, align: "left",formatter: function (cellvalue,row) { + // var str = ""; + // for (var i = 0; i < row.ElectiveMajorList.length; i++) { + // str += row.ElectiveMajorList[i].Grade + "级" + row.ElectiveMajorList[i].MajorName; + // if (i != row.ElectiveMajorList.length - 1) { + // str += ","; + // } + // } + // return str; + // } + //} ], mainId: 'Id', isPage: true, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.cshtml index c3a8576a5..85e50b95a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.cshtml @@ -52,6 +52,7 @@  同步照片  查看异动  拍照 +  学生简历表 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js index a90565360..3680cd302 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js @@ -198,6 +198,25 @@ var bootstrap = function ($, learun) { }) + //打印简历表 + $('#lr_printInfo').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('StuId'); + if (learun.checkrow(keyValue)) { + if (keyValue.indexOf(',') != -1) { + learun.alert.warning("只能选择一条记录进行查看！"); + return; + } + learun.layerForm({ + id: 'print', + title: '学生简历表', + url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/Print?keyValue=' + keyValue, + width: 1100, + height: 800, + btn: null + }); + } + }); + }, // 初始化列表 initGird: function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Print.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Print.cshtml new file mode 100644 index 000000000..ca74ee8ab --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Print.cshtml @@ -0,0 +1,148 @@ +@model Learun.Application.TwoDevelopment.EducationalAdministration.StuInfoBasicEntity + + + + + + + 学生简历表 + @Html.AppendCssFile("/Areas/EducationalAdministration/Views/StuInfoBasic/Print.css") + + + +
+
+
学生简历表
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
姓名@Model.StuName学号@Model.StuNo性别@Model.GenderNo +
+
出生日期@(Model.Birthday.HasValue ? Model.Birthday.Value.ToShortDateString().Replace("/", "-") : "")民族@Model.NationalityNo年级@Model.Grade
系@Model.DeptNo专业@Model.MajorNo班级@Model.ClassNo
身份证号@Model.IdentityCardNo报到日期@(Model.RegisterDate.HasValue ? Model.RegisterDate.Value.ToShortDateString().Replace("/", "-") : "")
奖罚情况 + @foreach (var item in Model.StuEncourgementList) + { +
@(Model.StuEncourgementList.IndexOf(item) + 1)、@item.AcademicYearNo 学年第 @item.Semester 学期：@item.EncourgeDate.Value.ToShortDateString().Replace("/", "-") @item.EncourgeName @item.Fee
+ } + @foreach (var item in Model.StuPunishmentList) + { +
@(Model.StuPunishmentList.IndexOf(item) + 1 + Model.StuEncourgementList.Count())、@item.AcademicYearNo 学年第 @item.Semester 学期：@item.PunishDate.Value.ToShortDateString().Replace("/", "-") @item.PunishName
+ } +
学习成绩 + @foreach (var item in Model.StuScoreClassOneList) + { +
@item.AcademicYearNo 学年第 @item.Semester 学期
+ foreach (var i in item.StuScoreList) + { +
@i.LessonName:@i.Score分;
+ } + } +
+
+ +
+
打印
+ + + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Print.css b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Print.css new file mode 100644 index 000000000..b57f9b8d7 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Print.css @@ -0,0 +1,81 @@ +table, +tr, +td { + padding: 0; + margin: 0; + border-collapse: collapse; +} + +table { + table-layout: fixed; + font-size: 14px; +} + +.tableT { + text-align: center; + font-size: 20px; + margin-bottom: 15px; +} + +.table { + width: 100%; + text-align: center; + border-top: 1px solid #000; + border-right: 1px solid #000; +} + + .table tr { + border-bottom: 1px solid #000; + } + + .table td { + border-left: 1px solid #000; + line-height: 20px; + padding: 8px 5px; + } + +.tableImg { + height: 0; + overflow: hidden; + padding-bottom: 140%; +} + +.table img { + width: 100%; +} + +.tableTxt { + text-align: left; +} + +.table .table { + border: 0; +} + + .table .table tr:last-child { + border-bottom: 0; + } + + .table .table td:first-child { + border-left: 0; + } + +.btn { + width: 100px; + height: 34px; + line-height: 34px; + text-align: center; + margin: 30px auto; + border: 1px solid #ccc; + cursor: pointer; + border-radius: 4px; +} + +.tableBox { + width: 90%; + margin: 30px auto; +} + +#table { + /* display: none; */ +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Controllers/ResourceFileController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Controllers/ResourceFileController.cs index b04280157..8137f8560 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Controllers/ResourceFileController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Controllers/ResourceFileController.cs @@ -452,6 +452,10 @@ namespace Learun.Application.Web.Areas.LR_OAModule.Controllers public void PreviewFile(string fileId) { var data = fileInfoBLL.GetEntity(fileId); + if (data == null) + { + return; + } string filename = Server.UrlDecode(data.F_FileName);//客户端保存的文件名 string filepath = DirFileHelper.GetAbsolutePath(data.F_FilePath);//路径 if (data.F_FileType == "xlsx" || data.F_FileType == "xls") @@ -470,11 +474,23 @@ namespace Learun.Application.Web.Areas.LR_OAModule.Controllers filePreviewIBLL.GetWordData(DirFileHelper.GetAbsolutePath(data.F_FilePath)); } } - FileStream files = new FileStream(filepath, FileMode.Open); - byte[] fileByte = new byte[files.Length]; - files.Read(fileByte, 0, fileByte.Length); - files.Close(); - System.IO.MemoryStream ms = new MemoryStream(fileByte, 0, fileByte.Length); + if (data.F_FileType == "ppt" || data.F_FileType == "pptx") + { + filepath = filepath.Substring(0, filepath.LastIndexOf(".")) + ".pdf";//文件名 + if (!DirFileHelper.IsExistFile(filepath)) + { + filePreviewIBLL.GetPptData(DirFileHelper.GetAbsolutePath(data.F_FilePath)); + } + } + //FileDownHelper.DownLoadold(filepath, filename); + + + + //FileStream files = new FileStream(filepath, FileMode.Open); + //byte[] fileByte = new byte[files.Length]; + //files.Read(fileByte, 0, fileByte.Length); + //files.Close(); + //System.IO.MemoryStream ms = new MemoryStream(fileByte, 0, fileByte.Length); Response.ClearContent(); switch (data.F_FileType) { @@ -525,7 +541,8 @@ namespace Learun.Application.Web.Areas.LR_OAModule.Controllers break; } Response.Charset = "GB2312"; - Response.BinaryWrite(ms.ToArray()); + Response.WriteFile(filepath); + //Response.BinaryWrite(ms.ToArray()); } #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/AnnexesController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/AnnexesController.cs index 5bf5b24d9..0e769c8d7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/AnnexesController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/AnnexesController.cs @@ -1,4 +1,5 @@ using Learun.Application.Base.SystemModule; +using Learun.Application.OA.File.FilePreview; using Learun.Util; using System.Web; using System.Web.Mvc; @@ -88,10 +89,20 @@ namespace Learun.Application.Web.Areas.LR_SystemModule.Controllers /// [HttpPost] [ValidateAntiForgeryToken] - public ActionResult MergeAnnexesFile(string folderId, string fileGuid, string fileName, int chunks) + public ActionResult MergeAnnexesFile(string folderId, string fileGuid, string fileName, int chunks, string filePath) { UserInfo userInfo = LoginUserInfo.Get(); - bool res = annexesFileIBLL.SaveAnnexes(folderId, fileGuid, fileName, chunks, userInfo); + string path = ""; + if (!string.IsNullOrEmpty(filePath)) + { + path = Config.GetValue(filePath); + //如果是相对路径先转换成绝对路径 + if (path.Contains("~")) + { + path = Server.MapPath(path); + } + } + bool res = annexesFileIBLL.SaveAnnexes(folderId, fileGuid, fileName, chunks, userInfo, path); if (res) { return Success("保存文件成功"); @@ -163,5 +174,100 @@ namespace Learun.Application.Web.Areas.LR_SystemModule.Controllers return Success(data); } #endregion + + #region 预览附件 + /// + /// 文件预览 + /// + /// 文件ID + /// + public void PreviewFile(string fileId) + { + FilePreviewIBLL filePreviewIBLL = new FilePreviewBLL(); + var data = annexesFileIBLL.GetEntity(fileId); + if (data == null) + { + return; + } + string filename = data.F_FileName;//客户端保存的文件名 + string filepath = data.F_FilePath;//路径 + if (data.F_FileType == "xlsx" || data.F_FileType == "xls") + { + filepath = filepath.Substring(0, filepath.LastIndexOf(".")) + ".pdf";//文件名 + if (!DirFileHelper.IsExistFile(filepath)) + { + filePreviewIBLL.GetExcelData(data.F_FilePath); + } + } + if (data.F_FileType == "docx" || data.F_FileType == "doc") + { + filepath = filepath.Substring(0, filepath.LastIndexOf(".")) + ".pdf";//文件名 + if (!DirFileHelper.IsExistFile(filepath)) + { + filePreviewIBLL.GetWordData(data.F_FilePath); + } + } + if (data.F_FileType == "ppt" || data.F_FileType == "pptx") + { + filepath = filepath.Substring(0, filepath.LastIndexOf(".")) + ".pdf";//文件名 + if (!DirFileHelper.IsExistFile(filepath)) + { + filePreviewIBLL.GetPptData(data.F_FilePath); + } + } + Response.ClearContent(); + switch (data.F_FileType) + { + case "jpg": + Response.ContentType = "image/jpeg"; + break; + case "gif": + Response.ContentType = "image/gif"; + break; + case "png": + Response.ContentType = "image/png"; + break; + case "bmp": + Response.ContentType = "application/x-bmp"; + break; + case "jpeg": + Response.ContentType = "image/jpeg"; + break; + case "doc": + Response.ContentType = "application/pdf"; + break; + case "docx": + Response.ContentType = "application/pdf"; + break; + case "ppt": + Response.ContentType = "application/pdf"; + break; + case "pptx": + Response.ContentType = "application/pdf"; + break; + case "xls": + Response.ContentType = "application/pdf"; + break; + case "xlsx": + Response.ContentType = "application/pdf"; + break; + case "pdf": + Response.ContentType = "application/pdf"; + break; + case "txt": + Response.ContentType = "text/plain"; + break; + case "csv": + Response.ContentType = ""; + break; + default: + Response.ContentType = "application/pdf"; + break; + } + Response.Charset = "GB2312"; + Response.WriteFile(filepath); + //Response.BinaryWrite(ms.ToArray()); + } + #endregion } } \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Annexes/UploadForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Annexes/UploadForm.js index 47ff3ec74..3d99ae114 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Annexes/UploadForm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/Annexes/UploadForm.js @@ -7,6 +7,7 @@ */ var keyVaule = request('keyVaule'); var extensions = request('extensions'); +var filePath = request('filePath'); var bootstrap = function ($, learun) { "use strict"; @@ -51,6 +52,7 @@ var bootstrap = function ($, learun) { param['fileGuid'] = fileInfo[file.id].fileGuid; param['fileName'] = fileInfo[file.id].name; param['chunks'] = fileInfo[file.id].chunks; + param['filePath'] = filePath; learun.httpAsyncPost(top.$.rootUrl + "/LR_SystemModule/Annexes/MergeAnnexesFile", param, function (res) { var $fileItem = $('#lr_form_file_queue_list').find('#lr_filequeue_' + file.id); $fileItem.find('.lr-uploader-progress').remove(); @@ -75,6 +77,7 @@ var bootstrap = function ($, learun) { param['__RequestVerificationToken'] = $.lrToken; param['fileGuid'] = fileInfo[file.id].fileGuid; param['chunks'] = fileInfo[file.id].chunks; + param['filePath'] = filePath; learun.httpAsyncPost(top.$.rootUrl + "/LR_SystemModule/Annexes/MergeAnnexesFile", param, function (res) {}); var $fileItem = $('#lr_form_file_queue_list').find('#lr_filequeue_' + file.id); $fileItem.find('.lr-uploader-progress').remove(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTitleEvaluation/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTitleEvaluation/Form.cshtml index c110c9b16..fba400918 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTitleEvaluation/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTitleEvaluation/Form.cshtml @@ -11,25 +11,42 @@ }
-
+
教师姓名*
-
+
-
+
评定时间*
- +
-
+
评定职称*
-
+
-
+
评定职称岗位等级*
-
+
-
+ +
+
学历毕业证书
+
+
+
+
专业技术资格证书
+
+
+
+
教师资格证
+
+
+
+
获奖资料
+
+
+
备注
- +
@Html.AppendJsFile("/Areas/PersonnelManagement/Views/TeacherTitleEvaluation/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTitleEvaluation/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTitleEvaluation/Form.js index 8fefa4b7b..14b95cfb4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTitleEvaluation/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTitleEvaluation/Form.js @@ -23,6 +23,10 @@ var bootstrap = function ($, learun) { }); $('#TTTitlesID').lrDataItemSelect({ code: 'jszc' }); $('#TTTitlesPostLevel').lrDataItemSelect({ code: 'TeacherTitlePostLevel' }); + $('#Diploma').lrUploader(); + $('#TechnicalCertificate').lrUploader(); + $('#TeacherCertificate').lrUploader(); + $('#WinningFile').lrUploader(); }, initData: function () { if (!!keyValue) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTitleEvaluation/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTitleEvaluation/Index.js index d8ed5889a..e81dce59b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTitleEvaluation/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherTitleEvaluation/Index.js @@ -56,8 +56,8 @@ var bootstrap = function ($, learun) { id: 'form', title: '新增', url: top.$.rootUrl + '/PersonnelManagement/TeacherTitleEvaluation/Form', - width: 600, - height: 400, + width: 1000, + height: 800, callBack: function (id) { return top[id].acceptClick(refreshGirdData); } @@ -71,8 +71,8 @@ var bootstrap = function ($, learun) { id: 'form', title: '编辑', url: top.$.rootUrl + '/PersonnelManagement/TeacherTitleEvaluation/Form?keyValue=' + keyValue, - width: 600, - height: 400, + width: 1000, + height: 800, callBack: function (id) { return top[id].acceptClick(refreshGirdData); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index 3ed2d0aee..6601b2836 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj @@ -909,6 +909,7 @@ + @@ -6490,6 +6491,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/uploader/lr-uploader.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/uploader/lr-uploader.js index e493caaaf..5611c564c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/uploader/lr-uploader.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/uploader/lr-uploader.js @@ -20,15 +20,28 @@ var $btnGroup = $('
'); var $uploadBtn = $('上传'); var $downBtn = $('下载'); + var $viewBtn = $('预览'); $self.append($wrap); - - $btnGroup.append($uploadBtn); - $btnGroup.append($downBtn); - $self.append($btnGroup); - + var w = 0; + if (dfop.isUpload) { + $btnGroup.append($uploadBtn); + w += 57; + } + if (dfop.isDown) { + $btnGroup.append($downBtn); + w += 57; + } + if (dfop.isView) { + $btnGroup.append($viewBtn); + w += 57; + } $uploadBtn.on('click', $.lrUploader.openUploadForm); $downBtn.on('click', $.lrUploader.openDownForm); + $viewBtn.on('click', $.lrUploader.openViewForm); + + $self.append($btnGroup); + $self.css({ 'padding-right': w }); }, openUploadForm: function () { @@ -38,7 +51,7 @@ learun.layerForm({ id: dfop.id, title: dfop.placeholderUpload, - url: top.$.rootUrl + '/LR_SystemModule/Annexes/UploadForm?keyVaule=' + dfop.value + "&extensions=" + dfop.extensions, + url: top.$.rootUrl + '/LR_SystemModule/Annexes/UploadForm?keyVaule=' + dfop.value + "&extensions=" + dfop.extensions + "&filePath=" + dfop.filePath, width: 600, height: 400, maxmin: true, @@ -74,6 +87,19 @@ maxmin: true, btn: null }); + }, + openViewForm: function () { + var $btn = $(this); + var $self = $btn.parents('.lrUploader-wrap'); + var dfop = $self[0]._lrUploader.dfop; + learun.layerForm({ + id: 'PreviewForm', + title: '文件预览', + url: top.$.rootUrl + '/LR_SystemModule/Annexes/PreviewFile?fileId=' + dfop.value, + width: 1080, + height: 850, + btn: null + }); } }; @@ -87,7 +113,9 @@ placeholderDown: '下载附件', isUpload: true, isDown: true, - extensions: '' + isView: true, + extensions: '', + filePath: ''//上传路径（配置文件） } $.extend(dfop, op || {}); @@ -99,6 +127,10 @@ }; $.fn.lrUploaderSet = function (value) { + if (value == null || value == 'null' || value == undefined || value == 'undefined' || value == '') { + return; + } + var $self = $(this); var dfop = $self[0]._lrUploader.dfop; dfop.value = value; diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/Annexes/AnnexesFileBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/Annexes/AnnexesFileBLL.cs index 7c25cfcaa..63cde6dc3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/Annexes/AnnexesFileBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/Annexes/AnnexesFileBLL.cs @@ -170,17 +170,27 @@ namespace Learun.Application.Base.SystemModule /// 文件名称 /// 文件总共分多少片 /// 文件二进制流 + /// + /// /// - public bool SaveAnnexes(string folderId, string fileGuid, string fileName, int chunks, UserInfo userInfo) + public bool SaveAnnexes(string folderId, string fileGuid, string fileName, int chunks, UserInfo userInfo, string filePath = "") { try { //获取文件完整文件名(包含绝对路径) //文件存放路径格式：/Resource/ResourceFile/{userId}/{date}/{guid}.{后缀名} - string filePath = Config.GetValue("AnnexesFile"); + string virtualPath = ""; string uploadDate = DateTime.Now.ToString("yyyyMMdd"); string FileEextension = Path.GetExtension(fileName); - string virtualPath = string.Format("{0}/{1}/{2}/{3}{4}", filePath, userInfo.account, uploadDate, fileGuid, FileEextension); + if (string.IsNullOrEmpty(filePath)) + { + filePath = Config.GetValue("AnnexesFile"); + virtualPath = string.Format("{0}/{1}/{2}/{3}{4}", filePath, userInfo.userId, uploadDate, fileGuid, FileEextension); + } + else + { + virtualPath = string.Format("{0}/{1}", filePath, fileName); + } //创建文件夹 string path = Path.GetDirectoryName(virtualPath); Directory.CreateDirectory(path); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/Annexes/AnnexesFileIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/Annexes/AnnexesFileIBLL.cs index a177a41ed..16b3ebf50 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/Annexes/AnnexesFileIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/Annexes/AnnexesFileIBLL.cs @@ -60,7 +60,9 @@ namespace Learun.Application.Base.SystemModule /// 文件名称 /// 文件总共分多少片 /// 文件二进制流 - bool SaveAnnexes(string folderId, string fileGuid, string fileName, int chunks, UserInfo userInfo); + /// + /// + bool SaveAnnexes(string folderId, string fileGuid, string fileName, int chunks, UserInfo userInfo, string filePath = ""); /// /// 保存附件（支持大文件分片传输） /// diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/Annexes/AnnexesFileService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/Annexes/AnnexesFileService.cs index aed122ce8..8c4039d9f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/Annexes/AnnexesFileService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/Annexes/AnnexesFileService.cs @@ -128,7 +128,16 @@ namespace Learun.Application.Base.SystemModule { try { - return this.BaseRepository().FindEntity(keyValue); + var fileEntity = this.BaseRepository().FindEntity(keyValue); + if (fileEntity == null) + { + IEnumerable fileList = GetList(keyValue); + foreach (var item in fileList) + { + return item; + } + } + return fileEntity; } catch (Exception ex) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/File/FilePreview/FilePreviewBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/File/FilePreview/FilePreviewBLL.cs index 66fa471de..cae8e1b5a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/File/FilePreview/FilePreviewBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/File/FilePreview/FilePreviewBLL.cs @@ -60,5 +60,23 @@ namespace Learun.Application.OA.File.FilePreview } } } + + /// + /// 获取Word数据 + /// + /// + public void GetPptData(string path) + { + try + { + Document document = new Document(); + document.LoadFromFile(path); + document.SaveToFile(path.Substring(0, path.LastIndexOf(".")) + ".pdf", Spire.Doc.FileFormat.PDF); + } + catch (Exception) + { + throw (new Exception("文件丢失")); + } + } } } \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/File/FilePreview/FilePreviewIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/File/FilePreview/FilePreviewIBLL.cs index 98ff9040f..16d19065f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/File/FilePreview/FilePreviewIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/File/FilePreview/FilePreviewIBLL.cs @@ -14,5 +14,10 @@ namespace Learun.Application.OA.File.FilePreview /// /// void GetWordData(string path); + /// + /// ppt文档 + /// + /// + void GetPptData(string path); } } \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveService.cs index 39ea03a47..c2ec1f140 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveService.cs @@ -369,9 +369,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration //审核通过人数 item.StuNum = aa.Where(x => x.Status == 2).Count(); //选课专业 - var strSql2 = new StringBuilder(); - strSql2.Append("select e.Id,e.OLPOEId,e.MajorId,e.Grade,m.MajorNo,m.MajorName from ElectiveMajor e left join CdMajor m on e.MajorId=m.ID where e.OLPOEId='" + item.Id + "' and e.MajorId is not null and e.Grade is not null "); - item.ElectiveMajorList = this.BaseRepository("CollegeMIS").FindList(strSql2.ToString()).OrderBy(x => x.MajorNo).ThenBy(x => x.Grade).ToList(); + //var strSql2 = new StringBuilder(); + //strSql2.Append("select e.Id,e.OLPOEId,e.MajorId,e.Grade,m.MajorNo,m.MajorName from ElectiveMajor e left join CdMajor m on e.MajorId=m.ID where e.OLPOEId='" + item.Id + "' and e.MajorId is not null and e.Grade is not null "); + //item.ElectiveMajorList = this.BaseRepository("CollegeMIS").FindList(strSql2.ToString()).OrderBy(x => x.MajorNo).ThenBy(x => x.Grade).ToList(); //模式一：预选课 var aaa = this.BaseRepository("CollegeMIS").FindList(x => x.OLPEId == item.Id); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEncourgement/StuEncourgementBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEncourgement/StuEncourgementBLL.cs index 186eca4d4..e45e38a2c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEncourgement/StuEncourgementBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEncourgement/StuEncourgementBLL.cs @@ -187,6 +187,29 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + public IEnumerable GetEncourgementListByStuNo(string stuNo) + { + try + { + return stuEncourgementService.GetEncourgementListByStuNo(stuNo); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEncourgement/StuEncourgementIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEncourgement/StuEncourgementIBLL.cs index 28ca688c5..10795332c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEncourgement/StuEncourgementIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEncourgement/StuEncourgementIBLL.cs @@ -60,6 +60,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// IEnumerable GetEncourgementListByStuNo(string acdemic, string semester, string stuNo); + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + IEnumerable GetEncourgementListByStuNo(string stuNo); #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEncourgement/StuEncourgementService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEncourgement/StuEncourgementService.cs index 9490fd15a..19ea322af 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEncourgement/StuEncourgementService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEncourgement/StuEncourgementService.cs @@ -207,7 +207,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { try { - var result = this.BaseRepository("CollegeMIS").FindList(x => x.AcademicYearNo == acdemic && x.Semester == semester && x.StuNo == stuNo ); + var result = this.BaseRepository("CollegeMIS").FindList(x => x.AcademicYearNo == acdemic && x.Semester == semester && x.StuNo == stuNo); return result; } catch (Exception ex) @@ -223,6 +223,30 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + public IEnumerable GetEncourgementListByStuNo(string stuNo) + { + try + { + var result = this.BaseRepository("CollegeMIS").FindList(x => x.StuNo == stuNo); + return result; + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs index 1ca14269d..00c0b9e46 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs @@ -1,5 +1,6 @@ using Learun.Util; using System; +using System.Collections.Generic; using System.ComponentModel.DataAnnotations.Schema; namespace Learun.Application.TwoDevelopment.EducationalAdministration @@ -725,7 +726,21 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration [NotMapped] public string F_Password { get; set; } [NotMapped] public string F_Secretkey { get; set; } + [NotMapped] public List StuEncourgementList { get; set; } + [NotMapped] public List StuPunishmentList { get; set; } + [NotMapped] public List StuScoreClassOneList { get; set; } + + + + #endregion + #region 学习成绩 + public class StuScoreClassOne + { + public string AcademicYearNo { get; set; } + public string Semester { get; set; } + public List StuScoreList { get; set; } + } #endregion } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentBLL.cs index e8ad39521..73def66f4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentBLL.cs @@ -187,6 +187,29 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + public IEnumerable GetPunishmentListByStuNo(string stuNo) + { + try + { + return stuPunishmentService.GetPunishmentListByStuNo(stuNo); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentIBLL.cs index c09324fc4..36de75195 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentIBLL.cs @@ -61,6 +61,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// IEnumerable GetPunishmentListByStuNo(string acdemic, string semester, string stuNo); + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + IEnumerable GetPunishmentListByStuNo(string stuNo); #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentService.cs index 8b5842d4b..db77dec3b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuPunishment/StuPunishmentService.cs @@ -224,6 +224,30 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + public IEnumerable GetPunishmentListByStuNo(string stuNo) + { + try + { + var result = this.BaseRepository("CollegeMIS").FindList(x => x.StuNo == stuNo); + return result; + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherTitleEvaluation/TeacherTitleEvaluationEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherTitleEvaluation/TeacherTitleEvaluationEntity.cs index 380c50d87..956858753 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherTitleEvaluation/TeacherTitleEvaluationEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherTitleEvaluation/TeacherTitleEvaluationEntity.cs @@ -54,6 +54,26 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement /// [Column("TTREMARK")] public string TTRemark { get; set; } + /// + /// 学历毕业证书 + /// + [Column("DIPLOMA")] + public string Diploma { get; set; } + /// + /// 专业技术资格证书 + /// + [Column("TECHNICALCERTIFICATE")] + public string TechnicalCertificate { get; set; } + /// + /// 教师资格证 + /// + [Column("TEACHERCERTIFICATE")] + public string TeacherCertificate { get; set; } + /// + /// 获奖资料 + /// + [Column("WINNINGFILE")] + public string WinningFile { get; set; } #endregion #region 扩展操作 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherTitleEvaluation/TeacherTitleEvaluationService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherTitleEvaluation/TeacherTitleEvaluationService.cs index da19ace35..da2a63b6c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherTitleEvaluation/TeacherTitleEvaluationService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherTitleEvaluation/TeacherTitleEvaluationService.cs @@ -31,12 +31,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement var strSql = new StringBuilder(); strSql.Append("SELECT "); strSql.Append(@" - t.TTID, - t.EID, - t.TTTime, - t.TTTitlesID, - t.TTRemark, - t.TTTitlesPostLevel, + t.*, u.F_EnCode as Encode, u.F_Gender as Sex, u.F_Birthday as Birthday From a302665efadb22624ecfe362ac1e5c2e5a9b4c25 Mon Sep 17 00:00:00 2001 From: dyy <18335927079@163.com> Date: Mon, 31 Aug 2020 16:57:22 +0800 Subject: [PATCH 2/2] 1 --- .../Learun.Application.Web/Learun.Application.Web.csproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index ba061a740..b87dbe85e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj @@ -911,6 +911,7 @@ + @@ -6503,6 +6504,7 @@ +