From 32c74907a1fe624a88a9ad13cc444154d466cbb4 Mon Sep 17 00:00:00 2001 From: liangkun Date: Thu, 15 Jul 2021 15:38:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E6=96=87=E5=8A=9F=E8=83=BD=E4=B8=8E?= =?UTF-8?q?=E9=87=91=E9=9A=85=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sys_ReceiveDocumentController.cs | 53 +++- .../Controllers/Sys_ReceiveFileController.cs | 72 ++++++ .../Controllers/Sys_SendFileController.cs | 78 +++++- .../Controllers/MessageRindController.cs | 188 ++++++++++++++ .../LR_Desktop/Views/MessageRind/Form.cshtml | 35 +++ .../LR_Desktop/Views/MessageRind/Form.js | 41 ++++ .../LR_Desktop/Views/MessageRind/Index.cshtml | 94 +++++++ .../LR_Desktop/Views/MessageRind/Index.js | 150 ++++++++++++ .../Views/MessageRind/UnreadIndex.cshtml | 141 +++++++++++ .../Learun.Application.Web.csproj | 6 + .../LR_Desktop/MessageRemindMap.cs | 29 +++ .../Learun.Application.Mapping.csproj | 1 + .../MessageRind/MessageRemindEntity.cs | 95 +++++++ .../LR_Desktop/MessageRind/MessageRindBLL.cs | 194 +++++++++++++++ .../LR_Desktop/MessageRind/MessageRindIBLL.cs | 63 +++++ .../MessageRind/MessageRindService.cs | 231 ++++++++++++++++++ .../Learun.Application.TwoDevelopment.csproj | 4 + 17 files changed, 1469 insertions(+), 6 deletions(-) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/MessageRindController.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/MessageRind/Form.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/MessageRind/Form.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/MessageRind/Index.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/MessageRind/Index.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/MessageRind/UnreadIndex.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_Desktop/MessageRemindMap.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/MessageRind/MessageRemindEntity.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/MessageRind/MessageRindBLL.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/MessageRind/MessageRindIBLL.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/MessageRind/MessageRindService.cs 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 d0bd4e1dc..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 @@ -3,6 +3,7 @@ using System.Data; using Learun.Application.TwoDevelopment.EducationalAdministration; using System.Web.Mvc; using System.Collections.Generic; +using System.Linq; namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { @@ -16,6 +17,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers public class SYS_ReceiveDocumentController : MvcControllerBase { private SYS_ReceiveDocumentIBLL sYS_ReceiveDocumentIBLL = new SYS_ReceiveDocumentBLL(); + private Sys_ReceiveFileIBLL receiveFileIbll=new Sys_ReceiveFileBLL(); #region 视图功能 @@ -28,6 +30,17 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + + /// + /// 公文接收归档 + /// + /// + [HttpGet] + public ActionResult IndexFile() + { + return View(); + } + /// /// 表单页 /// @@ -56,17 +69,22 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + + /// + /// 阅读详情 + /// + /// [HttpGet] - public ActionResult SelectUserForm() + public ActionResult ReadList() { return View(); } /// - /// 阅读详情 + /// 打印页面 /// /// [HttpGet] - public ActionResult ReadList() + public ActionResult PrintView() { return View(); } @@ -85,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, @@ -124,6 +153,21 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers }; return Success(jsonData); } + + + + public ActionResult PrintInfo(string keyValue) + { + var entity = sYS_ReceiveDocumentIBLL.GetSys_ReceiveDocumentEntity(keyValue); + var entityItem = receiveFileIbll.GetPageListBySendId(keyValue).ToList().Where(a=>a.ReadTime!=null).OrderBy(a=>a.ReadTime); + object data = new + { + entity, + entityItem + }; + + return Success(data); + } #endregion #region 提交数据 @@ -157,6 +201,9 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers } return Success("操作成功！"); } + + + /// /// 保存实体数据（新增、修改） /// 主键 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 84f5a5c1d..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 @@ -120,6 +120,22 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers return Success(jsonData); } /// + /// 获取批示信息 + /// + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetInstructions(string keyValue) + { + var data = sys_ReceiveFileIBLL.GetInstructions(keyValue); + var jsonData = new + { + rows = data, + }; + return Success(jsonData); + } + /// /// 获取页面显示列表数据 /// /// 查询参数 @@ -185,6 +201,30 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers return Success("删除成功！"); } /// + /// 设置批示状态为已处理 + /// 主键 + /// + /// + [HttpGet] + [AjaxOnly] + public ActionResult DisPose(string keyValue) + { + sys_ReceiveFileIBLL.DisPose(keyValue); + return Success("操作成功！"); + } + /// + /// 重置 + /// 主键 + /// + /// + [HttpGet] + [AjaxOnly] + public ActionResult Reset(string keyValue) + { + sys_ReceiveFileIBLL.Reset(keyValue); + return Success("操作成功！"); + } + /// /// 保存实体数据（新增、修改） /// 主键 /// @@ -230,6 +270,38 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers sys_ReceiveFileIBLL.ReceiveDocumentIssue(entity); return Success("保存成功！"); } + + /// + /// 主任批示 + /// + /// + [HttpPost] + [AjaxOnly] + public ActionResult ZhuRenP(string strEntity) + { + Sys_IssueEntity entity = strEntity.ToObject(); + entity.SpecifyReceiver = sys_ReceiveFileIBLL.ZhuRenP(); + //entity.SpecifyReceiver = "System"; + sys_ReceiveFileIBLL.ReceiveDocumentIssue(entity); + return Success("发送成功"); + } + + /// + /// 校长批示 + /// + /// + [HttpPost] + [AjaxOnly] + public ActionResult XiaoZhangP(string strEntity) + { + Sys_IssueEntity entity = strEntity.ToObject(); + entity.SpecifyReceiver = sys_ReceiveFileIBLL.XiaoZhangP(); + //entity.SpecifyReceiver = "System"; + sys_ReceiveFileIBLL.ReceiveDocumentIssue(entity); + 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 18a363eee..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 @@ -21,7 +21,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { private Sys_SendFileIBLL sys_SendFileIBLL = new Sys_SendFileBLL(); - #region 视图功能 + #region 视图功能 /// /// 主页面 @@ -32,6 +32,26 @@ 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() { @@ -47,6 +67,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + /// /// 主页面【党政公文下发】 /// @@ -56,11 +77,13 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + [HttpGet] public ActionResult FormDocument() { return View(); } + /// /// 表单页 /// @@ -70,6 +93,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + /// /// 表单页【党政公文下发】 /// @@ -91,6 +115,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + /// /// 【党政公文下发】 /// @@ -100,6 +125,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + [HttpGet] public ActionResult ReadList() { @@ -111,6 +137,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + /// /// 【党政公文下发】 /// @@ -120,9 +147,10 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + #endregion - #region 获取数据 + #region 获取数据 /// /// 获取页面显示列表数据 @@ -135,6 +163,18 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { Pagination paginationobj = pagination.ToObject(); var data = sys_SendFileIBLL.GetPageList(paginationobj, queryJson).Where(m => m.STypeId == 1); + + foreach (var item in data) + { + var sql = $"SELECT COUNT(*) FROM dbo.Sys_ReceiveFile where ReadFlag=1 AND SFileId='{item.SFileId}'"; + var sendSql = $"SELECT COUNT(*) FROM dbo.Sys_ReceiveFile where SFileId='{item.SFileId}'"; + var readdt = sys_SendFileIBLL.Execute(sql); + var senddt = sys_SendFileIBLL.Execute(sendSql); + var readcount = readdt.Rows[0][0]; + var sendcount = senddt.Rows[0][0]; + item.NumberPeople = $"{readcount}/{sendcount}"; + } + var jsonData = new { rows = data, @@ -144,6 +184,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers }; return Success(jsonData); } + [HttpGet] [AjaxOnly] public ActionResult GetPageListDocument(string pagination, string queryJson) @@ -159,12 +200,24 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers }; return Success(jsonData); } + [HttpGet] [AjaxOnly] public ActionResult GetPageListParty(string pagination, string queryJson) { Pagination paginationobj = pagination.ToObject(); var data = sys_SendFileIBLL.GetPageList(paginationobj, queryJson).Where(m => m.STypeId == 3); + + foreach (var item in data) + { + var sql = $"SELECT COUNT(*) FROM dbo.Sys_ReceiveFile where ReadFlag=1 AND SFileId='{item.SFileId}'"; + var sendSql = $"SELECT COUNT(*) FROM dbo.Sys_ReceiveFile where SFileId='{item.SFileId}'"; + var readdt = sys_SendFileIBLL.Execute(sql); + var senddt = sys_SendFileIBLL.Execute(sendSql); + var readcount = readdt.Rows[0][0]; + var sendcount = senddt.Rows[0][0]; + item.NumberPeople = $"{readcount}/{sendcount}"; + } var jsonData = new { rows = data, @@ -174,6 +227,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers }; return Success(jsonData); } + /// /// 获取表单数据 /// @@ -190,6 +244,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers }; return Success(jsonData); } + [HttpGet] [AjaxOnly] public ActionResult GetFormDataView(string keyValue) @@ -202,6 +257,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers }; return Success(jsonData); } + /// /// 获取表单数据 /// @@ -217,9 +273,10 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers }; return Success(jsonData); } + #endregion - #region 提交数据 + #region 提交数据 /// /// 删除实体数据 @@ -233,6 +290,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers sys_SendFileIBLL.DeleteEntity(keyValue); return Success("删除成功！"); } + /// /// 保存实体数据（新增、修改） /// 主键 @@ -249,6 +307,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { entity.STypeId = 1; } + sys_SendFileIBLL.SaveEntity(keyValue, entity); return Success("保存成功！"); } @@ -264,6 +323,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { entity.STypeId = 2; } + sys_SendFileIBLL.SaveEntity(keyValue, entity); return Success("保存成功！"); } @@ -279,9 +339,11 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { entity.STypeId = 3; } + sys_SendFileIBLL.SaveEntity(keyValue, entity); return Success("保存成功！"); } + /// /// 提交 /// @@ -294,6 +356,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers sys_SendFileIBLL.ChangeStatusById(keyValue, 1, processId); return Success("操作成功！"); } + [HttpPost] [AjaxOnly] public ActionResult ChangeStatusByIdDocument(string keyValue) @@ -303,6 +366,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers sys_SendFileIBLL.ChangeStatusByProcessId(guid, 2); return Success("操作成功！"); } + /// /// 结束下发 /// @@ -316,6 +380,14 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers sys_SendFileIBLL.OverIssue(keyValue); return Success("下发成功！"); } + + + /* public ActionResult ReceiveFile(string keyValue) + { + + return View(); + }*/ + #endregion } 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 new file mode 100644 index 000000000..80bade281 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/MessageRindController.cs @@ -0,0 +1,188 @@ +using Learun.Util; +using System.Data; +using Learun.Application.TwoDevelopment.LR_Desktop; +using System.Web.Mvc; +using System.Collections.Generic; +using System.Collections; + +namespace Learun.Application.Web.Areas.LR_Desktop.Controllers +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-04-23 16:58 + /// 描 述：消息提醒 + /// + public class MessageRindController : MvcControllerBase + { + private MessageRindIBLL messageRindIBLL = new MessageRindBLL(); + + #region 视图功能 + + /// + /// 主页面 + /// + /// + [HttpGet] + public ActionResult Index() + { + return View(); + } + /// + /// 未读消息页面 + /// + /// + [HttpGet] + public ActionResult UnreadIndex() + { + ViewBag.Name = (LoginUserInfo.Get()).realName; + return View(); + } + /// + /// 表单页 + /// + /// + [HttpGet] + public ActionResult Form() + { + return View(); + } + #endregion + + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 分页参数 + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetPageList(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var data = messageRindIBLL.GetPageList(paginationobj, queryJson); + var jsonData = new + { + rows = data, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records + }; + return Success(jsonData); + } + + /// + /// 获取未读的消息的数量 + /// + /// 分页参数 + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetCountForUnread() + { + var count = messageRindIBLL.GetCountForUnread(); + + return Success(count); + } + /// + /// 获取未读的消息 + /// + /// 分页参数 + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetListForUnread() + { + var data = messageRindIBLL.GetListForUnread(); + List list = new List(); + foreach (var entity in data) + { + Hashtable ht = new Hashtable(); + ht["MessageId"] = entity.MessageId; + ht["SenderName"] = entity.SenderName; + ht["TheTitle"] = entity.TheTitle; + ht["TheContent"] = entity.TheContent; + ht["ConnectionUrl"] = entity.ConnectionUrl; + ht["InstanceId"] = entity.InstanceId; + list.Add(ht); + } + return ToJsonResult(list); + } + + /// + /// 获取表单数据 + /// + /// 主键 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetFormData(string keyValue) + { + var MessageRemindData = messageRindIBLL.GetMessageRemindEntity(keyValue); + var jsonData = new + { + MessageRemind = MessageRemindData, + }; + return Success(jsonData); + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + /// + [HttpPost] + [AjaxOnly] + public ActionResult DeleteForm(string keyValue) + { + messageRindIBLL.DeleteEntity(keyValue); + return Success("删除成功！"); + } + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveForm(string keyValue, string strEntity) + { + MessageRemindEntity entity = strEntity.ToObject(); + messageRindIBLL.SaveEntity(keyValue, entity); + if (string.IsNullOrEmpty(keyValue)) + { + } + return Success("保存成功！"); + } + + /// + /// 更改状态为已读 + /// + /// 主键 + /// 实体 + /// + [HttpPost] + [AjaxOnly] + public ActionResult SaveReadSigns(string keyValue) + { + if (!string.IsNullOrEmpty(keyValue)) + { + messageRindIBLL.SaveReadSigns(keyValue); + } + return Success("保存成功！"); + } + + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/MessageRind/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/MessageRind/Form.cshtml new file mode 100644 index 000000000..176ce92ce --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/MessageRind/Form.cshtml @@ -0,0 +1,35 @@ +@{ + ViewBag.Title = "消息提醒"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
+
+
收件人ID
+ +
+
+
收件人姓名
+ +
+
+
发件人ID
+ +
+
+
发件人姓名
+ +
+
+
发送时间
+ +
+
+
标题
+ +
+
+
内容
+ +
+
+@Html.AppendJsFile("/Areas/LR_Desktop/Views/MessageRind/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/MessageRind/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/MessageRind/Form.js new file mode 100644 index 000000000..4a30a5bfb --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/MessageRind/Form.js @@ -0,0 +1,41 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2021-05-08 + * 描 述：消息提醒 + */ +var acceptClick; +var keyValue = request('keyValue'); +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.bind(); + page.initData(); + }, + bind: function () { + + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/LR_Desktop/MessageRemind/GetFormData?keyValue=' + keyValue, function (data) { + $('#form').lrSetFormData(data); + }); + } + } + }; + //保存数据 + acceptClick = function (callBack) { + if (!$('#form').lrValidform()) { + return false; + } + var postData = $('#form').lrGetFormData(); + $.lrSaveForm(top.$.rootUrl + '/LR_Desktop/MessageRind/SaveForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/MessageRind/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/MessageRind/Index.cshtml new file mode 100644 index 000000000..2ed0fa29c --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/MessageRind/Index.cshtml @@ -0,0 +1,94 @@ +@{ + ViewBag.Title = "消息提醒"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
+
+
+
+
+
+
+
+ +
+
+ @* 新增 +  编辑 +  删除*@ +  查看 +  打印 + +
+
+ +
+
+
+
+
+
+ @*
+
您有新的未读消息x
+
+
+ +
*@ +
+@Html.AppendJsFile("/Areas/LR_Desktop/Views/MessageRind/Index.js"); + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/MessageRind/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/MessageRind/Index.js new file mode 100644 index 000000000..60236ceef --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/MessageRind/Index.js @@ -0,0 +1,150 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2021-04-23 16:58 + * 描 述：消息提醒 + */ +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var startTime; + var endTime; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + // 时间搜索框 + $('#datesearch').lrdate({ + dfdata: [ + { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } } + ], + // 月 + mShow: false, + premShow: false, + // 季度 + jShow: false, + prejShow: false, + // 年 + ysShow: false, + yxShow: false, + preyShow: false, + yShow: false, + // 默认 + dfvalue: '1', + selectfn: function (begin, end) { + startTime = begin; + endTime = end; + page.search(); + } + }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 新增 + $('#lr_add').on('click', function () { + learun.layerForm({ + id: 'form', + title: '新增', + url: top.$.rootUrl + '/LR_Desktop/MessageRind/Form', + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + }); + // 编辑 + $('#lr_edit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('MessageId'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'form', + title: '编辑', + url: top.$.rootUrl + '/LR_Desktop/MessageRind/Form?keyValue=' + keyValue, + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); + // 删除 + $('#lr_delete').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('MessageId'); + if (learun.checkrow(keyValue)) { + learun.layerConfirm('是否确认删除该项！', function (res) { + if (res) { + learun.deleteForm(top.$.rootUrl + '/LR_Desktop/MessageRind/DeleteForm', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + } + }); + // 打印 + $('#lr_print').on('click', function () { + $('#gridtable').jqprintTable(); + }); + // 查看 + $('#lr_view').on('click', function () { + var title = $('#gridtable').jfGridValue('TheTitle'); + var keyValue = $('#gridtable').jfGridValue('InstanceId'); + //var MessageId = $('#gridtable').jfGridValue('MessageId'); + var ConnectionUrl = $('#gridtable').jfGridValue('ConnectionUrl'); + var url = top.$.rootUrl + ConnectionUrl + keyValue; + learun.layerForm({ + id: 'formview', + title: title, + url: url, + width: 1000, + height: 650, + maxmin: true, + btn: null, + }); + }); + + }, + + + // 初始化列表 + initGird: function () { + $('#gridtable').lrAuthorizeJfGrid({ + url: top.$.rootUrl + '/LR_Desktop/MessageRind/GetPageList', + headData: [ + //{ label: "收件人ID", name: "ReceiptId", width: 100, align: "left"}, + { label: "收件人姓名", name: "ReceiptName", width: 100, align: "left" }, + //{ label: "发件人ID", name: "SenderId", width: 100, align: "left"}, + { label: "发件人姓名", name: "SenderName", width: 100, align: "left" }, + { label: "发送时间", name: "SendTime", width: 100, align: "left" }, + { label: "标题", name: "TheTitle", width: 100, align: "left" }, + { label: "内容", name: "TheContent", width: 400, align: "left" }, + { + label: "状态", name: "ReadSigns", width: 100, align: "left", formatter: function (cellvalue) { + return cellvalue == false ? "未读" : "已读"; + } + }, + ], + mainId: 'MessageId', + isPage: true + }); + }, + search: function (param) { + param = param || {}; + param.StartTime = startTime; + param.EndTime = endTime; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + $('#gridtable').jfGridSet('reload'); + }; + page.init(); + +} 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 new file mode 100644 index 000000000..c970e5dc8 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/MessageRind/UnreadIndex.cshtml @@ -0,0 +1,141 @@ +@*@{ + ViewBag.Title = "未读消息"; + Layout = "~/Views/Shared/_Index.cshtml"; + } +
+
+
+ +
+
+
+
*@ + + + + + + 未读消息提醒 + + + + + @Html.AppendCssFile( + "/Views/LR_Content/style/lr-common.css", + "/Views/LR_Content/style/lr-iframe-index.css", + "~/Content/jquery/plugin/toastr/toastr.css" + ) + + + +
+ +
+ @Html.AppendJsFile( + "~/Content/jquery/plugin/toastr/toastr.min.js", + "~/Views/LR_Content/script/lr-admin.js", + "~/Views/LR_Content/script/lr-clientdata.js", + "~/Content/jquery/plugin/fullcalendar/js/jquery-1.7.2.min.js", + "~/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 44143ded1..77c548708 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 @@ -389,6 +389,7 @@ + @@ -1251,6 +1252,8 @@ + + @@ -6957,6 +6960,9 @@ + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_Desktop/MessageRemindMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_Desktop/MessageRemindMap.cs new file mode 100644 index 000000000..390cac612 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_Desktop/MessageRemindMap.cs @@ -0,0 +1,29 @@ +using Learun.Application.TwoDevelopment.LR_Desktop; +using System.Data.Entity.ModelConfiguration; + +namespace Learun.Application.Mapping +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-04-23 16:58 + /// 描 述：消息提醒 + /// + public class MessageRemindMap : EntityTypeConfiguration + { + public MessageRemindMap() + { + #region 表、主键 + //表 + this.ToTable("MESSAGEREMIND"); + //主键 + this.HasKey(t => t.MessageId); + #endregion + + #region 配置关系 + #endregion + } + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj index 9ad49e5dd..611ff0175 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj @@ -110,6 +110,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/MessageRind/MessageRemindEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/MessageRind/MessageRemindEntity.cs new file mode 100644 index 000000000..a1d98e964 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/MessageRind/MessageRemindEntity.cs @@ -0,0 +1,95 @@ +using Learun.Util; +using System; +using System.ComponentModel.DataAnnotations.Schema; + +namespace Learun.Application.TwoDevelopment.LR_Desktop +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-04-23 16:58 + /// 描 述：消息提醒 + /// + public class MessageRemindEntity + { + #region 实体成员 + /// + /// MessageId + /// + [Column("MESSAGEID")] + public string MessageId { get; set; } + /// + /// ReceiptId + /// + [Column("RECEIPTID")] + public string ReceiptId { get; set; } + /// + /// ReceiptName + /// + [Column("RECEIPTNAME")] + public string ReceiptName { get; set; } + /// + /// SenderId + /// + [Column("SENDERID")] + public string SenderId { get; set; } + /// + /// SenderName + /// + [Column("SENDERNAME")] + public string SenderName { get; set; } + /// + /// TheTitle + /// + [Column("THETITLE")] + public string TheTitle { get; set; } + /// + /// TheContent + /// + [Column("THECONTENT")] + public string TheContent { get; set; } + /// + /// ConnectionUrl + /// + [Column("CONNECTIONURL")] + public string ConnectionUrl { get; set; } + /// + /// 实例Id + /// + [Column("INSTANCEId")] + public string InstanceId { get; set; } + /// + /// SendTime + /// + [Column("SENDTIME")] + public DateTime? SendTime { get; set; } + /// + /// ReadSigns + /// + [Column("READSIGNS")] + public bool? ReadSigns { get; set; } + #endregion + + #region 扩展操作 + /// + /// 新增调用 + /// + public void Create() + { + this.MessageId = Guid.NewGuid().ToString(); + } + /// + /// 编辑调用 + /// + /// + public void Modify(string keyValue) + { + this.MessageId = keyValue; + } + #endregion + #region 扩展字段 + #endregion + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/MessageRind/MessageRindBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/MessageRind/MessageRindBLL.cs new file mode 100644 index 000000000..0b332ac33 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/MessageRind/MessageRindBLL.cs @@ -0,0 +1,194 @@ +using Learun.Util; +using System; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.LR_Desktop +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-04-23 16:58 + /// 描 述：消息提醒 + /// + public class MessageRindBLL : MessageRindIBLL + { + private MessageRindService messageRindService = new MessageRindService(); + + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 分页参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + return messageRindService.GetPageList(pagination, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 未读消息 + /// + /// + public IEnumerable GetListForUnread() + { + try + { + return messageRindService.GetListForUnread(); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + + /// + /// 未读消息的数量 + /// + /// + public int GetCountForUnread() + { + try + { + return messageRindService.GetCountForUnread(); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 获取MessageRemind表实体数据 + /// + /// 主键 + /// + public MessageRemindEntity GetMessageRemindEntity(string keyValue) + { + try + { + return messageRindService.GetMessageRemindEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + public void DeleteEntity(string keyValue) + { + try + { + messageRindService.DeleteEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + /// + public void SaveEntity(string keyValue, MessageRemindEntity entity) + { + try + { + messageRindService.SaveEntity(keyValue, entity); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 修改为已读 + /// + /// + public void SaveReadSigns(string keyValue) + { + try + { + messageRindService.SaveReadSigns(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/MessageRind/MessageRindIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/MessageRind/MessageRindIBLL.cs new file mode 100644 index 000000000..ea552d6ee --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/MessageRind/MessageRindIBLL.cs @@ -0,0 +1,63 @@ +using Learun.Util; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.LR_Desktop +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-04-23 16:58 + /// 描 述：消息提醒 + /// + public interface MessageRindIBLL + { + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + IEnumerable GetPageList(Pagination pagination, string queryJson); + /// + /// 获取未读的消息 + /// + /// + IEnumerable GetListForUnread(); + /// + /// 获取未读的消息的数量 + /// + /// + int GetCountForUnread(); + /// + /// 获取MessageRemind表实体数据 + /// + /// 主键 + /// + MessageRemindEntity GetMessageRemindEntity(string keyValue); + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + void DeleteEntity(string keyValue); + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + void SaveEntity(string keyValue, MessageRemindEntity entity); + /// + /// 修改为已读 + /// + /// + void SaveReadSigns(string keyValue); + #endregion + + } +} 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 new file mode 100644 index 000000000..db2ee1ed8 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/MessageRind/MessageRindService.cs @@ -0,0 +1,231 @@ +using Dapper; +using Learun.DataBase.Repository; +using Learun.Util; +using System; +using System.Collections.Generic; +using System.Data; +using System.Text; + +namespace Learun.Application.TwoDevelopment.LR_Desktop +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-04-23 16:58 + /// 描 述：消息提醒 + /// + public class MessageRindService : RepositoryFactory + { + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + var strSql = new StringBuilder(); + strSql.Append("SELECT "); + strSql.Append(@" + t.* + "); + strSql.Append(" FROM MessageRemind t "); + strSql.Append(" WHERE 1=1 "); + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty()) + { + dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime); + dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime); + strSql.Append(" AND ( t.SendTime >= @startTime AND t.SendTime <= @endTime ) "); + } + return this.BaseRepository().FindList(strSql.ToString(), dp, pagination); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取MessageRemind表未读的消息 + /// + /// + public IEnumerable GetListForUnread() + { + try + { + var userInfo = LoginUserInfo.Get(); + return this.BaseRepository().FindList(x => x.ReadSigns == false && x.ReceiptId == userInfo.userId); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取MessageRemind表未读消息的数量 + /// + /// + public int GetCountForUnread() + { + try + { + var userInfo = LoginUserInfo.Get(); + string sql = "select count(1) from MessageRemind where ReadSigns=0 "; + + sql += $" and ReceiptId='{userInfo.userId}'"; + + var obj = this.BaseRepository().FindObject(sql); + if (obj == null) + return 0; + else + return Convert.ToInt32(obj); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取MessageRemind表实体数据 + /// + /// 主键 + /// + public MessageRemindEntity GetMessageRemindEntity(string keyValue) + { + try + { + return this.BaseRepository().FindEntity(x => x.MessageId == keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + public void DeleteEntity(string keyValue) + { + try + { + this.BaseRepository().Delete(t => t.MessageId == keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + public void SaveEntity(string keyValue, MessageRemindEntity entity) + { + try + { + if (!string.IsNullOrEmpty(keyValue)) + { + entity.Modify(keyValue); + this.BaseRepository().Update(entity); + } + else + { + entity.Create(); + this.BaseRepository().Insert(entity); + } + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + public void SaveReadSigns(string keyValue) + { + try + { + string sql = $"update MessageRemind set ReadSigns=1 where MessageId='{keyValue}'"; + this.BaseRepository().ExecuteBySql(sql); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj index 046f04901..a6ef09290 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj @@ -256,6 +256,10 @@ + + + +