From 2b6d0c61fe9fb395b03bb75020c38c7f373bd0da Mon Sep 17 00:00:00 2001 From: zhichao lei <442149704@qq.com> Date: Thu, 29 Oct 2020 10:21:51 +0800 Subject: [PATCH 1/3] =?UTF-8?q?empinfo=20list=20=E5=A4=9A=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E6=9F=A5=E8=AF=A2=E5=A2=9E=E5=8A=A0=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/EmpInfo/Index.cshtml | 8 ++++++++ .../EducationalAdministration/Views/EmpInfo/Index.js | 4 ++++ .../Views/MP_ManagementPlan/Index.js | 12 ++++++++++++ .../Views/MP_PerformanceTracking/Index.js | 12 ++++++++++++ .../Views/MP_QualityObjectives/Index.js | 12 ++++++++++++ .../EmpInfo/EmpInfoService.cs | 10 ++++++++++ 6 files changed, 58 insertions(+) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml index 8a59736b2..773b4a3ae 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml @@ -46,6 +46,14 @@
户籍县区
+
+
政治面貌
+
+
+
+
文化程度
+
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js index 987b1a19e..c4f49ff7e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js @@ -65,6 +65,10 @@ var bootstrap = function ($, learun) { } } }); + //政治面貌 + $('#PartyFaceNo').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' }); + //文化程度 + $('#CultureDegreeNo').lrDataSourceSelect({ code: 'BCdCultureDegree', value: 'culturedegreeno', text: 'culturedegree' }); // 部门选择 $('#F_DepartmentId').lrselect(); // 刷新 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/Index.js index fb6812e61..164e863d8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/Index.js @@ -156,6 +156,18 @@ var bootstrap = function ($, learun) { }); } }, + { + label: "是否合格", name: "MPConclusion", width: 100, align: "left", formatter: function (val) { + + if (val === 1) { + return "合格"; + } else if (val === 0) { + return "不合格"; + } else { + return ""; + } + } + }, //{ label: "说明", name: "MPRemark", width: 200, align: "left" }, ], mainId: 'MPId', diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Index.js index 3e6de57c0..0281a3461 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Index.js @@ -142,6 +142,18 @@ var bootstrap = function ($, learun) { }); } }, + { + label: "是否合格", name: "MPConclusion", width: 100, align: "left", formatter: function (val) { + + if (val === 1) { + return "合格"; + } else if (val === 0) { + return "不合格"; + } else { + return ""; + } + } + }, //{ label: "截止时间", name: "MPOverTime", width: 100, align: "left" }, //{ label: "说明", name: "MPRemark", width: 200, align: "left" }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Index.js index 51f9051b8..ed4ffce53 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Index.js @@ -165,6 +165,18 @@ var bootstrap = function ($, learun) { }); } }, + { + label: "是否合格", name: "MPConclusion", width: 100, align: "left", formatter: function (val) { + + if (val === 1) { + return "合格"; + } else if (val === 0) { + return "不合格"; + } else { + return ""; + } + } + }, //{ label: "截止时间", name: "MPOverTime", width: 100, align: "left" }, //{ label: "说明", name: "MPRemark", width: 200, align: "left" }, diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs index ec63197f6..f96b3ac3c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs @@ -82,6 +82,16 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("F_DepartmentId", queryParam["F_DepartmentId"].ToString(), DbType.String); strSql.Append(" AND t.F_DepartmentId = @F_DepartmentId "); } + if (!queryParam["BCdCultureDegree"].IsEmpty()) + { + dp.Add("BCdCultureDegree", queryParam["BCdCultureDegree"].ToString(), DbType.String); + strSql.Append(" AND t.BCdCultureDegree = @BCdCultureDegree "); + } + if (!queryParam["BCdPartyFace"].IsEmpty()) + { + dp.Add("BCdPartyFace", queryParam["BCdPartyFace"].ToString(), DbType.String); + strSql.Append(" AND t.BCdPartyFace = @BCdPartyFace "); + } return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); } catch (Exception ex) From c989dbbc54157a5b1755b9d043b468cfa8832cc9 Mon Sep 17 00:00:00 2001 From: zhichao lei <442149704@qq.com> Date: Fri, 30 Oct 2020 09:56:35 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=87=91=E9=9A=85=E6=95=99=E5=B8=88?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=AF=BC=E5=85=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/EmpInfoController.cs | 9 + .../Controllers/StuScoreController.cs | 13 + .../Views/EmpInfo/Form.cshtml | 5 +- .../Views/EmpInfo/Form.js | 6 + .../Views/EmpInfo/ImportForm.cshtml | 25 ++ .../Views/EmpInfo/ImportForm.css | 136 ++++++++++ .../Views/EmpInfo/ImportForm.js | 242 ++++++++++++++++++ .../Views/EmpInfo/Index.cshtml | 5 +- .../Views/EmpInfo/Index.js | 13 + .../Controllers/ExcelImportController.cs | 30 +++ .../MP_ManagementPlanController.cs | 2 +- .../Views/MP_ManagementPlan/Form.js | 2 +- .../Views/MP_ManagementPlan/Index.cshtml | 4 + .../Views/MP_ManagementPlan/Index.js | 3 +- .../MP_ManagementPlan/IndexChildren.cshtml | 4 + .../Views/MP_ManagementPlan/IndexChildren.js | 3 +- .../MP_ManagementPlan/IndexManagement.cshtml | 4 + .../MP_ManagementPlan/IndexManagement.js | 3 +- .../Views/MP_PerformanceTracking/Form.js | 4 +- .../Views/MP_PerformanceTracking/Index.cshtml | 4 + .../Views/MP_PerformanceTracking/Index.js | 3 +- .../IndexChildren.cshtml | 4 + .../MP_PerformanceTracking/IndexChildren.js | 3 +- .../IndexManagement.cshtml | 4 + .../MP_PerformanceTracking/IndexManagement.js | 3 +- .../Views/MP_QualityObjectives/Form.js | 4 +- .../Views/MP_QualityObjectives/Index.cshtml | 4 + .../Views/MP_QualityObjectives/Index.js | 3 +- .../MP_QualityObjectives/IndexChildren.cshtml | 4 + .../MP_QualityObjectives/IndexChildren.js | 3 +- .../IndexManagement.cshtml | 4 + .../MP_QualityObjectives/IndexManagement.js | 3 +- .../Views/Sal_UserSalary/Index.js | 23 +- .../Learun.Application.Web.csproj | 3 + .../Views/Shared/_Form.cshtml | 1 + .../SystemModule/DataSource/DataSourceBLL.cs | 15 ++ .../SystemModule/DataSource/DataSourceIBLL.cs | 3 + .../Import/ExcelImportBLL.cs | 118 ++++++++- .../Import/ExcelImportIBLL.cs | 1 + .../EmpInfo/EmpInfoEntity.cs | 10 +- .../MP_ManagementPlanService.cs | 5 + .../Learun.Util/Learun.Util/Web/WebHelper.cs | 40 +++ .../LearunApp-2.2.0/config.js | 12 +- 43 files changed, 744 insertions(+), 46 deletions(-) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/ImportForm.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/ImportForm.css create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/ImportForm.js diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/EmpInfoController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/EmpInfoController.cs index 6c1271408..8cbe88777 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/EmpInfoController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/EmpInfoController.cs @@ -63,6 +63,15 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers ViewBag.NewEmpId = Guid.NewGuid().ToString(); return View(); } + /// + /// 导入页 + /// + /// + [HttpGet] + public ActionResult ImportForm() + { + return View(); + } [HttpGet] public ActionResult FormView() { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs index da79f58f3..905be20de 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs @@ -413,6 +413,19 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers return Success(data); } + + /// + /// 学期下拉框信息【班级成绩查看】 + /// + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetSemesterDataTwo() + { + var data = WebHelper.GenerateNearBySemeterTwo(); + + return Success(data); + } /// /// 班级下拉框信息【成绩录入新页面】 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml index 140b25788..ef9d72447 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml @@ -39,9 +39,10 @@
-
-
+
+
个人信息
+  打印
姓名*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js index 5b97c732c..b6d9557e5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js @@ -154,6 +154,12 @@ var bootstrap = function ($, learun) { $("#Birthday").val(date); } }); + + + $('#lr_print').on('click',function() { + $('#tab1').print(); + }) + }, initData: function () { if (!!keyValue) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/ImportForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/ImportForm.cshtml new file mode 100644 index 000000000..12653cf48 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/ImportForm.cshtml @@ -0,0 +1,25 @@ +@{ + ViewBag.Title = "Form"; + Layout = "~/Views/Shared/_Form.cshtml"; +} + + +@Html.AppendCssFile("/Areas/PersonnelManagement/Views/Sal_UserSalary/ImportForm.css") + +
+
+
上传文件
+ @*
下载模板
*@ +
+
+
+
+ +
+
+

试试将电脑里的文件拖拽到此上传

+
+
+
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/EmpInfo/ImportForm.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/ImportForm.css b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/ImportForm.css new file mode 100644 index 000000000..04b556b7a --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/ImportForm.css @@ -0,0 +1,136 @@ +.lr-form-layout-body { + padding:0 5px 5px 5px; +} +.lr-form-file-queue-wrap { + position:relative; + width:100%; + height:100%; + border:1px solid #ddd; + border-radius:4px; +} +.lr-form-file-queue { + position:relative; +} +.lr-form-file-queue { + position:relative; +} +.lr-form-file-queue-item { + position:relative; + width:100%; + height:50px; + border-bottom:1px solid #ddd; + padding-left:60px; + +} +.lr-file-image { + position:absolute; + top:5px; + left:5px; +} +.lr-file-image img { + width:40px; + height:40px; +} +.lr-file-name{ + line-height:50px; + +} +.lr-msg { + position:absolute; + top:0; + right:5px; + font-size: 25px; + line-height:50px; +} +.lr-msg .fa-check-circle{ + color: #5cb85c; +} +.lr-msg .fa-exclamation-circle { + color: #b94a48; +} +.lr-msg2 { + position:absolute; + top:0; + right:5px; + line-height:50px; +} +.lr-msg2 span { + color:#333; + font-size:14px; + margin-right:5px; +} + +.lr-tool-bar { + position:absolute; + top:0; + right:35px; + font-size: 25px; + line-height:50px; + color:#666; + cursor:pointer; +} +.lr-tool-bar > i { + margin-left:8px; +} + +.lr-tool-bar .fa-minus-circle { + color: #b94a48; +} +.lr-tool-bar .fa-cloud-download { + color: #3498db; +} + +.lr-uploader-progress { + position:absolute; + bottom:2px; + left:60px; + height:4px; + width:500px; + width:calc(100% - 90px); +} +.lr-uploader-progress-bar { + position:relative; + height:100%; + background-color:#039cfd; + border-radius:4px; +} + + +.lr-form-file-queue-bg { + position:absolute; + top:50%; + left:50%; + width:300px; + height:30px; + line-height:30px; + + margin:-15px 0 0 -150px; +} +.lr-form-file-queue-bg h1 { + color: #666; + font-size: 20px; + font-family: Microsoft Yahei; + padding-bottom: 2px; + margin: 0; +} +#lr_down_file_btn { + position:absolute; + right:5px; + background:#fff; + border:1px solid #ddd; + color:#333; +} +#lr_down_file_btn:hover { + color:#337ab7; +} +/*对百度插件的样式重写*/ +.webuploader-container { + position:absolute; +} +.webuploader-pick { + padding:8px 15px; + background-color:#039cfd; +} +.webuploader-pick-hover { + background-color:#027dcb; +} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/ImportForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/ImportForm.js new file mode 100644 index 000000000..5736eaca8 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/ImportForm.js @@ -0,0 +1,242 @@ +/* + * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：陈彬彬 + * 日 期：2017.04.11 + * 描 述：导入Excel + */ +var id = request('id'); + +var keyVaule = ''; + +var bootstrap = function ($, learun) { + "use strict"; + + var page1 = { + init: function () { + page.bind(); + page.initData(); + }, + bind: function () { + $('#lr_add_format').on('click', function () { + currentColRow = null; + learun.layerForm({ + id: 'FormatForm', + title: '添加', + url: top.$.rootUrl + '/LR_SystemModule/CodeRule/FormatForm', + width: 450, + height: 310, + callBack: function (id) { + return top[id].acceptClick(function (data) { + $('#gridtable').jfGridSet('addRow', { row: data }); + }); + } + }); + }); + $('#lr_edit_format').on('click', function () { + currentColRow = $('#gridtable').jfGridGet('rowdata'); + var _id = currentColRow ? currentColRow.itemTypeName : ''; + if (learun.checkrow(_id)) { + learun.layerForm({ + id: 'FormatForm', + title: '修改', + url: top.$.rootUrl + '/LR_SystemModule/CodeRule/FormatForm', + width: 450, + height: 310, + callBack: function (id) { + return top[id].acceptClick(function (data) { + $('#gridtable').jfGridSet('updateRow', { row: data }); + }); + } + }); + } + + }); + $('#lr_delete_format').on('click', function () { + currentColRow = null; + var row = $('#gridtable').jfGridGet('rowdata'); + var _id = row ? row.itemTypeName : ''; + if (learun.checkrow(_id)) { + learun.layerConfirm('是否确认删除该项！', function (res, index) { + if (res) { + $('#gridtable').jfGridSet('removeRow'); + top.layer.close(index); //再执行关闭 + } + }); + } + }); + + $('#gridtable').jfGrid({ + headData: [ + { label: "前缀", name: "itemTypeName", width: 120, align: "left" }, + { label: "格式", name: "formatStr", width: 120, align: "left" }, + { label: "步长", name: "stepValue", width: 100, align: "left" }, + { label: "初始值", name: "initValue", width: 120, align: "left" }, + { label: "说明", name: "description", width: 180, align: "left" } + ] + }); + + /*检测重复项*/ + $('#F_EnCode').on('blur', function () { + $.lrExistField(keyValue, 'F_EnCode', top.$.rootUrl + '/LR_SystemModule/CodeRule/ExistEnCode'); + }); + $('#F_FullName').on('blur', function () { + $.lrExistField(keyValue, 'F_FullName', top.$.rootUrl + '/LR_SystemModule/CodeRule/ExistFullName'); + }); + }, + initData: function () { + if (!!selectedRow) { + keyValue = selectedRow.F_RuleId; + $('#form').lrSetFormData(selectedRow); + var formatdata = JSON.parse(selectedRow.F_RuleFormatJson); + $('#gridtable').jfGridSet('refreshdata', formatdata); + } + } + }; + + var fileInfo = {}; + + // 触发合并文件碎片 + var mergeFileChunks = function (file) { + + + var param = {}; + param['__RequestVerificationToken'] = $.lrToken; + param['fileId'] = fileInfo[file.id].fileGuid; + param['chunks'] = fileInfo[file.id].chunks; + param['ext'] = file.ext; + param['templateId'] = id; + learun.httpAsyncPost(top.$.rootUrl + "/LR_SystemModule/ExcelImport/EmpInfoImport", param, function (res) { + var $fileItem = $('#lr_form_file_queue_list').find('#lr_filequeue_' + file.id); + $fileItem.find('.lr-uploader-progress').remove(); + if (res.code == learun.httpCode.success) { + if (res.data.Success != '0') { + learun.alert.success('导入成功' + res.data.Success + '条'); + } + // 文件保存成功后 + $fileItem.append('
' + res.data.Success + '/' + res.data.Fail + '
'); + // 如果有失败 + if (res.data.Fail != '0') + { + learun.download({ url: top.$.rootUrl + '/LR_SystemModule/ExcelImport/DownImportErrorFile', param: { fileId: fileInfo[file.id].fileGuid, fileName: fileInfo[file.id].name, __RequestVerificationToken: $.lrToken }, method: 'POST' }); + } + } + else { + $fileItem.append('
'); + } + }); + } + // 触发清楚文件碎片 + var reomveFileChunks = function (file) { + var param = {}; + param['__RequestVerificationToken'] = $.lrToken; + param['fileGuid'] = fileInfo[file.id].fileGuid; + param['chunks'] = fileInfo[file.id].chunks; + 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(); + $fileItem.append('
'); + } + + var page = { + uploader: null, + init: function () { + /*模板下载*/ + $('#lr_down_file_btn').on('click', function () { + learun.download({ url: top.$.rootUrl + '/PersonnelManagement/Sal_UserSalary/DownTemplate', param: { keyValue: id, __RequestVerificationToken: $.lrToken }, method: 'POST' }); + }); + + + if (!WebUploader.Uploader.support()) { + alert('Web Uploader 不支持您的浏览器！如果你使用的是IE浏览器，请尝试升级 flash 播放器'); + throw new Error('WebUploader does not support the browser you are using.'); + } + + page.uploader = WebUploader.create({ + auto: true, + swf: top.$.rootUrl + '/Content/webuploader/Uploader.swf', + // 文件接收服务端。 + server: top.$.rootUrl + "/LR_SystemModule/Annexes/UploadAnnexesFileChunk", + // 选择文件的按钮。可选。 + // 内部根据当前运行是创建，可能是input元素，也可能是flash. + pick: '#lr_add_file_btn', + dnd: '#lr_form_file_queue', + paste: 'document.body', + disableGlobalDnd: true, + accept: { + extensions: "xls,xlsx" + }, + multiple: true, + // 不压缩image, 默认如果是jpeg，文件上传前会压缩一把再上传！ + resize: false, + // 文件分片上传 + chunked: true, + chunkRetry: 3, + prepareNextFile: true, + chunkSize: '1048576', + // 上传参数 + formData: { + __RequestVerificationToken: $.lrToken + } + }); + page.uploader.on('fileQueued', page.fileQueued); + page.uploader.on('uploadStart', page.uploadStart); + page.uploader.on('uploadBeforeSend', page.uploadBeforeSend); + page.uploader.on('uploadProgress', page.uploadProgress); + page.uploader.on('uploadSuccess', page.uploadSuccess); + page.uploader.on('uploadError', page.uploadError); + page.uploader.on('uploadComplete', page.uploadComplete); + page.uploader.on('error', page.error); + + $('#lr_form_file_queue').lrscroll(); + + }, + fileQueued: function (file) {// 文件加载到队列 + fileInfo[file.id] = { name: file.name }; + $('#lr_form_file_queue .lr-form-file-queue-bg').hide(); + // 添加一条文件记录 + var $item = $('
'); + $item.append('
'); + $item.append('' + file.name + '(' + learun.countFileSize(file.size) + ')'); + + $('#lr_form_file_queue_list').append($item); + }, + uploadStart: function (file) { + var $fileItem = $('#lr_form_file_queue_list').find('#lr_filequeue_' + file.id); + $fileItem.append('
'); + }, + uploadBeforeSend: function (object, data, headers) { + data.chunk = data.chunk || 0; + data.chunks = data.chunks || 1; + fileInfo[data.id].fileGuid = fileInfo[data.id].fileGuid || WebUploader.Base.guid(); + data.fileGuid = fileInfo[data.id].fileGuid; + fileInfo[data.id].chunks = data.chunks; + }, + uploadProgress: function (file, percentage) { + var $fileItem = $('#lr_form_file_queue_list').find('#lr_filequeue_' + file.id); + $fileItem.find('.lr-uploader-progress-bar').css('width', (percentage * 100 + '%')); + }, + uploadSuccess: function (file, res) { + if (res.code == 200) {// 上传成功 + mergeFileChunks(file); + } + else {// 上传失败 + reomveFileChunks(file); + } + }, + uploadError: function (file, code) { + reomveFileChunks(file); + }, + uploadComplete: function (file) { + }, + error: function (type) { + switch (type) { + case 'Q_TYPE_DENIED': + learun.alert.error('当前文件类型不允许上传'); + break; + }; + } + }; + page.init(); + +} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml index 773b4a3ae..9d3b55825 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml @@ -77,7 +77,10 @@  修改部门、系部  打印
-
+
+  导入 +
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js index c4f49ff7e..dd35c99f9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js @@ -113,6 +113,19 @@ var bootstrap = function ($, learun) { }); } }); + //导入 + $('#lr_import').on('click', function () { + learun.layerForm({ + id: 'form', + title: '导入', + url: top.$.rootUrl + '/EducationalAdministration/EmpInfo/ImportForm', + width: 400, + height: 300, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + }) //查看 $('#lr_view').on('click', function () { var keyValue = $('#gridtable').jfGridValue('EmpId'); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/ExcelImportController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/ExcelImportController.cs index 7e7159e5f..909ff2cb2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/ExcelImportController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/ExcelImportController.cs @@ -256,6 +256,36 @@ namespace Learun.Application.Web.Areas.LR_SystemModule.Controllers return Fail("导入数据失败!"); } } + /// + /// 金隅教师信息导入 + /// + /// 模板Id + /// 文件主键 + /// 分片数 + /// 文件扩展名 + /// + [HttpPost] + [ValidateAntiForgeryToken] + public ActionResult EmpInfoImport(string fileId, int chunks,string ext) + { + UserInfo userInfo = LoginUserInfo.Get(); + string path = annexesFileIBLL.SaveAnnexes(fileId, fileId + "."+ ext, chunks, userInfo); + if (!string.IsNullOrEmpty(path)) + { + DataTable dt = ExcelHelper.ExcelImport(path); + string res = excelImportIBLL.EmpInfoImport(dt,fileId); + var data = new + { + Success = res.Split('|')[0], + Fail = res.Split('|')[1] + }; + return JsonResult(data); + } + else + { + return Fail("导入数据失败!"); + } + } /// /// 下载文件(导入文件未被导入的数据) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MP_ManagementPlanController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MP_ManagementPlanController.cs index 5b19d3b61..9b59e2ef7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MP_ManagementPlanController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MP_ManagementPlanController.cs @@ -118,7 +118,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers [AjaxOnly] public ActionResult GetAcademicYear() { - var data = WebHelper.GenerateNearByAcademic(); + var data = WebHelper.GenerateNearByAcademicTwo(); return Success(data); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/Form.js index 70b37d4e5..573228b5f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/Form.js @@ -27,7 +27,7 @@ var bootstrap = function ($, learun) { $('#MPSemester').lrselect({ placeholder: "请选择学期", allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData', + url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterDataTwo', value: 'value', text: 'text' }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/Index.cshtml index 92d79f235..c28465f91 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/Index.cshtml @@ -18,6 +18,10 @@
学期
+
+
月份
+
+
上传者
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/Index.js index 164e863d8..b78c149cf 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/Index.js @@ -33,10 +33,11 @@ var bootstrap = function ($, learun) { $('#MPSemester').lrselect({ placeholder: "请选择学期", allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData', + url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterDataTwo', value: 'value', text: 'text' }); + $('#MPMonth').lrDataItemSelect({ code: 'MPMonth' }); // 刷新 $('#lr_refresh').on('click', function () { location.reload(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/IndexChildren.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/IndexChildren.cshtml index cd95c97c8..c3129f044 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/IndexChildren.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/IndexChildren.cshtml @@ -18,6 +18,10 @@
学期
+
+
月份
+
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/IndexChildren.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/IndexChildren.js index 67a7108e7..eb721a6cf 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/IndexChildren.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/IndexChildren.js @@ -42,10 +42,11 @@ var bootstrap = function ($, learun) { $('#MPSemester').lrselect({ placeholder: "请选择学期", allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData', + url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterDataTwo', value: 'value', text: 'text' }); + $('#MPMonth').lrDataItemSelect({ code: 'MPMonth' }); // 刷新 $('#lr_refresh').on('click', function () { location.reload(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/IndexManagement.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/IndexManagement.cshtml index c1485ccfb..cc0f966e2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/IndexManagement.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/IndexManagement.cshtml @@ -18,6 +18,10 @@
学期
+
+
月份
+
+
部门
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/IndexManagement.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/IndexManagement.js index b7f1f3ea2..7bda23c45 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/IndexManagement.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/IndexManagement.js @@ -33,10 +33,11 @@ var bootstrap = function ($, learun) { $('#MPSemester').lrselect({ placeholder: "请选择学期", allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData', + url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterDataTwo', value: 'value', text: 'text' }); + $('#MPMonth').lrDataItemSelect({ code: 'MPMonth' }); $('#MPDepartment').lrselect({ type: 'tree', diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Form.js index 14a03f2b3..c16e905c2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Form.js @@ -27,7 +27,7 @@ var bootstrap = function ($, learun) { $('#MPSemester').lrselect({ placeholder: "请选择学期", allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData', + url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterDataTwo', value: 'value', text: 'text' }); @@ -48,7 +48,7 @@ var bootstrap = function ($, learun) { } }); - $('#MPReceiveUser').lrselect({ type: 'default', allowSearch: true, value: 'F_UserId', text: 'F_RealName' }) $('#MPFile').lrUploader(); + $('#MPReceiveUser').lrselect({ type: 'default', allowSearch: true, value: 'F_UserId', text: 'F_RealName' }); $('#MPFile').lrUploader(); $('#MPMonth').lrDataItemSelect({ code: 'MPMonth' }); }, initData: function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Index.cshtml index 75cd1df42..2318960d9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Index.cshtml @@ -18,6 +18,10 @@
学期
+
+
月份
+
+
上传者
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Index.js index 0281a3461..1d4f2d948 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Index.js @@ -29,10 +29,11 @@ var bootstrap = function ($, learun) { $('#MPSemester').lrselect({ placeholder: "请选择学期", allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData', + url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterDataTwo', value: 'value', text: 'text' }); + $('#MPMonth').lrDataItemSelect({ code: 'MPMonth' }); // 刷新 $('#lr_refresh').on('click', function () { location.reload(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexChildren.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexChildren.cshtml index a0fd4bacb..b331eb145 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexChildren.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexChildren.cshtml @@ -18,6 +18,10 @@
学期
+
+
月份
+
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexChildren.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexChildren.js index 6e00b3163..fccc7b18c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexChildren.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexChildren.js @@ -38,10 +38,11 @@ var bootstrap = function ($, learun) { $('#MPSemester').lrselect({ placeholder: "请选择学期", allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData', + url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterDataTwo', value: 'value', text: 'text' }); + $('#MPMonth').lrDataItemSelect({ code: 'MPMonth' }); // 刷新 $('#lr_refresh').on('click', function () { location.reload(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexManagement.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexManagement.cshtml index d6ee95fc1..a553bb1c6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexManagement.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexManagement.cshtml @@ -18,6 +18,10 @@
学期
+
+
月份
+
+
部门
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexManagement.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexManagement.js index e836e507c..65865f71b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexManagement.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexManagement.js @@ -29,10 +29,11 @@ var bootstrap = function ($, learun) { $('#MPSemester').lrselect({ placeholder: "请选择学期", allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData', + url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterDataTwo', value: 'value', text: 'text' }); + $('#MPMonth').lrDataItemSelect({ code: 'MPMonth' }); $('#MPDepartment').lrselect({ type: 'tree', // 展开最大高度 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Form.js index d64df6b73..f7e7d24c1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Form.js @@ -27,7 +27,7 @@ var bootstrap = function ($, learun) { $('#MPSemester').lrselect({ placeholder: "请选择学期", allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData', + url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterDataTwo', value: 'value', text: 'text' }); @@ -48,7 +48,7 @@ var bootstrap = function ($, learun) { } }); - $('#MPReceiveUser').lrselect({ type: 'default', allowSearch: true, value: 'F_UserId', text: 'F_RealName' }) $('#MPMonth').lrDataItemSelect({ code: 'MPMonth' }); + $('#MPReceiveUser').lrselect({ type: 'default', allowSearch: true, value: 'F_UserId', text: 'F_RealName' }); $('#MPMonth').lrDataItemSelect({ code: 'MPMonth' }); $('#MPFile').lrUploader(); }, initData: function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Index.cshtml index 32fb32174..5e1abc024 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Index.cshtml @@ -18,6 +18,10 @@
学期
+
+
月份
+
+
上传者
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Index.js index ed4ffce53..8820ef2ad 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Index.js @@ -29,10 +29,11 @@ var bootstrap = function ($, learun) { $('#MPSemester').lrselect({ placeholder: "请选择学期", allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData', + url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterDataTwo', value: 'value', text: 'text' }); + $('#MPMonth').lrDataItemSelect({ code: 'MPMonth' }); // 刷新 $('#lr_refresh').on('click', function () { location.reload(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexChildren.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexChildren.cshtml index fdbe07296..2dde24973 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexChildren.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexChildren.cshtml @@ -18,6 +18,10 @@
学期
+
+
月份
+
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexChildren.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexChildren.js index 092c44a4e..56e7e131e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexChildren.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexChildren.js @@ -38,10 +38,11 @@ var bootstrap = function ($, learun) { $('#MPSemester').lrselect({ placeholder: "请选择学期", allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData', + url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterDataTwo', value: 'value', text: 'text' }); + $('#MPMonth').lrDataItemSelect({ code: 'MPMonth' }); // 刷新 $('#lr_refresh').on('click', function () { location.reload(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexManagement.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexManagement.cshtml index b5c34d4d5..04ec3b54a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexManagement.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexManagement.cshtml @@ -18,6 +18,10 @@
学期
+
+
月份
+
+
部门
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexManagement.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexManagement.js index 569fa21b4..18d556262 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexManagement.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexManagement.js @@ -29,10 +29,11 @@ var bootstrap = function ($, learun) { $('#MPSemester').lrselect({ placeholder: "请选择学期", allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterData', + url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterDataTwo', value: 'value', text: 'text' }); + $('#MPMonth').lrDataItemSelect({ code: 'MPMonth' }); $('#MPDepartment').lrselect({ type: 'tree', // 展开最大高度 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Sal_UserSalary/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Sal_UserSalary/Index.js index b2a5bbc2a..a36fa0681 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Sal_UserSalary/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Sal_UserSalary/Index.js @@ -82,18 +82,19 @@ var bootstrap = function ($, learun) { }); } }); - $('#lr_import').on('click',function() { - learun.layerForm({ - id: 'form', - title: '导入', - url: top.$.rootUrl + '/PersonnelManagement/Sal_UserSalary/ImportForm', - width: 400, - height: 300, - callBack: function (id) { - return top[id].acceptClick(refreshGirdData); - } + $('#lr_import').on('click', + function() { + learun.layerForm({ + id: 'form', + title: '导入', + url: top.$.rootUrl + '/PersonnelManagement/Sal_UserSalary/ImportForm', + width: 400, + height: 300, + callBack: function(id) { + return top[id].acceptClick(refreshGirdData); + } + }); }); - }) //查看 $('#lr_view').on('click', function () { var keyValue = $('#gridtable').jfGridValue('USId'); 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 0d9a731ac..69856b9a9 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 @@ -903,6 +903,8 @@ + + @@ -6839,6 +6841,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Shared/_Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Shared/_Form.cshtml index 436ddec67..1ee06735e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Shared/_Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Shared/_Form.cshtml @@ -34,6 +34,7 @@ @**@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataSource/DataSourceBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataSource/DataSourceBLL.cs index 081767467..0ca30c0a3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataSource/DataSourceBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataSource/DataSourceBLL.cs @@ -330,6 +330,21 @@ namespace Learun.Application.Base.SystemModule } } + public string GetKeyByValue(string code, string key, string keyText, string value) + { + string strWhere = " " + key + " =@" + key; + string queryJson = "{" + key + ":\"" + keyText + "\"}"; + DataTable sourceDt = GetDataTable(code, strWhere, queryJson); + if (sourceDt.Rows.Count > 0) + { + return sourceDt.Rows[0][value].ToString(); + } + else + { + return ""; + } + } + #endregion } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataSource/DataSourceIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataSource/DataSourceIBLL.cs index a05a166e1..7080bc42b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataSource/DataSourceIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataSource/DataSourceIBLL.cs @@ -83,6 +83,9 @@ namespace Learun.Application.Base.SystemModule /// 数据源编码 /// List GetDataColName(string code); + + string GetKeyByValue(string code, string key, string keyText, string value); + #endregion } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Excel/Import/ExcelImportBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Excel/Import/ExcelImportBLL.cs index 8e276ce9f..46bf1ab2c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Excel/Import/ExcelImportBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Excel/Import/ExcelImportBLL.cs @@ -33,8 +33,9 @@ namespace Learun.Application.Excel private StuEnrollIBLL stuEnrollIBLL = new StuEnrollBLL(); private DataSourceIBLL dataSourceIBLL = new DataSourceBLL(); private Sal_UserSalaryIBLL sal_UserSalaryIBLL = new Sal_UserSalaryBLL(); - private Sal_UserSalaryItemIBLL sal_UserSalaryItemIBLL=new Sal_UserSalaryItemBLL(); + private Sal_UserSalaryItemIBLL sal_UserSalaryItemIBLL = new Sal_UserSalaryItemBLL(); private UserIBLL userIBLL = new UserBLL(); + private EmpInfoIBLL empInfoIBLL = new EmpInfoBLL(); #region 缓存定义 private ICache cache = CacheFactory.CaChe(); @@ -724,12 +725,12 @@ namespace Learun.Application.Excel { var stiValue = Convert.ToDecimal(dr[templateItem.STIName].ToString()); //工资详细添加 - Sal_UserSalaryItemEntity sal_UserSalaryItemEntity=new Sal_UserSalaryItemEntity + Sal_UserSalaryItemEntity sal_UserSalaryItemEntity = new Sal_UserSalaryItemEntity { USIId = Guid.NewGuid().ToString(), - USId=sal_UserSalaryEntity.USId, - STIId=templateItem.STIId, - STIValue = Convert.ToDecimal(stiValue) + USId = sal_UserSalaryEntity.USId, + STIId = templateItem.STIId, + STIValue = Convert.ToDecimal(stiValue) }; sal_UserSalaryItemIBLL.SaveEntity("", sal_UserSalaryItemEntity); @@ -757,7 +758,7 @@ namespace Learun.Application.Excel sal_UserSalaryEntity.STAll = stall; sal_UserSalaryEntity.STActual = stactual; - sal_UserSalaryIBLL.SaveEntity("",sal_UserSalaryEntity); + sal_UserSalaryIBLL.SaveEntity("", sal_UserSalaryEntity); snum++; } catch (Exception e) @@ -770,6 +771,108 @@ namespace Learun.Application.Excel + } + // 写入缓存如果有未导入的数据 + if (failDt.Rows.Count > 0) + { + string errordt = failDt.ToJson(); + + cache.Write(cacheKey + fileId, errordt, CacheId.excel); + } + + return snum + "|" + fnum; + } + /// + /// 教师信息导入 + /// + /// + /// + /// + public string EmpInfoImport(DataTable dt, string fileId) + { + int snum = 0; + int fnum = 0; + // 创建一个datatable容器用于保存导入失败的数据 + DataTable failDt = new DataTable(); + dt.Columns.Add("导入错误", typeof(string)); + foreach (DataColumn dc in dt.Columns) + { + failDt.Columns.Add(dc.ColumnName, dc.DataType); + } + // 数据字典数据 + Dictionary> dataItemMap = new Dictionary>(); + + foreach (DataRow dr in dt.Rows) + { + try + { + var empinfoEntity = empInfoIBLL.GetEmpInfoEntityByEmpNo(dr["工号"].ToString()); + if (empinfoEntity != null && empinfoEntity.EmpName == dr["姓名"].ToString()) + { + empinfoEntity.IdentityCardNo = dr["身份证号"].ToString(); + empinfoEntity.Birthday = Convert.ToDateTime(dr["出生日期"].ToString()); + empinfoEntity.NationalityNo = dataSourceIBLL.GetKeyByValue("BCdNationality", "nationality", dr["民族"].ToString(), "nationalityno"); + empinfoEntity.LocusOfResidence = dr["籍贯"].ToString(); + empinfoEntity.PartyFaceNo = dataSourceIBLL.GetKeyByValue("BCdPartyFace", "partyface", dr["政治面貌"].ToString(), "partyfaceno"); + empinfoEntity.JoinPartyTime = dr["入党（团）时间"].ToString(); + empinfoEntity.mobile = dr["联系电话"].ToString(); + empinfoEntity.EMail = dr["电子邮箱"].ToString(); + empinfoEntity.Linkman = dr["联系人"].ToString(); + empinfoEntity.PhoneOfLinkman = dr["联系人电话"].ToString(); + empinfoEntity.Homeaddress = dr["家庭住址"].ToString(); + empinfoEntity.EmpSortNo = FindDataItemValue(dataItemIBLL.GetDetailList("jsgw"), dr["岗位类别"].ToString(), "岗位类别", false); + empinfoEntity.TitleOfTechPostNo = dr["岗位名称"].ToString(); + empinfoEntity.PositionLevel = FindDataItemValue(dataItemIBLL.GetDetailList("PositionLevel"), dr["现聘工资级别"].ToString(), "现聘工资级别", false); + empinfoEntity.InSchoolDate = Convert.ToDateTime(dr["聘任时间"].ToString()); + empinfoEntity.CompilationCategory = FindDataItemValue(dataItemIBLL.GetDetailList("CompilationCategory"), dr["编制类别"].ToString(), "编制类别", false); + empinfoEntity.AddWorkDate = Convert.ToDateTime(dr["参加工作时间"].ToString()); + empinfoEntity.AddWorkOffset = dr["工龄偏移量（月）"].ToString(); + empinfoEntity.AddWorkHours = dr["工龄（减去偏移量）"].ToString(); + empinfoEntity.GroupDate = Convert.ToDateTime(dr["进入集团时间"].ToString()); + empinfoEntity.GroupOffset = dr["集团龄偏移量（月）"].ToString(); + empinfoEntity.GroupHours = dr["集团龄（减去偏移量）"].ToString(); + empinfoEntity.EducationalDate = Convert.ToDateTime(dr["进入教育系统时间"].ToString()); + empinfoEntity.EducationalOffset = dr["教龄偏移量（月）"].ToString(); + empinfoEntity.EducationalHours = dr["校龄（减去偏移量）"].ToString(); + empinfoEntity.SchoolDate = Convert.ToDateTime(dr["来校时间"].ToString()); + empinfoEntity.SchoolOffset = dr["校龄偏移量（月）"].ToString(); + empinfoEntity.SchoolHours = dr["校龄（减去偏移量）"].ToString(); + empinfoEntity.FictitiousRetireTime = Convert.ToDateTime(dr["拟退休时间"].ToString()); + empinfoEntity.FormalTime= dr["转正日期"].ToString(); + empinfoEntity.CommendationYear = dr["从教三十年表彰年度"].ToString(); + empinfoEntity.Remark = dr["备注"].ToString(); + empinfoEntity.HighestRecord = dataSourceIBLL.GetKeyByValue("BCdCultureDegree", "culturedegree", dr["最高学历"].ToString(), "culturedegreeno"); + empinfoEntity.HighestRecordGetTime = Convert.ToDateTime(dr["最高学历取得时间"].ToString()); + empinfoEntity.EducationalSystem = dr["学制（最高学历）"].ToString(); + empinfoEntity.DegreeNo = dataSourceIBLL.GetKeyByValue("BCdDegree", "degreename", dr["最高学位"].ToString(), "degreeno"); + empinfoEntity.HighestDegreeGetTime = dr["最高学位取得时间"].ToString(); + empinfoEntity.JobRank = FindDataItemValue(dataItemIBLL.GetDetailList("TechnicalPost"), dr["专业技术职务等级"].ToString(), "专业技术职务等级", false); + empinfoEntity.JobTitle = dr["专业技术职务名称"].ToString(); + empinfoEntity.JobRankGetTime = dr["专业技术职务取得时间"].ToString(); + empinfoEntity.WorkLevel = FindDataItemValue(dataItemIBLL.GetDetailList("TechnicalLevelOfWorker"), dr["工人技术等级"].ToString(), "工人技术等级", false); + empinfoEntity.WorkLevelGetTime =dr["工人技术等级取得时间"].ToString(); + empInfoIBLL.SaveEntity(empinfoEntity.EmpId,empinfoEntity); + snum++; + } + else + { + dr["导入错误"] = dr["姓名"] + "导入错误"; + fnum++; + failDt.Rows.Add(dr.ItemArray); + } + + + } + catch (Exception e) + { + dr["导入错误"] = dr["姓名"] + "导入错误"; + fnum++; + failDt.Rows.Add(dr.ItemArray); + continue; + } + + + } // 写入缓存如果有未导入的数据 if (failDt.Rows.Count > 0) @@ -858,6 +961,9 @@ namespace Learun.Application.Excel } } } + + + #endregion } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Excel/Import/ExcelImportIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Excel/Import/ExcelImportIBLL.cs index 2068039c1..9d44e3130 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Excel/Import/ExcelImportIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Excel/Import/ExcelImportIBLL.cs @@ -73,6 +73,7 @@ namespace Learun.Application.Excel /// string ImportTable(string templateId, string fileId, DataTable dt); string ImportSalaryInfo(DataTable dt, string fileId); + string EmpInfoImport(DataTable dt, string fileId); /// /// 获取excel导入的错误数据 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoEntity.cs index e6a2c23b2..61136f831 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoEntity.cs @@ -350,7 +350,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 入党（团）时间 ///
[Column("JOINPARTYTIME")] - public DateTime? JoinPartyTime { get; set; } + public string JoinPartyTime { get; set; } /// /// 岗位职级 @@ -446,7 +446,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 转正时间 /// [Column("FORMALTIME")] - public DateTime? FormalTime { get; set; } + public string FormalTime { get; set; } /// /// 从教三十年表彰年度 @@ -470,7 +470,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 最高学位取得时间 /// [Column("HIGHESTDEGREEGETTIME")] - public DateTime? HighestDegreeGetTime { get; set; } + public string HighestDegreeGetTime { get; set; } /// /// 备注 @@ -488,7 +488,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 专业技术职务取得时间 /// [Column("JOBRANKGETTIME")] - public DateTime? JobRankGetTime { get; set; } + public string JobRankGetTime { get; set; } /// /// 专业技术职务名称 @@ -506,7 +506,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 工人技术等级取得时间 /// [Column("WORKLEVELGETTIME")] - public DateTime? WorkLevelGetTime { get; set; } + public string WorkLevelGetTime { get; set; } /// /// 教育经历提交状态 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MP_ManagementPlan/MP_ManagementPlanService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MP_ManagementPlan/MP_ManagementPlanService.cs index d40ec3e1a..21b18e283 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MP_ManagementPlan/MP_ManagementPlanService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MP_ManagementPlan/MP_ManagementPlanService.cs @@ -110,6 +110,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement dp.Add("MPUploader", "%" + queryParam["MPUploader"].ToString() + "%", DbType.String); strSql.Append(" AND t.MPUploader Like @MPUploader "); } + if (!queryParam["MPMonth"].IsEmpty()) + { + dp.Add("MPMonth", "%" + queryParam["MPMonth"].ToString() + "%", DbType.String); + strSql.Append(" AND t.MPMonth Like @MPMonth "); + } return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); } catch (Exception ex) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util/Web/WebHelper.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util/Web/WebHelper.cs index b83f86185..a05421892 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util/Web/WebHelper.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Util/Learun.Util/Web/WebHelper.cs @@ -517,6 +517,27 @@ namespace Learun.Util } return nearbyyear; } + + + /// + /// 返回前五年+后五年的学年yyyy-yyyy + /// + /// + public static List GenerateNearByAcademicTwo() + { + int forwardfive = DateTime.Now.AddYears(-5).Year; + int afterfive = DateTime.Now.AddYears(5).Year; + List nearbyyear = new List(); + for (int i = forwardfive; i <= afterfive; i++) + { + nearbyyear.Add(new YearGrade + { + text = string.Format("{0}-{1}", i.ToString(), (i + 1).ToString()), + value = string.Format("{0}-{1}", i.ToString(), (i + 1).ToString()) + }); + } + return nearbyyear; + } /// /// 返回学期 /// @@ -535,6 +556,25 @@ namespace Learun.Util return nearbyyear; } /// + /// 返回学期 + /// + /// + public static List GenerateNearBySemeterTwo() + { + List nearbyyear = new List(); + nearbyyear.Add(new YearGrade + { + text = "一", + value = "一" + }); + nearbyyear.Add(new YearGrade + { + text = "二", + value = "二" + }); + return nearbyyear; + } + /// /// 返回星期 /// /// diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js index d0b03f1a6..af39595ba 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js @@ -5,16 +5,16 @@ export default { "appVersion": "2.0", // 是否允许用户注册 "enableSignUp": true, - // 请求数据的接口地址；可以配置多个，开发环境下登录页会出现选择菜单供您选择 + //请求数据的接口地址；可以配置多个，开发环境下登录页会出现选择菜单供您选择 + "apiHost": [ + "https://wx.qjkjedu.com/learun/adms" + ], // "apiHost": [ - // "https://wx.qjkjedu.com/learun/adms" + // "http://192.168.2.202:8083/learun/adms" // ], // "apiHost": [ - // "http://192.168.2.202:8083/learun/adms" + // "http://localhost:8088/learun/adms" // ], - "apiHost": [ - "http://localhost:8088/learun/adms" - ], // 开发环境下自动填充登录账号密码，与接口地址一一对应，只在开发环境下显示 "devAccount": [ { username: "System", password: "0000" } From 7f793f06161f7eda4fc06509a7922efe83ee273b Mon Sep 17 00:00:00 2001 From: zhichao lei <442149704@qq.com> Date: Fri, 30 Oct 2020 15:18:10 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=8C=87=E5=AE=9A=E5=85=AC=E6=96=87?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E7=9A=84=E7=A7=8D=E7=B1=BB=E5=92=8C=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Department/DepartmentEntity.cs | 6 + .../Controllers/NoticeController.cs | 89 ++++++++ .../LR_OAModule/Views/Notice/FormFlow.cshtml | 55 +++++ .../LR_OAModule/Views/Notice/FormFlow.js | 104 ++++++++++ .../Views/Notice/FormFlowView.cshtml | 55 +++++ .../LR_OAModule/Views/Notice/FormFlowView.js | 95 +++++++++ .../LR_OAModule/Views/Notice/IndexFlow.cshtml | 35 ++++ .../LR_OAModule/Views/Notice/IndexFlow.js | 195 ++++++++++++++++++ .../Views/Department/Form.cshtml | 4 + .../Views/Department/Form.js | 2 + .../Views/Department/Index.js | 12 ++ .../Learun.Application.Web.csproj | 6 + .../Views/LR_Content/script/lr-clientdata.js | 2 +- .../XmlConfig/ioc.config | 2 + .../Learun.Application.OA/News/NewsBLL.cs | 20 ++ .../Learun.Application.OA/News/NewsEntity.cs | 12 ++ .../Learun.Application.OA/News/NewsIBLL.cs | 2 + .../Learun.Application.OA/News/NewsService.cs | 30 +++ .../Learun.Application.OA/Notice/NoticeBLL.cs | 45 +++- .../Notice/NoticeIBLL.cs | 3 + .../Notice/NoticeService.cs | 31 +++ .../Learun.Application.WorkFlow.csproj | 5 + .../NodeMethod/OA_NewsMethod.cs | 26 +++ 23 files changed, 833 insertions(+), 3 deletions(-) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlow.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlow.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlowView.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlowView.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/IndexFlow.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/IndexFlow.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/OA_NewsMethod.cs diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Organization/Department/DepartmentEntity.cs b/Learun.Framework.Ultimate V7/Learun.Application.Organization/Department/DepartmentEntity.cs index 9a8be380c..5aba87495 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Organization/Department/DepartmentEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Organization/Department/DepartmentEntity.cs @@ -158,6 +158,12 @@ namespace Learun.Application.Organization /// [Column("F_MODIFYUSERNAME")] public string F_ModifyUserName { get; set; } + /// + /// 公告类别 + /// + /// + [Column("NOTICECATEGORY")] + public string NoticeCategory { get; set; } /// diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Controllers/NoticeController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Controllers/NoticeController.cs index b88a70f17..9ddd15687 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Controllers/NoticeController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Controllers/NoticeController.cs @@ -8,6 +8,7 @@ using System.Threading.Tasks; using System.Web; using System.Web.Mvc; using Learun.Application.Base.AuthorizeModule; +using Learun.Application.Base.SystemModule; using Learun.Application.Organization; using Learun.Application.TwoDevelopment.LR_Desktop; using Learun.Util.Operat; @@ -31,6 +32,8 @@ namespace Learun.Application.Web.Areas.LR_OAModule.Controllers private WeChatTempletIBLL weChatTempletIbll = new WeChatTempletBLL(); private UserIBLL userIbll = new UserBLL(); private UserRelationIBLL userRelationIBLL = new UserRelationBLL(); + private DataItemIBLL dataItemIbll=new DataItemBLL(); + private DepartmentIBLL departmentIbll=new DepartmentBLL(); #region 视图功能 /// /// 管理页面 @@ -51,6 +54,33 @@ namespace Learun.Application.Web.Areas.LR_OAModule.Controllers return View(); } /// + /// 通知公告（需要审核） + /// + /// + [HttpGet] + public ActionResult IndexFlow() + { + return View(); + } + /// + /// 通知公告表单（需要审核） + /// + /// + [HttpGet] + public ActionResult FormFlow() + { + return View(); + } + /// + /// 通知公告表单（需要审核） + /// + /// + [HttpGet] + public ActionResult FormFlowView() + { + return View(); + } + /// /// 管理页面【查看通知公告】 /// /// @@ -158,6 +188,31 @@ namespace Learun.Application.Web.Areas.LR_OAModule.Controllers data.F_NewsContent = WebHelper.HtmlDecode(data.F_NewsContent); return JsonResult(data); } + + public ActionResult GetNoticeCategoryByDepartment(string departmentId) + { + + var typeList = dataItemIbll.GetDetailList("NoticeCategory"); + var departmentEntity = departmentIbll.GetEntity(departmentId); + List list=new List(); + if (departmentEntity != null) + { + var typetext = departmentEntity.NoticeCategory?.Split(','); + + foreach (var item in typetext) + { + var entity = typeList.FirstOrDefault(a => a.F_ItemValue.Equals(item)); + if (entity != null) + { + list.Add(new {text=entity.F_ItemName,value=entity.F_ItemValue}); + } + } + + } + return JsonResult(list); + + } + #endregion #region 提交数据 @@ -341,5 +396,39 @@ namespace Learun.Application.Web.Areas.LR_OAModule.Controllers } } #endregion + + #region 流程 + + /// + /// 提交 + /// + /// + /// + [HttpPost] + [AjaxOnly] + public ActionResult ChangeStatusById(string keyValue, string processId) + { + noticeIBLL.ChangeStatusById(keyValue, 1, processId); + return Success("操作成功！"); + } + + + /// + /// 获取表单数据 + /// + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetFormDataByProcessId(string processId) + { + NewsEntity OANewsData = noticeIBLL.GetEntityByProcessId(processId); + var jsonData = new + { + OANews = OANewsData, + }; + return Success(jsonData); + } + + #endregion } } \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlow.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlow.cshtml new file mode 100644 index 000000000..806df9397 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlow.cshtml @@ -0,0 +1,55 @@ +@{ + ViewBag.Title = "发布新闻"; + Layout = "~/Views/Shared/_Form.cshtml"; +} + +
+
+
公告标题*
+ +
+
+
公告类别*
+
+ +
+
+
发布时间*
+ +
+
+
信息来源
+ +
+
+
来源地址
+ +
+
+
接收部门
+
+
+
+
接收岗位
+
+
+
+
下发飞星
+
+
+
+
标题图片
+
+
+
+
公告内容
+
+ @**@ +
+
+ +@* + +*@ +@Html.AppendJsFile("/Areas/LR_OAModule/Views/Notice/FormFlow.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlow.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlow.js new file mode 100644 index 000000000..c9b0395b5 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlow.js @@ -0,0 +1,104 @@ +/* + * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：陈彬彬 + * 日 期：2017.11.11 + * 描 述：公告通知 + */ +var acceptClick; +var keyValue = request('keyValue'); +// 设置权限 +var setAuthorize; +// 设置表单数据 +var setFormData; +var isUpdate; +// 验证数据是否填写完整 +var validForm; +// 保存数据 +var save; +var bootstrap = function ($, learun) { + "use strict"; + var ue; + var page = { + init: function () { + page.bind(); + page.initData(); + }, + bind: function () { + var loginInfo = top.learun.clientdata.get(['userinfo']); + //公告类别 + $('#F_CategoryId').lrselect({ + url: top.$.rootUrl + '/LR_OAModule/Notice/GetNoticeCategoryByDepartment?departmentId=' + loginInfo.departmentId, + text: "text", + value: "value", + select: function (item) { + if (item != null && item != undefined) { + $("#F_Category").val(item.text); + } + } + }); + $('#F_NewsImage').lrUploader(); + $('#F_IsSendFX').lrDataItemSelect({ code: 'YesOrNoBit' }); + $('#F_SendDeptId').lrDepartmentSelect({ type: 'treemultiple' }); + $('#F_SendPostId').lrPostSelect({ type: 'treemultiple' }); + //内容编辑器 + ue = UE.getEditor('editor'); + }, + initData: function () { + if (!!keyValue) { + //$('#form').lrSetFormData(selectedRow); + //$("#F_ReleaseTime").val(learun.formatDate(selectedRow.F_ReleaseTime, 'yyyy/MM/dd hh:mm')); + $.lrSetForm(top.$.rootUrl + '/LR_OAModule/Notice/GetEntity?keyValue=' + keyValue, function (data) { + $('#form').lrSetFormData(data); + setTimeout(function () { + ue.setContent(data.F_NewsContent); + }, 100); + }); + } + } + }; + // 设置表单数据 + setFormData = function (processId) { + if (!!processId) { + $.lrSetForm(top.$.rootUrl + '/LR_OAModule/Notice/GetFormDataByProcessId?processId=' + processId, function (data) { + for (var id in data) { + if (!!data[id] && data[id].length > 0) { + $('#' + id).jfGridSet('refreshdata', data[id]); + } + else { + if (id == 'Sys_ReceiveFile') { + keyValue = data[id].F_DeptRelationId; + } + $('[data-table="' + id + '"]').lrSetFormData(data[id]); + } + } + }); + } + } + // 验证数据是否填写完整 + validForm = function () { + if (!$('#form').lrValidform()) { + return false; + } + return true; + }; + // 保存数据 + save = function (processId, callBack, i) { + var formData = $('body').lrGetFormData(); + if (!!processId) { + formData.RProcessId = processId; + } + var postData = { + strEntity: JSON.stringify(formData) + }; + $.lrSaveForm(top.$.rootUrl + '/LR_OAModule/Notice/SaveForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(res, formData, i); + } + }); + }; + page.init(); +} + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlowView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlowView.cshtml new file mode 100644 index 000000000..efbb7051f --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlowView.cshtml @@ -0,0 +1,55 @@ +@{ + ViewBag.Title = "发布新闻"; + Layout = "~/Views/Shared/_Form.cshtml"; +} + +
+
+
公告标题*
+ +
+
+
公告类别*
+
+ +
+
+
发布时间*
+ +
+
+
信息来源
+ +
+
+
来源地址
+ +
+
+
接收部门
+
+
+
+
接收岗位
+
+
+
+
下发飞星
+
+
+
+
标题图片
+
+
+
+
公告内容
+
+ @**@ +
+
+ +@* + +*@ +@Html.AppendJsFile("/Areas/LR_OAModule/Views/Notice/FormFlowView.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlowView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlowView.js new file mode 100644 index 000000000..8b193d7b5 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlowView.js @@ -0,0 +1,95 @@ +/* + * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：陈彬彬 + * 日 期：2017.11.11 + * 描 述：公告通知 + */ +var acceptClick; +var keyValue = request('keyValue'); +// 设置权限 +var setAuthorize; +// 设置表单数据 +var setFormData; +var isUpdate; +// 验证数据是否填写完整 +var validForm; +// 保存数据 +var save; +var bootstrap = function ($, learun) { + "use strict"; + // 设置权限 + setAuthorize = function (data) { + }; + var ue; + var page = { + init: function () { + page.bind(); + page.initData(); + }, + bind: function () { + //公告类别 + $('#F_CategoryId').lrDataItemSelect({ + code: 'NoticeCategory', maxHeight: 230, select: function (item) { + if (item != null && item != undefined) { + $("#F_Category").val(item.text); + } + } + }); + $('#F_NewsImage').lrUploader(); + $('#F_IsSendFX').lrDataItemSelect({ code: 'YesOrNoBit' }); + $('#F_SendDeptId').lrDepartmentSelect({ type: 'treemultiple' }); + $('#F_SendPostId').lrPostSelect({ type: 'treemultiple' }); + //内容编辑器 + ue = UE.getEditor('editor'); + }, + initData: function () { + if (!!keyValue) { + //$('#form').lrSetFormData(selectedRow); + //$("#F_ReleaseTime").val(learun.formatDate(selectedRow.F_ReleaseTime, 'yyyy/MM/dd hh:mm')); + $.lrSetForm(top.$.rootUrl + '/LR_OAModule/Notice/GetEntity?keyValue=' + keyValue, function (data) { + $('#form').lrSetFormData(data); + setTimeout(function () { + ue.setContent(data.F_NewsContent); + }, 100); + }); + } + } + }; + // 设置表单数据 + setFormData = function (processId, param, callback) { + if (!!processId) { + $.lrSetForm(top.$.rootUrl + '/LR_OAModule/Notice/GetFormDataByProcessId?processId=' + processId, function (data) { + for (var id in data) { + if (!!data[id] && data[id].length > 0) { + $('#' + id).jfGridSet('refreshdata', data[id]); + } + else { + $('[data-table="' + id + '"]').lrSetFormData(data[id]); + } + } + }); + } + callback && callback(); + } + // 验证数据是否填写完整 + validForm = function () { + if (!$('#form').lrValidform()) { + return false; + } + return true; + }; + // 保存数据 + save = function (processId, callBack, i) { + var formData = {}; + var res = {}; + res.code = 200; + if (!!processId) { + formData.RProcessId = processId; + } + callBack(res, i); + }; + page.init(); +} + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/IndexFlow.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/IndexFlow.cshtml new file mode 100644 index 000000000..738d300c5 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/IndexFlow.cshtml @@ -0,0 +1,35 @@ +@{ + ViewBag.Title = "通知公告"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
+
+
+ +
+
+  查询 +
+
+
+
+ +
+
+  录入 +  修改 +  查看 +  提交 +  删除 +
+
+
+
+
+
+
+@Html.AppendJsFile("/Areas/LR_OAModule/Views/Notice/IndexFlow.js") + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/IndexFlow.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/IndexFlow.js new file mode 100644 index 000000000..fc40d184c --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/IndexFlow.js @@ -0,0 +1,195 @@ +/* + * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：陈彬彬 + * 日 期：2017.07.11 + * 描 述：公告通知 + */ +var refreshGirdData; // 更新数据 +var bootstrap = function ($, learun) { + "use strict"; + var processId = ''; + var page = { + init: function () { + page.initGrid(); + page.bind(); + }, + bind: function () { + // 查询 + $('#btn_Search').on('click', function () { + var keyword = $('#txt_Keyword').val(); + page.search({ keyword: keyword }); + }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 新增 + $('#lr_add').on('click', function () { + learun.layerForm({ + id: 'form', + title: '添加公告', + url: top.$.rootUrl + '/LR_OAModule/Notice/FormFlow', + width: 1000, + height: 650, + maxmin: true, + callBack: function (id) { + var res = false; + // 验证数据 + res = top[id].validForm(); + // 保存数据 + if (res) { + res = top[id].save('', function () { + page.search(); + }); + } + return res; + } + }); + }); + // 编辑 + $('#lr_edit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('F_NewsId'); + if (learun.checkrow(keyValue)) { + if (keyValue.indexOf(",") != -1) { + learun.alert.warning("只能选择一条记录进行编辑！"); + return false; + } + var SendFlag = $('#gridtable').jfGridValue('F_Status'); + if (SendFlag == "1" || SendFlag == "2") { + learun.alert.warning("当前项目已提交不能编辑！"); + return; + } + learun.layerForm({ + id: 'formedit', + title: '编辑公告', + url: top.$.rootUrl + '/LR_OAModule/Notice/FormFlow?keyValue=' + keyValue, + width: 1000, + height: 650, + maxmin: true, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); + // 查看 + $('#lr_view').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('SFileId'); + if (learun.checkrow(keyValue)) { + if (keyValue.indexOf(",") != -1) { + learun.alert.warning("只能选择一条记录查看！"); + return false; + } + learun.layerForm({ + id: 'form', + title: '查看', + url: top.$.rootUrl + '/LR_OAModule/Notice/FormFlow?keyValue=' + keyValue, + width: 800, + height: 700, + btn: null + }); + } + }); + // 删除 + $('#lr_delete').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('F_NewsId'); + if (learun.checkrow(keyValue)) { + learun.layerConfirm('是否确认删除该项！', function (res) { + if (res) { + learun.deleteForm(top.$.rootUrl + '/LR_OAModule/Notice/DeleteForm', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + } + }); + //  提交 + $('#lr_submit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('F_NewsId'); + if (learun.checkrow(keyValue)) { + var SendFlag = $('#gridtable').jfGridValue('F_Status'); + if (SendFlag == "1" || SendFlag=="2") { + learun.alert.warning("当前项目已提交，请耐心等待审批！"); + return; + } + learun.layerConfirm('是否确认提交该项！', function (res) { + if (res) { + processId = learun.newGuid(); + learun.postForm(top.$.rootUrl + '/LR_OAModule/Notice/ChangeStatusById', { keyValue: keyValue, processId: processId }, function (res) { + refreshGirdData(res, {}); + }); + } + }); + } + }); + }, + initGrid: function () { + $('#gridtable').jfGrid({ + url: top.$.rootUrl + '/LR_OAModule/Notice/GetPageList', + headData: [ + { label: '公告标题', name: 'F_FullHead', index: 'F_FullHead', width: 600, align: 'left' }, + { label: '公告类别', name: 'F_Category', index: 'F_Category', width: 100, align: 'center' }, + { + label: "发布时间", name: "F_ReleaseTime", index: "F_ReleaseTime", width: 140, align: "center", + formatter: function (cellvalue) { + return learun.formatDate(cellvalue, 'yyyy-MM-dd hh:mm'); + } + }, + { label: '信息来源', name: 'F_SourceName', index: 'F_SourceName', width: 100, align: 'center' }, + { label: '阅读次数', name: 'F_PV', index: 'F_PV', width: 80, align: 'center' }, + { + label: "审核状态", name: "F_Status", width: 100, align: "left", + formatter: function (cellvalue, row) { + if (cellvalue === "1") { + return '审批中'; + } else if (cellvalue === "2") { + return '通过'; + } else { + return '草稿'; + } + } + }, + { + label: "发布状态", name: "F_EnabledMark", index: "F_EnabledMark", width: 80, align: "center", autowidth: false, + formatter: function (cellvalue) { + if (cellvalue == 1) { + return "已发布"; + } else { + return "未发布"; + } + } + }, + { label: "创建时间", name: "F_CreateDate", index: "F_CreateDate", width: 130, align: "center" } + ], + mainId: 'F_NewsId', + reloadSelected: true, + isMultiselect: true, + isPage: true, + sidx: 'F_CreateDate', + sord: 'desc' + }); + page.search(); + }, + search: function (param) { + $('#gridtable').jfGridSet('reload', param); + } + }; + // 保存数据后回调刷新 + refreshGirdData = function (res, postData) { + if (res && res.code && res.code == 200) { + var postData = { + schemeCode: 'OA_News',// 填写流程对应模板编号 + processId: processId, + level: '1', + }; + learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/CreateFlow', postData, function (data) { + learun.loading(false); + }); + } + page.search(); + } + page.init(); +} + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Department/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Department/Form.cshtml index 9afb0a86b..03cd7bd7a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Department/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Department/Form.cshtml @@ -36,6 +36,10 @@
+
+
公告类别
+
+
电话号
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Department/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Department/Form.js index 3044cc330..222bbfc67 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Department/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Department/Form.js @@ -37,6 +37,8 @@ var bootstrap = function ($, learun) { } } }); + + $('#NoticeCategory').lrDataItemSelect({ code: 'NoticeCategory', type: 'multiple', allowSearch:true }); }, initData: function () { if (!!selectedRow) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Department/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Department/Index.js index f9b0b91b9..115eacd1a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Department/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Department/Index.js @@ -98,6 +98,18 @@ var bootstrap = function ($, learun) { { label: "部门性质", name: "F_Nature", width: 100, align: "left" }, { label: "负责人", name: "F_Manager", width: 100, align: "left" }, { label: "分管校长", name: "F_SchoolMaster", width: 100, align: "left" }, + { + label: "公告类别", name: "NoticeCategory", width: 200, align: "left" , + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getsAsync('dataItem', { + key: value, + code: 'NoticeCategory', + callback: function (_data) { + callback(_data); + } + }); + } + }, { label: "电话号", name: "F_OuterPhone", width: 100, align: "left" }, { label: "分机号", name: "F_InnerPhone", width: 60, align: "center" }, { label: "排序", name: "F_Order", width: 60, align: "center" }, 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 69856b9a9..b150c9105 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 @@ -1261,6 +1261,9 @@ + + + @@ -6842,6 +6845,9 @@ + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-clientdata.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-clientdata.js index f0f8a5e68..f4c39a842 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-clientdata.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-clientdata.js @@ -400,7 +400,7 @@ else { var data = storage.get("dataItemData").data || {}; - var keyList = op.key.split(','); + var keyList = (op.key || "").split(','); var _text = [] $.each(keyList, function (_index, _item) { var _item = clientAsyncData.dataItem.find(_item, data[op.code] || {}); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/ioc.config b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/ioc.config index de0d99e24..4b8f5507c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/ioc.config +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/ioc.config @@ -25,6 +25,7 @@ + @@ -60,6 +61,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsBLL.cs index 995676c50..3fe0bce06 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsBLL.cs @@ -150,6 +150,26 @@ namespace Learun.Application.OA } } } + + public void ChangeStatusByProcessId(string parameterProcessId, int p1) + { + try + { + newsService.ChangeStatusByProcessId(parameterProcessId, p1); + } + 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.OA/News/NewsEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsEntity.cs index 7a99c3de7..50420fb2c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsEntity.cs @@ -182,6 +182,18 @@ namespace Learun.Application.OA [Column("F_ISSENDFX")] public bool? F_IsSendFX { get; set; } + /// + /// 流程id + /// + /// + [Column("F_PROGRESSID")] + public string F_ProgressId { get; set; } + /// + /// 审核状态 + /// + /// + [Column("F_STATUS")] + public string F_Status { get; set; } /// diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsIBLL.cs index b0e02367a..5c518a513 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsIBLL.cs @@ -46,5 +46,7 @@ namespace Learun.Application.OA /// void SaveEntity(string keyValue, NewsEntity newsEntity); #endregion + + void ChangeStatusByProcessId(string parameterProcessId, int p1); } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsService.cs index f05f0a6b2..8c7ed29eb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/News/NewsService.cs @@ -3,6 +3,7 @@ using Learun.Util; using System; using System.Collections.Generic; using System.Text; +using Spire.Pdf.General.Render.Decode.Jpeg2000.Icc; namespace Learun.Application.OA { @@ -171,5 +172,34 @@ namespace Learun.Application.OA } #endregion + + public void ChangeStatusByProcessId(string parameterProcessId, int status) + { + if (status == 2) + { + try + { + var newEntity = this.BaseRepository() + .FindEntity(a => a.F_ProgressId == parameterProcessId); + if (null != newEntity) + { + newEntity.F_Status = "2"; + } + + this.BaseRepository().Update(newEntity); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + } } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeBLL.cs index beec25c85..5f56621d9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeBLL.cs @@ -121,11 +121,52 @@ namespace Learun.Application.OA /// /// 关键词 /// - public IEnumerable GetList(string keyword, string userId,string categoryId=null) + public IEnumerable GetList(string keyword, string userId, string categoryId = null) { try { - return noticeService.GetList(keyword, userId,categoryId); + return noticeService.GetList(keyword, userId, categoryId); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + #endregion + + #region 流程 + public void ChangeStatusById(string keyValue, int status, string processId) + { + try + { + noticeService.ChangeStatusById(keyValue, status, processId); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + public NewsEntity GetEntityByProcessId(string processId) + { + try + { + return noticeService.GetEntityByProcessId(processId); } catch (Exception ex) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeIBLL.cs index c8e0b31af..c42b9fa5a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeIBLL.cs @@ -52,5 +52,8 @@ namespace Learun.Application.OA IEnumerable GetList(string keyword, string userId,string categoryId=null); #endregion + + void ChangeStatusById(string keyValue, int i, string processId); + NewsEntity GetEntityByProcessId(string processId); } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeService.cs index 630994f1f..f387aaaab 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.OA/Notice/NoticeService.cs @@ -182,5 +182,36 @@ namespace Learun.Application.OA } #endregion + + public void ChangeStatusById(string keyValue, int status, string processId) + { + try + { + BaseRepository().ExecuteBySql($"UPDATE dbo.LR_OA_News SET F_Status='{status}',F_ProgressId='{processId}' WHERE F_NewsId='{keyValue}'", null); + } + catch (Exception ex) + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + + public NewsEntity GetEntityByProcessId(string processId) + { + try + { + return this.BaseRepository().FindEntity(t => t.F_ProgressId == processId); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Learun.Application.WorkFlow.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Learun.Application.WorkFlow.csproj index 7c4b2d075..0c4214c8d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Learun.Application.WorkFlow.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Learun.Application.WorkFlow.csproj @@ -106,6 +106,7 @@ + @@ -227,6 +228,10 @@ {211fa31a-b9d8-4f48-80cc-573b9410828e} Learun.Application.Message + + {5F3FDF79-A47E-4782-A090-DD0DC2D5CDC1} + Learun.Application.OA + {56f9a112-fd96-4809-98f4-0d7c5de0711b} Learun.Application.TwoDevelopment diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/OA_NewsMethod.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/OA_NewsMethod.cs new file mode 100644 index 000000000..d3c1fbcf9 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/OA_NewsMethod.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Learun.Application.OA; + +namespace Learun.Application.WorkFlow +{ + public class OA_NewsMethod : IWorkFlowMethod + { + + NewsIBLL newsIBLL=new NewsBLL(); + public void Execute(WfMethodParameter parameter) + { + if (parameter.code == "agree") + { + newsIBLL.ChangeStatusByProcessId(parameter.processId, 2); + } + else + { + newsIBLL.ChangeStatusByProcessId(parameter.processId, 0); + } + } + } +}