diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_ReceiveDocumentController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_ReceiveDocumentController.cs index 5c00658b7..891c892ed 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_ReceiveDocumentController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_ReceiveDocumentController.cs @@ -30,6 +30,17 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + + /// + /// 公文接收归档 + /// + /// + [HttpGet] + public ActionResult IndexFile() + { + return View(); + } + /// /// 表单页 /// @@ -92,6 +103,17 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { Pagination paginationobj = pagination.ToObject(); var data = sYS_ReceiveDocumentIBLL.GetPageList(paginationobj, queryJson); + + foreach (var item in data) + { + var sql = $"SELECT COUNT(*) FROM dbo.Sys_ReceiveFile where ReadFlag=1 AND SFileId='{item.RID}'"; + var sendSql = $"SELECT COUNT(*) FROM dbo.Sys_ReceiveFile where SFileId='{item.RID}'"; + var readdt = sYS_ReceiveDocumentIBLL.Execute(sql); + var senddt = sYS_ReceiveDocumentIBLL.Execute(sendSql); + var readcount = readdt.Rows[0][0]; + var sendcount = senddt.Rows[0][0]; + item.NumberPeople = $"{readcount}/{sendcount}"; + } var jsonData = new { rows = data, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_ReceiveFileController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_ReceiveFileController.cs index 8408003d6..3b7c27e01 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_ReceiveFileController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_ReceiveFileController.cs @@ -213,6 +213,18 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers return Success("操作成功！"); } /// + /// 重置 + /// 主键 + /// + /// + [HttpGet] + [AjaxOnly] + public ActionResult Reset(string keyValue) + { + sys_ReceiveFileIBLL.Reset(keyValue); + return Success("操作成功！"); + } + /// /// 保存实体数据（新增、修改） /// 主键 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_SendFileController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_SendFileController.cs index 4c96bb46e..516563b32 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_SendFileController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_SendFileController.cs @@ -33,6 +33,25 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers return View(); } + /// + /// 行政公文归档 + /// + /// + [HttpGet] + public ActionResult IndexFile() + { + return View(); + } + + /// + /// 党政公文归档 + /// + /// + [HttpGet] + public ActionResult IndexPartyFile() + { + return View(); + } [HttpGet] public ActionResult IndexDocument() { @@ -362,7 +381,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers return Success("下发成功！"); } - + /* public ActionResult ReceiveFile(string keyValue) { @@ -370,6 +389,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers }*/ #endregion - + } } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/Index.js index de62521d1..3bf0ed404 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/Index.js @@ -223,14 +223,17 @@ var bootstrap = function ($, learun) { url: top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveDocument/ReadList?keyValue=' + keyValue, width: 850, height: 400, - btn: null + btn: null, + end: function () { + page.search(); + } }); } }); //打印 $('#lr_print').on('click', - function() { + function () { var keyValue = $('#gridtable').jfGridValue('RID'); if (learun.checkrow(keyValue)) { learun.layerFormForPercent({ @@ -329,13 +332,16 @@ var bootstrap = function ($, learun) { { label: "是否需要处理", name: "HasDispose", width: 100, align: "left", formatter: function (cellvalue, row) { - console.log(cellvalue); if (cellvalue == "1") { return '需要处理'; } else { return '无需处理'; } } + }, + { + label: "阅读人数/接受人数", name: "NumberPeople", width: 150, align: "left" + } ], mainId: 'RID', @@ -347,6 +353,7 @@ var bootstrap = function ($, learun) { param = param || {}; param.SenderId = loginInfo.userId; + param.SqlParameter = ' AND RSendFlag<>4'; $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/IndexFile.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/IndexFile.cshtml new file mode 100644 index 000000000..85ab1b9d2 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/IndexFile.cshtml @@ -0,0 +1,44 @@ +@{ + ViewBag.Title = "公文接收归档"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
+
+ +
+
+
+
+
文件标题
+ +
+
+
来文单位
+ +
+
+
收文单位
+
+
+
+
+
+
+
+
+ +
+
+  查看 +  打印 +
+
+
+
+
+
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/IndexFile.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/IndexFile.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/IndexFile.js new file mode 100644 index 000000000..a23f8da50 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/IndexFile.js @@ -0,0 +1,195 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2019-10-22 16:58 + * 描 述：文件接收 + */ +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var processId = ''; + var loginInfo = top.learun.clientdata.get(['userinfo']); + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); + $('#RReceiveUnit').lrDepartmentSelect(); + + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 查看 + $('#lr_view').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('RID'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'form', + title: '查看', + url: top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveDocument/FormView?keyValue=' + keyValue, + width: 800, + height: 600, + btn: null, + callBack: function (id) { + var res = false; + // 验证数据 + res = top[id].validForm(); + // 保存数据 + if (res) { + res = top[id].save('', function () { + page.search(); + }); + } + return res; + } + }); + } + }); + //打印 + $('#lr_print').on('click', + function () { + var keyValue = $('#gridtable').jfGridValue('RID'); + if (learun.checkrow(keyValue)) { + learun.layerFormForPercent({ + id: 'form', + title: '查阅情况', + url: top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveDocument/PrintView?keyValue=' + keyValue, + width: '100%', + height: '100%', + btn: null + }); + } + + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').jfGrid({ + url: top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveDocument/GetPageList', + headData: [ + { + label: "录入人员", name: "SenderId", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'teacheruserdata', + key: value, + keyId: 'f_userid', + callback: function (_data) { + callback(_data['f_realname']); + } + }); + } + }, + { label: "收文时间", name: "RReceiveTime", width: 100, align: "left" }, + { label: "来文单位", name: "RSourceUnit", width: 100, align: "left" }, + { label: "字第(号)", name: "lwz", width: 100, align: "left" }, + { + label: "收文单位", name: "RReceiveUnit", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('department', { + key: value, + callback: function (_data) { + callback(_data.name); + } + }); + } + }, + { label: "字第(号)", name: "swz", width: 100, align: "left" }, + { + label: "缓急程度", name: "RUrgencyDegree", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'UrgencyDegree', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: "文件标题", name: "RTitle", width: 100, align: "left" }, + { + label: "已接收", name: "ReceiverId", width: 300, align: "left", formatterAsync: + function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('user', + { + key: value, + callback: function (_data) { + if (_data.length > 0) { + var text = ''; + $.each(_data, + function (i, item) { + if (item) { + text += item.name + ','; + } + }); + text = text.substring(0, text.lastIndexOf(',')); + callback(text); + } else { + callback(_data.name); + } + } + }); + } + }, + { + label: "状态", name: "RSendFlag", width: 100, align: "left", + formatter: function (cellvalue, row) { + if (cellvalue === "1") { + return '已下发'; + } else if (cellvalue === "4") { + return '下发完毕'; + } else { + return '草稿'; + } + } + }, + { + label: "是否需要处理", name: "HasDispose", width: 100, align: "left", + formatter: function (cellvalue, row) { + if (cellvalue == "1") { + return '需要处理'; + } else { + return '无需处理'; + } + } + }, + { + label: "阅读人数/接受人数", name: "NumberPeople", width: 150, align: "left" + + } + ], + mainId: 'RID', + isPage: true + }); + page.search(); + }, + search: function (param) { + + param = param || {}; + param.SenderId = loginInfo.userId; + param.SqlParameter = ' AND RSendFlag=4'; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + //refreshGirdData = function (res, postData) { + // if (res.code == 200) { + // // 发起流程 + // var postData = { + // schemeCode: 'Sys_ReceiveDocument',// 填写流程对应模板编号 + // 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/EducationalAdministration/Views/Sys_ReceiveDocument/ReadList.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/ReadList.cshtml index 116a42a8f..9dba1a2c1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/ReadList.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/ReadList.cshtml @@ -17,6 +17,7 @@
+ 重新发起 已处理
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/ReadList.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/ReadList.js index 25dcee72c..88b05e2c1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/ReadList.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/ReadList.js @@ -40,6 +40,21 @@ var bootstrap = function ($, learun) { } }); + //重新发起 + $('#lr_reset').on('click', + function () { + var sendId = $('#gridtable').jfGridValue('RFileId'); + if (learun.checkrow(sendId)) { + learun.layerConfirm('是否确认重新发起此批示！', function (res) { + if (res) { + learun.getForm(top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveFile/Reset?keyValue=' + sendId, function () { + page.search(); + }); + } + }); + } + }); + }, // 初始化列表 initGird: function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.js index a164c459d..74b57d767 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.js @@ -6,6 +6,7 @@ */ var acceptClick; var keyValue = request('keyValue'); +var readFlag = request('readFlag'); var isDesktop = request('isDesktop');//首页"我的桌面"中的"公文接收"列表子项的点击事件 var bootstrap = function ($, learun) { "use strict"; @@ -41,12 +42,12 @@ var bootstrap = function ($, learun) { $('#SendType').lrDataItemSelect({ code: 'FileSendType' }); if (isDesktop != "1") { if (selectedRow.ReadFlag == true) {//已读 - $('#Url').lrUploader({ isView:false}); + $('#Url').lrUploader({ isView: false }); } else {//未读 - $('#Url').lrUploader({ RFileId: selectedRow.RFileId, isView:false }); + $('#Url').lrUploader({ RFileId: selectedRow.RFileId, isView: false }); } } else { - $('#Url').lrUploader({ RFileId: keyValue, isView:false }); + $('#Url').lrUploader({ RFileId: keyValue, isView: false }); } }, initData: function () { @@ -58,13 +59,17 @@ var bootstrap = function ($, learun) { } else { $('[data-table="' + id + '"]').lrSetFormData(data[id]); + $('#Contents').html(data[id].Contents); } } $("#lrUploader_uploadBtn_Url").hide(); }); - - var data= learun.httpGet(top.$.rootUrl + + //已读状态不可修改批示 + if (readFlag == 'true') { + $('#SpecifyReceiver').attr('readonly', 'readonly'); + } + var data = learun.httpGet(top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveFile/GetInstructions?keyValue=' + keyValue, ''); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/IndexGWJS.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/IndexGWJS.js index c1b863f16..1b7090297 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/IndexGWJS.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/IndexGWJS.js @@ -8,8 +8,8 @@ var refreshGirdData; var selectedRow; var bootstrap = function ($, learun) { "use strict"; - var startTime=''; - var endTime=''; + var startTime = ''; + var endTime = ''; var page = { init: function () { page.initGird(); @@ -130,7 +130,7 @@ var bootstrap = function ($, learun) { learun.layerForm({ id: 'formSys_ReceiveFile', title: '查看', - url: top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveFile/Form?keyValue=' + keyValue, + url: top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveFile/Form?keyValue=' + keyValue + '&readFlag=' + selectedRow.ReadFlag, width: 1000, height: 600, callBack: function (id) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.cshtml index 820e37035..2eadeac54 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.cshtml @@ -31,6 +31,7 @@   提交   查看   查阅情况 +  结束下发
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.js index 9f342505f..583c6fc9e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.js @@ -138,6 +138,20 @@ var bootstrap = function ($, learun) { }); } }); + // 结束下发 + $('#lr_OverIssue').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('SFileId'); + if (learun.checkrow(keyValue)) { + learun.layerConfirm('是否结束下发！', function (res) { + if (res) { + processId = learun.newGuid(); + learun.postForm(top.$.rootUrl + '/EducationalAdministration/Sys_SendFile/OverIssue', { keyValue: keyValue, }, function (res) { + page.search(); + }); + } + }); + } + }); }, // 初始化列表 initGird: function () { @@ -191,6 +205,7 @@ var bootstrap = function ($, learun) { }, search: function (param) { param = param || {}; + param.SqlParameter = ' AND SendFlag<>4'; $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IndexFile.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IndexFile.cshtml new file mode 100644 index 000000000..00df10196 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IndexFile.cshtml @@ -0,0 +1,34 @@ +@{ + ViewBag.Title = "公文发送"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
+
+
+
+
+
+
主题
+ +
+
+
+
+
+
+
+ +
+
+   查看 +
+
+
+
+
+
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_SendFile/IndexFile.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IndexFile.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IndexFile.js new file mode 100644 index 000000000..62f841721 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IndexFile.js @@ -0,0 +1,99 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2019-04-11 10:31 + * 描 述：公文发送 + */ +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var processId = ''; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 查看 + $('#lr_view').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('SFileId'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'form', + title: '查看', + url: top.$.rootUrl + '/EducationalAdministration/Sys_SendFile/FormView?keyValue=' + keyValue, + width: 800, + height: 700, + btn: null + }); + } + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').jfGrid({ + url: top.$.rootUrl + '/EducationalAdministration/Sys_SendFile/GetPageList', + headData: [ + { label: "主题", name: "Title", width: 300, align: "left" }, + { + label: "接收对象", name: "SendType", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'FileSendType', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { + label: "接收人", name: "Receiver", width: 300, align: "left" + }, + { + label: "下发人", name: "Sender", width: 100, align: "left" + }, + { + label: "下发时间", name: "SendTime", width: 150, align: "left" + }, + + { + label: "状态", name: "SendFlag", width: 100, align: "left", + formatter: function (cellvalue, row) { + if (cellvalue === 1) { + return '审批中'; + } else if (cellvalue === 2) { + return '已下发'; + } else if (cellvalue === 4) { + return '下发完毕'; + } else { + return '草稿'; + } + } + }, + { + label: "阅读数/接受人数", name: "NumberPeople", width: 150, align: "left" + }, + + ], + mainId: 'SFileId', + isPage: true + }); + page.search(); + }, + search: function (param) { + param = param || {}; + param.SqlParameter = ' AND SendFlag=4'; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IndexParty.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IndexParty.cshtml index 8be5f45bb..edcb3fb8e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IndexParty.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IndexParty.cshtml @@ -31,6 +31,7 @@   提交   查看   查阅情况 +  结束下发 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IndexParty.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IndexParty.js index 2c039686f..536cfdb1f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IndexParty.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IndexParty.js @@ -138,6 +138,21 @@ var bootstrap = function ($, learun) { }); } }); + + // 结束下发 + $('#lr_OverIssue').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('SFileId'); + if (learun.checkrow(keyValue)) { + learun.layerConfirm('是否结束下发！', function (res) { + if (res) { + processId = learun.newGuid(); + learun.postForm(top.$.rootUrl + '/EducationalAdministration/Sys_SendFile/OverIssue', { keyValue: keyValue, }, function (res) { + page.search(); + }); + } + }); + } + }); }, // 初始化列表 initGird: function () { @@ -191,6 +206,7 @@ var bootstrap = function ($, learun) { }, search: function (param) { param = param || {}; + param.SqlParameter = ' AND SendFlag<>4'; $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IndexPartyFile.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IndexPartyFile.cshtml new file mode 100644 index 000000000..fd5ce7328 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IndexPartyFile.cshtml @@ -0,0 +1,34 @@ +@{ + ViewBag.Title = "公文发送"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
+
+
+
+
+
+
主题
+ +
+
+
+
+
+
+
+ +
+
+   查看 +
+
+
+
+
+
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_SendFile/IndexPartyFile.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IndexPartyFile.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IndexPartyFile.js new file mode 100644 index 000000000..4db48aa31 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/IndexPartyFile.js @@ -0,0 +1,117 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2019-04-11 10:31 + * 描 述：公文发送 + */ +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var processId = ''; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 查看 + $('#lr_view').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('SFileId'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'form', + title: '查看', + url: top.$.rootUrl + '/EducationalAdministration/Sys_SendFile/FormPartyView?keyValue=' + keyValue, + width: 800, + height: 700, + btn: null + }); + } + }); + + ////打印 + //$('#lr_print').on('click', function () { + // $('#gridtable').jqprintTable(); + //}); + + }, + // 初始化列表 + initGird: function () { + $('#gridtable').jfGrid({ + url: top.$.rootUrl + '/EducationalAdministration/Sys_SendFile/GetPageListParty', + headData: [ + { label: "主题", name: "Title", width: 300, align: "left" }, + { + label: "接收对象", name: "SendType", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'FileSendType', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { + label: "接收人", name: "Receiver", width: 300, align: "left" + }, + { + label: "下发人", name: "Sender", width: 100, align: "left" + }, + { + label: "下发时间", name: "SendTime", width: 150, align: "left" + }, + + { + label: "状态", name: "SendFlag", width: 100, align: "left", + formatter: function (cellvalue, row) { + if (cellvalue === 1) { + return '审批中'; + } else if (cellvalue === 2) { + return '已下发'; + } else if (cellvalue === 4) { + return '下发完毕'; + }else { + return '草稿'; + } + } + }, + { + label: "阅读人数/接受人数", name: "NumberPeople", width: 150, align: "left", + + }, + ], + mainId: 'SFileId', + isPage: true + }); + page.search(); + }, + search: function (param) { + param = param || {}; + param.SqlParameter = ' AND SendFlag=4'; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function (res, postData) { + if (res && res.code && res.code == 200) { + var postData = { + schemeCode: 'Sys_SendFileParty',// 填写流程对应模板编号 + 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/EducationalAdministration/Views/Sys_SendFile/PrintView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/PrintView.cshtml new file mode 100644 index 000000000..2008538c2 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/PrintView.cshtml @@ -0,0 +1,147 @@ +@{ + ViewBag.Title = "打印"; + Layout = "~/Views/Shared/_SimpleForm.cshtml"; +} + + + + + + + + +
+
+
北京金隅科技学校
+
收文处理专用纸（收文登记）
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
收文字第号收文日期
来文字第号
收文标题
处理意见
领导批示 +
+
+
部门处理情况 +
经办人办结日期
+
+
+ + + +
打印
+ + + + + + +@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_SendFile/PrintView.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/PrintView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/PrintView.js new file mode 100644 index 000000000..24e4c8dd1 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/PrintView.js @@ -0,0 +1,80 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2019-04-11 10:31 + * 描 述：公文发送 + */ +var refreshGirdData; +var keyValue = request('keyValue'); +var bootstrap = function ($, learun) { + "use strict"; + var processId = ''; + var page = { + init: function () { + console.log(keyValue); + page.bind(); + }, + bind: function () { + $.get(top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveDocument/PrintInfo?keyValue=' + keyValue, + function(data) { + var data = JSON.parse(data).data; + var entityItem = data.entityItem; + console.log(data); + learun.clientdata.getAsync('department', { + key: data.entity.RReceiveUnit, + callback: function (_data) { + console.log(_data); + $('#RReceiveUnit').html(_data.name); + + } + }); + $('#swz').html(data.entity.swz); + $('#RReceiveTime').html(data.entity.RReceiveTime.substr(0,10)); + $('#RSourceUnit').html(data.entity.RSourceUnit); + $('#lwz').html(data.entity.lwz); + $('#RTitle').html(data.entity.RTitle); + $('#yj1').html(entityItem[0].SpecifyReceiver); + $('#yj2').html(entityItem[1].SpecifyReceiver); + learun.clientdata.getAsync('user', { + key: entityItem[1].ReceiverId, + callback: function (_data) { + console.log(_data); + $('#xiaozhanginfo').html(_data.name + ' ' + (entityItem[1].ReadTime || '').substr(0, 10)); + } + }); + + + learun.clientdata.getAsync('user', { + key: data.entity.SenderId, + callback: function (_data) { + $('#SenderId').html(_data.name); + } + }); + + + + var text = ''; + $.each(entityItem, + function(i, item) { + if (i < 2) {return true;} + learun.clientdata.getAsync('user', { + key: item.ReceiverId, + callback: function (_data) { + + text += '
' + + (item.SpecifyReceiver == '' ? '已阅' : item.SpecifyReceiver) + + '
'+_data.name+' '+(item.ReadTime || '').substr(0,10)+'
'; + } + }); + + + }); + $('#yj3').html(text); + + $('#overDate').html(data.entityItem[data.entityItem.length - 1].ReadTime.substr(0,10)); + }); + + }, + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/MessageRindController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/MessageRindController.cs index 35f6e64ca..80bade281 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/MessageRindController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/MessageRindController.cs @@ -36,6 +36,7 @@ namespace Learun.Application.Web.Areas.LR_Desktop.Controllers [HttpGet] public ActionResult UnreadIndex() { + ViewBag.Name = (LoginUserInfo.Get()).realName; return View(); } /// diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/MessageRind/UnreadIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/MessageRind/UnreadIndex.cshtml index 5012d734d..dbc7aaf3e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/MessageRind/UnreadIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/MessageRind/UnreadIndex.cshtml @@ -39,101 +39,103 @@ "~/Areas/LR_Desktop/Views/MessageRind/Index.js" ) - + 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 0d5bc76a6..9130d92fc 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 @@ -1028,6 +1028,7 @@ + @@ -1046,9 +1047,12 @@ + + + @@ -1298,9 +1302,6 @@ - - - @@ -7263,9 +7264,10 @@ - - - + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveDocument/Sys_ReceiveDocumentBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveDocument/Sys_ReceiveDocumentBLL.cs index 7c216f686..818fa50e3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveDocument/Sys_ReceiveDocumentBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveDocument/Sys_ReceiveDocumentBLL.cs @@ -42,6 +42,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + + public DataTable Execute(string sql) + { + return sYS_ReceiveDocumentService.Execute(sql); + } /// /// 获取Sys_ReceiveDocument表实体数据 /// 主键 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveDocument/Sys_ReceiveDocumentEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveDocument/Sys_ReceiveDocumentEntity.cs index 3c43a8a04..442701c54 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveDocument/Sys_ReceiveDocumentEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveDocument/Sys_ReceiveDocumentEntity.cs @@ -130,6 +130,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } #endregion #region 扩展字段 + /// + /// 编号 + /// + [NotMapped] + public string NumberPeople { get; set; } + #endregion } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveDocument/Sys_ReceiveDocumentIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveDocument/Sys_ReceiveDocumentIBLL.cs index 513d2aaf6..41dfa8a61 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveDocument/Sys_ReceiveDocumentIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveDocument/Sys_ReceiveDocumentIBLL.cs @@ -21,6 +21,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 查询参数 /// IEnumerable GetPageList(Pagination pagination, string queryJson); + + DataTable Execute(string sql); /// /// 获取Sys_ReceiveDocument表实体数据 /// 主键 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveDocument/Sys_ReceiveDocumentService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveDocument/Sys_ReceiveDocumentService.cs index 0421c322c..fd73613a6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveDocument/Sys_ReceiveDocumentService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveDocument/Sys_ReceiveDocumentService.cs @@ -73,6 +73,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("RTitle", "%" + queryParam["RTitle"].ToString() + "%", DbType.String); strSql.Append(" AND t.RTitle Like @RTitle "); } + //sql条件 + if (!queryParam["SqlParameter"].IsEmpty()) + { + strSql.Append(queryParam["SqlParameter"].ToString()); + } var list = this.BaseRepository().FindList(strSql.ToString(), dp, pagination); foreach (var item in list) { @@ -106,6 +111,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + + public DataTable Execute(string sql) + { + return this.BaseRepository().FindTable(sql); + } + /// /// 获取Sys_ReceiveDocument表实体数据 /// 主键 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFileBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFileBLL.cs index 13e9e0215..cb3df3a43 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFileBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFileBLL.cs @@ -269,6 +269,25 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + public void Reset(string keyValue) + { + try + { + sys_ReceiveFileService.Reset(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + /// /// 查看实体数据 /// 主键 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFileIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFileIBLL.cs index 7a4a730ff..946422a11 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFileIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFileIBLL.cs @@ -71,6 +71,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// void VirtualDeleteEntity(string keyValue); void DisPose(string keyValue); + void Reset(string keyValue); /// /// 查看实体数据 /// 主键 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFileService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFileService.cs index 5ad25ebcf..db4b4e6d1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFileService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFileService.cs @@ -387,6 +387,34 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + /// + /// 重置批示状态 + /// + /// + public void Reset(string keyValue) + { + try + { + var entity = this.BaseRepository().FindEntity(a => a.RFileId == keyValue); + if (null != entity) + { + entity.ReadFlag = false; + this.BaseRepository().Update(entity); + } + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + /// /// 查看实体数据 /// 主键 @@ -396,7 +424,60 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { try { - this.BaseRepository().ExecuteBySql("update Sys_ReceiveFile set ReadFlag=1,ReadTime='" + DateTime.Now + "' where RFileId='" + keyValue + "'", null); + //状态改为已读 + string sql = "update Sys_ReceiveFile set ReadFlag=1,ReadTime='" + DateTime.Now + "' where RFileId='" + + keyValue + "'"; + this.BaseRepository().ExecuteBySql(sql, null); + + //判断当前公文是否已全部已读，如果全部已读，需要通知提醒下发人，加入消息提醒 + //获取未读人数 + var updSql = + $"select count(1) from Sys_ReceiveFile where SFileId=(select SFileId from Sys_ReceiveFile where RFileId='{keyValue}')and ReadFlag = 0"; + var dt = this.BaseRepository().FindTable(updSql); + if (dt.Rows[0][0] != null && Convert.ToInt32(dt.Rows[0][0]) == 0) + { + var entity = this.BaseRepository().FindEntity(keyValue); + + var receiveDocumentEntity = + this.BaseRepository().FindEntity(entity.SFileId); + + var userInfo = this.BaseRepository().FindEntity(entity.SenderId); + MessageRemindEntity msgEntity = new MessageRemindEntity(); + msgEntity.Create(); + msgEntity.ReceiptId = entity.SenderId; + msgEntity.ReceiptName = userInfo != null ? userInfo.F_RealName : ""; + msgEntity.SenderId = entity.ReceiverId; + msgEntity.SenderName = entity.Receiver; + if (entity.STypeId == 3) + { + msgEntity.TheTitle = "党政公文下发"; + var sendFileEntity = + this.BaseRepository().FindEntity(entity.SFileId); + msgEntity.TheContent = "【全部已阅】" + sendFileEntity.Title; + msgEntity.InstanceId = sendFileEntity.SFileId; + msgEntity.ConnectionUrl = "/EducationalAdministration/Sys_SendFile/ReadListParty?keyValue="; + } + else if (entity.STypeId == 4) + { + msgEntity.TheTitle = "公文接收"; + msgEntity.TheContent = "【全部已阅】" + receiveDocumentEntity.RTitle; + msgEntity.InstanceId = receiveDocumentEntity.RID; + msgEntity.ConnectionUrl = "/EducationalAdministration/Sys_ReceiveDocument/ReadList?keyValue="; + } + else if (entity.STypeId == 1) + { + msgEntity.TheTitle = "行政公文下发"; + var sendFileEntity = + this.BaseRepository().FindEntity(entity.SFileId); + msgEntity.TheContent = "【全部已阅】" + sendFileEntity.Title; + msgEntity.InstanceId = sendFileEntity.SFileId; + msgEntity.ConnectionUrl = "/EducationalAdministration/Sys_SendFile/ReadList?keyValue="; + } + msgEntity.SendTime = DateTime.Now; + msgEntity.ReadSigns = false; + this.BaseRepository().Insert(msgEntity); + } + } catch (Exception ex) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendFile/Sys_SendFileService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendFile/Sys_SendFileService.cs index 2222b1d1e..6515d0e89 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendFile/Sys_SendFileService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendFile/Sys_SendFileService.cs @@ -54,6 +54,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("SenderId", "" + queryParam["SenderId"].ToString() + "", DbType.String); strSql.Append(" AND t.SenderId = @SenderId "); } + //sql条件 + if (!queryParam["SqlParameter"].IsEmpty()) + { + strSql.Append(queryParam["SqlParameter"].ToString()); + } return this.BaseRepository().FindList(strSql.ToString(), dp, pagination); } catch (Exception ex) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/MessageRind/MessageRindService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/MessageRind/MessageRindService.cs index 650112458..a7b9a7bce 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/MessageRind/MessageRindService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/MessageRind/MessageRindService.cs @@ -76,7 +76,8 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop { try { - return this.BaseRepository().FindList(x => x.ReadSigns == false); + var userInfo = LoginUserInfo.Get(); + return this.BaseRepository().FindList(x => x.ReadSigns == false && x.ReceiptId == userInfo.userId); } catch (Exception ex) {