diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingManagementController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingManagementController.cs index 72419ab5a..8e6802a3f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingManagementController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingManagementController.cs @@ -7,17 +7,17 @@ using System.Collections.Generic; namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers { /// - /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 - /// Copyright (c) 2013-2018 北京泉江科技有限公司 + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 /// 创 建：超级管理员 - /// 日 期：2020-03-23 15:04 - /// 描 述：会议室管理 + /// 日 期：2021-02-21 10:07 + /// 描 述：会议管理 /// public class MeetingManagementController : MvcControllerBase { private MeetingManagementIBLL meetingManagementIBLL = new MeetingManagementBLL(); - #region 视图功能 + #region 视图功能 /// /// 主页面 @@ -39,11 +39,12 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers } #endregion - #region 获取数据 + #region 获取数据 /// - /// 获取页面显示列表数据 + /// 获取页面显示列表分页数据 /// + /// 分页参数 /// 查询参数 /// [HttpGet] @@ -62,6 +63,18 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers return Success(jsonData); } /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetList(string queryJson) + { + var data = meetingManagementIBLL.GetList(queryJson); + return Success(data); + } + /// /// 获取表单数据 /// /// @@ -77,7 +90,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers } #endregion - #region 提交数据 + #region 提交数据 /// /// 删除实体数据 @@ -101,8 +114,8 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers [AjaxOnly] public ActionResult SaveForm(string keyValue, string strEntity) { - MeetingManagementEntity entity = strEntity.ToObject(); - meetingManagementIBLL.SaveEntity(keyValue,entity); + UserInfo userInfo = LoginUserInfo.Get(); MeetingManagementEntity entity = strEntity.ToObject(); + meetingManagementIBLL.SaveEntity(userInfo,keyValue,entity); return Success("保存成功！"); } #endregion diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingSignInRecordController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingSignInRecordController.cs new file mode 100644 index 000000000..12ea937d1 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingSignInRecordController.cs @@ -0,0 +1,124 @@ +using Learun.Util; +using System.Data; +using Learun.Application.TwoDevelopment.PersonnelManagement; +using System.Web.Mvc; +using System.Collections.Generic; + +namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-02-21 10:16 + /// 描 述：会议签到记录 + /// + public class MeetingSignInRecordController : MvcControllerBase + { + private MeetingSignInRecordIBLL meetingSignInRecordIBLL = new MeetingSignInRecordBLL(); + + #region 视图功能 + + /// + /// 主页面 + /// + /// + [HttpGet] + public ActionResult Index() + { + 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 = meetingSignInRecordIBLL.GetPageList(paginationobj, queryJson); + var jsonData = new + { + rows = data, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records + }; + return Success(jsonData); + } + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetList(string queryJson) + { + var data = meetingSignInRecordIBLL.GetList(queryJson); + return Success(data); + } + /// + /// 获取表单数据 + /// + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetFormData(string keyValue) + { + var MeetingSignInRecordData = meetingSignInRecordIBLL.GetMeetingSignInRecordEntity( keyValue ); + var jsonData = new { + MeetingSignInRecord = MeetingSignInRecordData, + }; + return Success(jsonData); + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// 主键 + /// + /// + [HttpPost] + [AjaxOnly] + public ActionResult DeleteForm(string keyValue) + { + meetingSignInRecordIBLL.DeleteEntity(keyValue); + return Success("删除成功！"); + } + /// + /// 保存实体数据（新增、修改） + /// 主键 + /// + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveForm(string keyValue, string strEntity) + { + UserInfo userInfo = LoginUserInfo.Get(); MeetingSignInRecordEntity entity = strEntity.ToObject(); + meetingSignInRecordIBLL.SaveEntity(userInfo,keyValue,entity); + return Success("保存成功！"); + } + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/Form.cshtml index c7d673dda..7a90cecd2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/Form.cshtml @@ -1,31 +1,39 @@ @{ - ViewBag.Title = "会议室管理"; + ViewBag.Title = "会议管理"; Layout = "~/Views/Shared/_Form.cshtml"; }
-
会议室*
- +
会议主题
+
-
预约时间*
- +
会议地点
+
-
使用时间
- +
开始时间
+
-
纪要记录人
- +
结束时间
+
-
会议纪要
- +
会议记录者
+
-
附件
+
会议内容
+
+
+
+
附件上传
+
+
申请人
+
+
@Html.AppendJsFile("/Areas/PersonnelManagement/Views/MeetingManagement/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/Form.js index 7b69ecedb..941f23511 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/Form.js @@ -1,8 +1,8 @@ -/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) - * Copyright (c) 2013-2018 北京泉江科技有限公司 +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 * 创建人：超级管理员 - * 日 期：2020-03-23 15:04 - * 描 述：会议室管理 + * 日 期：2021-02-21 10:07 + * 描 述：会议管理 */ var acceptClick; var keyValue = request('keyValue'); @@ -15,7 +15,21 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { - $('#Files').lrUploader(); + $('#MeetingPlace').lrDataItemSelect({ code: '' }); + $('#RecordPerson').lrformselect({ + layerUrl: top.$.rootUrl + '/LR_OrganizationModule/User/SelectOnlyForm', + layerUrlW: 400, + layerUrlH: 300, + dataUrl: top.$.rootUrl + '/LR_OrganizationModule/User/GetListByUserIds' + }); + var ContentUE = UE.getEditor('Content'); + $('#Content')[0].ue = ContentUE; $('#Files').lrUploader(); + $('#CreateUser').lrformselect({ + layerUrl: top.$.rootUrl + '/LR_OrganizationModule/User/SelectOnlyForm', + layerUrlW: 400, + layerUrlH: 300, + dataUrl: top.$.rootUrl + '/LR_OrganizationModule/User/GetListByUserIds' + }); }, initData: function () { if (!!keyValue) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/Index.cshtml index 741b46d2e..324402e36 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/Index.cshtml @@ -1,5 +1,5 @@ @{ - ViewBag.Title = "会议室管理"; + ViewBag.Title = "会议管理"; Layout = "~/Views/Shared/_Index.cshtml"; }
@@ -11,8 +11,16 @@
-
会议室
- +
会议主题
+ +
+
+
会议地点
+
+
+
+
申请人
+
@@ -26,6 +34,7 @@  新增  编辑  删除 +  打印
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/Index.js index 7b591c468..322df1af9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/Index.js @@ -1,8 +1,8 @@ -/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) - * Copyright (c) 2013-2018 北京泉江科技有限公司 +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 * 创建人：超级管理员 - * 日 期：2020-03-23 15:04 - * 描 述：会议室管理 + * 日 期：2021-02-21 10:07 + * 描 述：会议管理 */ var refreshGirdData; var bootstrap = function ($, learun) { @@ -16,13 +16,15 @@ var bootstrap = function ($, learun) { $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); }, 220, 400); + $('#MeetingPlace').lrDataItemSelect({ code: '' }); + $('#CreateUser').lrUserSelect(0); // 刷新 $('#lr_refresh').on('click', function () { location.reload(); }); // 新增 $('#lr_add').on('click', function () { - learun.layerForm({ + learun.layerForm({ id: 'form', title: '新增', url: top.$.rootUrl + '/PersonnelManagement/MeetingManagement/Form', @@ -53,7 +55,7 @@ var bootstrap = function ($, learun) { $('#lr_delete').on('click', function () { var keyValue = $('#gridtable').jfGridValue('Id'); if (learun.checkrow(keyValue)) { - learun.layerConfirm('是否确认删除该项！', function (res) { + learun.layerConfirm('是否确认删除该项！', function (res) { if (res) { learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/DeleteForm', { keyValue: keyValue}, function () { refreshGirdData(); @@ -62,18 +64,49 @@ var bootstrap = function ($, learun) { }); } }); + // 打印 + $('#lr_print').on('click', function () { + $('#gridtable').jqprintTable(); + }); }, // 初始化列表 initGird: function () { $('#gridtable').lrAuthorizeJfGrid({ url: top.$.rootUrl + '/PersonnelManagement/MeetingManagement/GetPageList', headData: [ - { label: "会议室", name: "MeetingName", width: 100, align: "left"}, - { label: "预约时间", name: "OrderTime", width: 130, align: "left"}, - { label: "使用时间", name: "UseTime", width: 130, align: "left"}, - { label: "纪要记录人", name: "RecordPerson", width: 100, align: "left"}, - { label: "会议纪要", name: "Content", width: 100, align: "left"}, - { label: "附件", name: "Files", width: 100, align: "left"}, + { label: "会议主题", name: "MeetingTitle", width: 100, align: "left"}, + { label: "会议地点", name: "MeetingPlace", width: 100, align: "left", + formatterAsync: function (callback, value, row, op,$cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: '', + callback: function (_data) { + callback(_data.text); + } + }); + }}, + { label: "开始时间", name: "BeginTime", width: 100, align: "left"}, + { label: "结束时间", name: "EndTime", width: 100, align: "left"}, + { label: "申请人", name: "CreateUser", width: 100, align: "left", + formatterAsync: function (callback, value, row, op,$cell) { + learun.clientdata.getAsync('user', { + key: value, + callback: function (_data) { + callback(_data.name); + } + }); + }}, + { label: "会议记录者", name: "RecordPerson", width: 100, align: "left", + formatterAsync: function (callback, value, row, op,$cell) { + learun.clientdata.getAsync('user', { + key: value, + callback: function (_data) { + callback(_data.name); + } + }); + }}, + { label: "会议内容", name: "Content", width: 100, align: "left"}, + { label: "附件上传", name: "Files", width: 100, align: "left"}, ], mainId:'Id', isPage: true @@ -86,7 +119,7 @@ var bootstrap = function ($, learun) { } }; refreshGirdData = function () { - page.search(); + $('#gridtable').jfGridSet('reload'); }; page.init(); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingSignInRecord/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingSignInRecord/Form.cshtml new file mode 100644 index 000000000..594a2a948 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingSignInRecord/Form.cshtml @@ -0,0 +1,27 @@ +@{ + ViewBag.Title = "会议签到记录"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
+
+
会议
+
+
+
+
参与人id
+
+
+
+
参与人名字
+ +
+
+
是否签到
+
+
+
+
参加时间
+ +
+
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/MeetingSignInRecord/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingSignInRecord/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingSignInRecord/Form.js new file mode 100644 index 000000000..0dbde9dd1 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingSignInRecord/Form.js @@ -0,0 +1,58 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2021-02-21 10:16 + * 描 述：会议签到记录 + */ +var acceptClick; +var keyValue = request('keyValue'); +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + $('.lr-form-wrap').lrscroll(); + page.bind(); + page.initData(); + }, + bind: function () { + $('#MeetID').lrDataItemSelect({ code: '' }); + $('#ParticipantID').lrformselect({ + layerUrl: top.$.rootUrl + '/LR_OrganizationModule/User/SelectOnlyForm', + layerUrlW: 400, + layerUrlH: 300, + dataUrl: top.$.rootUrl + '/LR_OrganizationModule/User/GetListByUserIds' + }); + $('#IsSignIn').lrDataItemSelect({ code: 'YesOrNoBit' }); + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/PersonnelManagement/MeetingSignInRecord/GetFormData?keyValue=' + keyValue, function (data) { + for (var id in data) { + if (!!data[id].length && data[id].length > 0) { + $('#' + id ).jfGridSet('refreshdata', data[id]); + } + else { + $('[data-table="' + id + '"]').lrSetFormData(data[id]); + } + } + }); + } + } + }; + // 保存数据 + acceptClick = function (callBack) { + if (!$('body').lrValidform()) { + return false; + } + var postData = { + strEntity: JSON.stringify($('body').lrGetFormData()) + }; + $.lrSaveForm(top.$.rootUrl + '/PersonnelManagement/MeetingSignInRecord/SaveForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingSignInRecord/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingSignInRecord/Index.cshtml new file mode 100644 index 000000000..94ddf6949 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingSignInRecord/Index.cshtml @@ -0,0 +1,27 @@ +@{ + ViewBag.Title = "会议签到记录"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
+
+
+
+
+ +
+
+  新增 +  编辑 +  删除 +  打印 +
+
+
+
+
+
+
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/MeetingSignInRecord/Index.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingSignInRecord/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingSignInRecord/Index.js new file mode 100644 index 000000000..f0e607afa --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingSignInRecord/Index.js @@ -0,0 +1,118 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2021-02-21 10:16 + * 描 述：会议签到记录 + */ +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 新增 + $('#lr_add').on('click', function () { + learun.layerForm({ + id: 'form', + title: '新增', + url: top.$.rootUrl + '/PersonnelManagement/MeetingSignInRecord/Form', + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + }); + // 编辑 + $('#lr_edit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('ID'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'form', + title: '编辑', + url: top.$.rootUrl + '/PersonnelManagement/MeetingSignInRecord/Form?keyValue=' + keyValue, + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); + // 删除 + $('#lr_delete').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('ID'); + if (learun.checkrow(keyValue)) { + learun.layerConfirm('是否确认删除该项！', function (res) { + if (res) { + learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/MeetingSignInRecord/DeleteForm', { keyValue: keyValue}, function () { + refreshGirdData(); + }); + } + }); + } + }); + // 打印 + $('#lr_print').on('click', function () { + $('#gridtable').jqprintTable(); + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').lrAuthorizeJfGrid({ + url: top.$.rootUrl + '/PersonnelManagement/MeetingSignInRecord/GetPageList', + headData: [ + { label: "会议", name: "MeetID", width: 100, align: "left", + formatterAsync: function (callback, value, row, op,$cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: '', + callback: function (_data) { + callback(_data.text); + } + }); + }}, + { label: "参与人id", name: "ParticipantID", width: 100, align: "left", + formatterAsync: function (callback, value, row, op,$cell) { + learun.clientdata.getAsync('user', { + key: value, + callback: function (_data) { + callback(_data.name); + } + }); + }}, + { label: "参与人名字", name: "ParticipantName", width: 100, align: "left"}, + { label: "是否签到", name: "IsSignIn", width: 100, align: "left", + formatterAsync: function (callback, value, row, op,$cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'YesOrNoBit', + callback: function (_data) { + callback(_data.text); + } + }); + }}, + { label: "参加时间", name: "SignInTime", width: 100, align: "left"}, + ], + mainId:'ID', + isPage: true + }); + page.search(); + }, + search: function (param) { + param = param || {}; + $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + $('#gridtable').jfGridSet('reload'); + }; + page.init(); +} 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 ec78642d6..2f755ea4e 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 @@ -793,6 +793,7 @@ + @@ -6129,6 +6130,10 @@ + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj index 1a2d19159..de753a218 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj @@ -272,6 +272,8 @@ + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PersonnelManagement/MeetingManagementApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PersonnelManagement/MeetingManagementApi.cs new file mode 100644 index 000000000..d6b9d3261 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PersonnelManagement/MeetingManagementApi.cs @@ -0,0 +1,116 @@ +using Nancy; +using Learun.Util; +using System.Collections.Generic; +using Learun.Application.TwoDevelopment.PersonnelManagement; +namespace Learun.Application.WebApi +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-02-21 10:07 + /// 描 述：会议管理 + /// + public class MeetingManagementApi : BaseApi + { + private MeetingManagementIBLL meetingManagementIBLL = new MeetingManagementBLL(); + + /// + /// 注册接口 + /// + public MeetingManagementApi() + : base("/learun/adms/PersonnelManagement/MeetingManagement") + { + Get["/pagelist"] = GetPageList; + Get["/list"] = GetList; + Get["/form"] = GetForm; + Post["/delete"] = DeleteForm; + Post["/save"] = SaveForm; + } + #region 获取数据 + + /// + /// 获取页面显示列表分页数据 + /// + /// + /// + public Response GetPageList(dynamic _) + { + ReqPageParam parameter = this.GetReqData(); + var data = meetingManagementIBLL.GetPageList(parameter.pagination, parameter.queryJson); + var jsonData = new + { + rows = data, + total = parameter.pagination.total, + page = parameter.pagination.page, + records = parameter.pagination.records + }; + return Success(jsonData); + } + /// + /// 获取页面显示列表数据 + /// + /// + /// + public Response GetList(dynamic _) + { + string queryJson = this.GetReqData(); + var data = meetingManagementIBLL.GetList(queryJson); + return Success(data); + } + /// + /// 获取表单数据 + /// + /// + /// + public Response GetForm(dynamic _) + { + string keyValue = this.GetReqData(); + var MeetingManagementData = meetingManagementIBLL.GetMeetingManagementEntity( keyValue ); + var jsonData = new { + MeetingManagement = MeetingManagementData, + }; + return Success(jsonData); + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// + /// + public Response DeleteForm(dynamic _) + { + string keyValue = this.GetReqData(); + meetingManagementIBLL.DeleteEntity(keyValue); + return Success("删除成功！"); + } + /// + /// 保存实体数据（新增、修改） + /// + /// + /// + public Response SaveForm(dynamic _) + { + ReqFormEntity parameter = this.GetReqData(); + MeetingManagementEntity entity = parameter.strEntity.ToObject(); + meetingManagementIBLL.SaveEntity(this.userInfo,parameter.keyValue,entity); + return Success("保存成功！"); + } + #endregion + + #region 私有类 + + /// + /// 表单实体类 + /// + private class ReqFormEntity { + public string keyValue { get; set; } + public string strEntity{ get; set; } + } + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PersonnelManagement/MeetingSignInRecordApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PersonnelManagement/MeetingSignInRecordApi.cs new file mode 100644 index 000000000..e2fb06404 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PersonnelManagement/MeetingSignInRecordApi.cs @@ -0,0 +1,116 @@ +using Nancy; +using Learun.Util; +using System.Collections.Generic; +using Learun.Application.TwoDevelopment.PersonnelManagement; +namespace Learun.Application.WebApi +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-02-21 10:16 + /// 描 述：会议签到记录 + /// + public class MeetingSignInRecordApi : BaseApi + { + private MeetingSignInRecordIBLL meetingSignInRecordIBLL = new MeetingSignInRecordBLL(); + + /// + /// 注册接口 + /// + public MeetingSignInRecordApi() + : base("/learun/adms/PersonnelManagement/MeetingSignInRecord") + { + Get["/pagelist"] = GetPageList; + Get["/list"] = GetList; + Get["/form"] = GetForm; + Post["/delete"] = DeleteForm; + Post["/save"] = SaveForm; + } + #region 获取数据 + + /// + /// 获取页面显示列表分页数据 + /// + /// + /// + public Response GetPageList(dynamic _) + { + ReqPageParam parameter = this.GetReqData(); + var data = meetingSignInRecordIBLL.GetPageList(parameter.pagination, parameter.queryJson); + var jsonData = new + { + rows = data, + total = parameter.pagination.total, + page = parameter.pagination.page, + records = parameter.pagination.records + }; + return Success(jsonData); + } + /// + /// 获取页面显示列表数据 + /// + /// + /// + public Response GetList(dynamic _) + { + string queryJson = this.GetReqData(); + var data = meetingSignInRecordIBLL.GetList(queryJson); + return Success(data); + } + /// + /// 获取表单数据 + /// + /// + /// + public Response GetForm(dynamic _) + { + string keyValue = this.GetReqData(); + var MeetingSignInRecordData = meetingSignInRecordIBLL.GetMeetingSignInRecordEntity( keyValue ); + var jsonData = new { + MeetingSignInRecord = MeetingSignInRecordData, + }; + return Success(jsonData); + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// + /// + public Response DeleteForm(dynamic _) + { + string keyValue = this.GetReqData(); + meetingSignInRecordIBLL.DeleteEntity(keyValue); + return Success("删除成功！"); + } + /// + /// 保存实体数据（新增、修改） + /// + /// + /// + public Response SaveForm(dynamic _) + { + ReqFormEntity parameter = this.GetReqData(); + MeetingSignInRecordEntity entity = parameter.strEntity.ToObject(); + meetingSignInRecordIBLL.SaveEntity(this.userInfo,parameter.keyValue,entity); + return Success("保存成功！"); + } + #endregion + + #region 私有类 + + /// + /// 表单实体类 + /// + private class ReqFormEntity { + public string keyValue { get; set; } + public string strEntity{ get; set; } + } + #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 57ae14407..d73602098 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 @@ -545,6 +545,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/PersonnelManagement/MeetingManagementMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/PersonnelManagement/MeetingManagementMap.cs index 9efa465e1..5a02a1628 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/PersonnelManagement/MeetingManagementMap.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/PersonnelManagement/MeetingManagementMap.cs @@ -4,24 +4,24 @@ using System.Data.Entity.ModelConfiguration; namespace Learun.Application.Mapping { /// - /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 - /// Copyright (c) 2013-2018 北京泉江科技有限公司 + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 /// 创 建：超级管理员 - /// 日 期：2020-03-23 15:04 - /// 描 述：会议室管理 + /// 日 期：2021-02-21 10:07 + /// 描 述：会议管理 /// public class MeetingManagementMap : EntityTypeConfiguration { public MeetingManagementMap() { - #region 表、主键 + #region 表、主键 //表 this.ToTable("MEETINGMANAGEMENT"); //主键 this.HasKey(t => t.Id); #endregion - #region 配置关系 + #region 配置关系 #endregion } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/PersonnelManagement/MeetingSignInRecordMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/PersonnelManagement/MeetingSignInRecordMap.cs new file mode 100644 index 000000000..19a97e93b --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/PersonnelManagement/MeetingSignInRecordMap.cs @@ -0,0 +1,29 @@ +using Learun.Application.TwoDevelopment.PersonnelManagement; +using System.Data.Entity.ModelConfiguration; + +namespace Learun.Application.Mapping +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-02-21 10:16 + /// 描 述：会议签到记录 + /// + public class MeetingSignInRecordMap : EntityTypeConfiguration + { + public MeetingSignInRecordMap() + { + #region 表、主键 + //表 + this.ToTable("MEETINGSIGNINRECORD"); + //主键 + this.HasKey(t => t.ID); + #endregion + + #region 配置关系 + #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 65a22902b..35f226c5d 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 @@ -1601,6 +1601,10 @@ + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementBLL.cs index 7872405d6..8f8f6bba4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementBLL.cs @@ -6,21 +6,22 @@ using System.Collections.Generic; namespace Learun.Application.TwoDevelopment.PersonnelManagement { /// - /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 - /// Copyright (c) 2013-2018 北京泉江科技有限公司 + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 /// 创 建：超级管理员 - /// 日 期：2020-03-23 15:04 - /// 描 述：会议室管理 + /// 日 期：2021-02-21 10:07 + /// 描 述：会议管理 /// public class MeetingManagementBLL : MeetingManagementIBLL { private MeetingManagementService meetingManagementService = new MeetingManagementService(); - #region 获取数据 + #region 获取数据 /// - /// 获取页面显示列表数据 + /// 获取页面显示列表分页数据 /// + /// 分页参数 /// 查询参数 /// public IEnumerable GetPageList(Pagination pagination, string queryJson) @@ -42,6 +43,30 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement } } + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + public IEnumerable GetList(string queryJson) + { + try + { + return meetingManagementService.GetList(queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + /// /// 获取MeetingManagement表实体数据 /// 主键 @@ -68,7 +93,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement #endregion - #region 提交数据 + #region 提交数据 /// /// 删除实体数据 @@ -99,11 +124,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement /// 主键 /// /// - public void SaveEntity(string keyValue, MeetingManagementEntity entity) + public void SaveEntity(UserInfo userInfo, string keyValue, MeetingManagementEntity entity) { try { - meetingManagementService.SaveEntity(keyValue, entity); + meetingManagementService.SaveEntity(userInfo, keyValue, entity); } catch (Exception ex) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementEntity.cs index 6ad467048..0dbe3c3fc 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementEntity.cs @@ -5,35 +5,40 @@ using System.ComponentModel.DataAnnotations.Schema; namespace Learun.Application.TwoDevelopment.PersonnelManagement { /// - /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 - /// Copyright (c) 2013-2018 北京泉江科技有限公司 + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 /// 创 建：超级管理员 - /// 日 期：2020-03-23 15:04 - /// 描 述：会议室管理 + /// 日 期：2021-02-21 10:07 + /// 描 述：会议管理 /// public class MeetingManagementEntity { - #region 实体成员 + #region 实体成员 /// /// Id /// [Column("ID")] public string Id { get; set; } /// - /// 会议室 + /// 会议主题 /// - [Column("MEETINGNAME")] - public string MeetingName { get; set; } + [Column("MEETINGTITLE")] + public string MeetingTitle { get; set; } /// - /// 预约时间 + /// 会议场地 + /// + [Column("MEETINGPLACE")] + public string MeetingPlace { get; set; } + /// + /// 开始时间 /// - [Column("ORDERTIME")] - public DateTime? OrderTime { get; set; } + [Column("BEGINTIME")] + public DateTime? BeginTime { get; set; } /// - /// 使用时间 + /// 结束时间 /// - [Column("USETIME")] - public DateTime? UseTime { get; set; } + [Column("ENDTIME")] + public DateTime? EndTime { get; set; } /// /// 纪要记录人 /// @@ -49,26 +54,36 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement /// [Column("FILES")] public string Files { get; set; } + /// + /// 申请人 + /// + [Column("CREATEUSER")] + public string CreateUser { get; set; } + /// + /// 预约时间 + /// + [Column("CREATETIME")] + public DateTime? CreateTime { get; set; } #endregion - #region 扩展操作 + #region 扩展操作 /// /// 新增调用 /// - public void Create() - { + public void Create(UserInfo userInfo) + { this.Id = Guid.NewGuid().ToString(); } /// /// 编辑调用 /// /// - public void Modify(string keyValue) + public void Modify(string keyValue, UserInfo userInfo) { this.Id = keyValue; } #endregion - #region 扩展字段 + #region 扩展字段 #endregion } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementIBLL.cs index 3337cdb37..ffdbc5325 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementIBLL.cs @@ -5,23 +5,30 @@ using System.Collections.Generic; namespace Learun.Application.TwoDevelopment.PersonnelManagement { /// - /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 - /// Copyright (c) 2013-2018 北京泉江科技有限公司 + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 /// 创 建：超级管理员 - /// 日 期：2020-03-23 15:04 - /// 描 述：会议室管理 + /// 日 期：2021-02-21 10:07 + /// 描 述：会议管理 /// public interface MeetingManagementIBLL { - #region 获取数据 + #region 获取数据 /// - /// 获取页面显示列表数据 + /// 获取页面显示列表分页数据 /// + /// 查询参数 /// 查询参数 /// IEnumerable GetPageList(Pagination pagination, string queryJson); /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + IEnumerable GetList(string queryJson); + /// /// 获取MeetingManagement表实体数据 /// 主键 /// @@ -29,7 +36,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement MeetingManagementEntity GetMeetingManagementEntity(string keyValue); #endregion - #region 提交数据 + #region 提交数据 /// /// 删除实体数据 @@ -42,7 +49,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement /// 主键 /// /// - void SaveEntity(string keyValue, MeetingManagementEntity entity); + void SaveEntity(UserInfo userInfo, string keyValue, MeetingManagementEntity entity); #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementService.cs index b502c3d80..b8f5a736c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementService.cs @@ -9,19 +9,20 @@ using System.Text; namespace Learun.Application.TwoDevelopment.PersonnelManagement { /// - /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 - /// Copyright (c) 2013-2018 北京泉江科技有限公司 + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 /// 创 建：超级管理员 - /// 日 期：2020-03-23 15:04 - /// 描 述：会议室管理 + /// 日 期：2021-02-21 10:07 + /// 描 述：会议管理 /// public class MeetingManagementService : RepositoryFactory { - #region 获取数据 + #region 获取数据 /// - /// 获取页面显示列表数据 + /// 获取页面显示列表分页数据 /// + /// 分页参数 /// 查询参数 /// public IEnumerable GetPageList(Pagination pagination, string queryJson) @@ -32,9 +33,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement strSql.Append("SELECT "); strSql.Append(@" t.Id, - t.MeetingName, - t.OrderTime, - t.UseTime, + t.MeetingTitle, + t.MeetingPlace, + t.BeginTime, + t.EndTime, + t.CreateUser, t.RecordPerson, t.Content, t.Files @@ -44,10 +47,20 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement var queryParam = queryJson.ToJObject(); // 虚拟参数 var dp = new DynamicParameters(new { }); - if (!queryParam["MeetingName"].IsEmpty()) + if (!queryParam["MeetingTitle"].IsEmpty()) + { + dp.Add("MeetingTitle", "%" + queryParam["MeetingTitle"].ToString() + "%", DbType.String); + strSql.Append(" AND t.MeetingTitle Like @MeetingTitle "); + } + if (!queryParam["MeetingPlace"].IsEmpty()) { - dp.Add("MeetingName", "%" + queryParam["MeetingName"].ToString() + "%", DbType.String); - strSql.Append(" AND t.MeetingName Like @MeetingName "); + dp.Add("MeetingPlace",queryParam["MeetingPlace"].ToString(), DbType.String); + strSql.Append(" AND t.MeetingPlace = @MeetingPlace "); + } + if (!queryParam["CreateUser"].IsEmpty()) + { + dp.Add("CreateUser",queryParam["CreateUser"].ToString(), DbType.String); + strSql.Append(" AND t.CreateUser = @CreateUser "); } return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp, pagination); } @@ -64,6 +77,63 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement } } + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + public IEnumerable GetList(string queryJson) + { + try + { + var strSql = new StringBuilder(); + strSql.Append("SELECT "); + strSql.Append(@" + t.Id, + t.MeetingTitle, + t.MeetingPlace, + t.BeginTime, + t.EndTime, + t.CreateUser, + t.RecordPerson, + t.Content, + t.Files + "); + strSql.Append(" FROM MeetingManagement t "); + strSql.Append(" WHERE 1=1 "); + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + if (!queryParam["MeetingTitle"].IsEmpty()) + { + dp.Add("MeetingTitle", "%" + queryParam["MeetingTitle"].ToString() + "%", DbType.String); + strSql.Append(" AND t.MeetingTitle Like @MeetingTitle "); + } + if (!queryParam["MeetingPlace"].IsEmpty()) + { + dp.Add("MeetingPlace",queryParam["MeetingPlace"].ToString(), DbType.String); + strSql.Append(" AND t.MeetingPlace = @MeetingPlace "); + } + if (!queryParam["CreateUser"].IsEmpty()) + { + dp.Add("CreateUser",queryParam["CreateUser"].ToString(), DbType.String); + strSql.Append(" AND t.CreateUser = @CreateUser "); + } + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + /// /// 获取MeetingManagement表实体数据 /// 主键 @@ -90,7 +160,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement #endregion - #region 提交数据 + #region 提交数据 /// /// 删除实体数据 @@ -121,18 +191,18 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement /// 主键 /// /// - public void SaveEntity(string keyValue, MeetingManagementEntity entity) + public void SaveEntity( UserInfo userInfo, string keyValue, MeetingManagementEntity entity) { try { if (!string.IsNullOrEmpty(keyValue)) { - entity.Modify(keyValue); + entity.Modify(keyValue,userInfo); this.BaseRepository("CollegeMIS").Update(entity); } else { - entity.Create(); + entity.Create(userInfo); this.BaseRepository("CollegeMIS").Insert(entity); } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingSignInRecord/MeetingSignInRecordBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingSignInRecord/MeetingSignInRecordBLL.cs new file mode 100644 index 000000000..b650309e3 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingSignInRecord/MeetingSignInRecordBLL.cs @@ -0,0 +1,149 @@ +using Learun.Util; +using System; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.PersonnelManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-02-21 10:16 + /// 描 述：会议签到记录 + /// + public class MeetingSignInRecordBLL : MeetingSignInRecordIBLL + { + private MeetingSignInRecordService meetingSignInRecordService = new MeetingSignInRecordService(); + + #region 获取数据 + + /// + /// 获取页面显示列表分页数据 + /// + /// 分页参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + return meetingSignInRecordService.GetPageList(pagination, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + public IEnumerable GetList(string queryJson) + { + try + { + return meetingSignInRecordService.GetList(queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 获取MeetingSignInRecord表实体数据 + /// 主键 + /// + /// + public MeetingSignInRecordEntity GetMeetingSignInRecordEntity(string keyValue) + { + try + { + return meetingSignInRecordService.GetMeetingSignInRecordEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// 主键 + /// + /// + public void DeleteEntity(string keyValue) + { + try + { + meetingSignInRecordService.DeleteEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 保存实体数据（新增、修改） + /// 主键 + /// + /// + public void SaveEntity(UserInfo userInfo, string keyValue, MeetingSignInRecordEntity entity) + { + try + { + meetingSignInRecordService.SaveEntity(userInfo, keyValue, entity); + } + 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/PersonnelManagement/MeetingSignInRecord/MeetingSignInRecordEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingSignInRecord/MeetingSignInRecordEntity.cs new file mode 100644 index 000000000..19f14c7d1 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingSignInRecord/MeetingSignInRecordEntity.cs @@ -0,0 +1,70 @@ +using Learun.Util; +using System; +using System.ComponentModel.DataAnnotations.Schema; + +namespace Learun.Application.TwoDevelopment.PersonnelManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-02-21 10:16 + /// 描 述：会议签到记录 + /// + public class MeetingSignInRecordEntity + { + #region 实体成员 + /// + /// 编号 + /// + [Column("ID")] + public string ID { get; set; } + /// + /// 会议id + /// + [Column("MEETID")] + public string MeetID { get; set; } + /// + /// 参与人id + /// + [Column("PARTICIPANTID")] + public string ParticipantID { get; set; } + /// + /// 参与人名字 + /// + [Column("PARTICIPANTNAME")] + public string ParticipantName { get; set; } + /// + /// 是否签到 + /// + [Column("ISSIGNIN")] + public bool? IsSignIn { get; set; } + /// + /// 签到时间 + /// + [Column("SIGNINTIME")] + public DateTime? SignInTime { get; set; } + #endregion + + #region 扩展操作 + /// + /// 新增调用 + /// + public void Create(UserInfo userInfo) + { + this.ID = Guid.NewGuid().ToString(); + } + /// + /// 编辑调用 + /// + /// + public void Modify(string keyValue, UserInfo userInfo) + { + this.ID = keyValue; + } + #endregion + #region 扩展字段 + #endregion + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingSignInRecord/MeetingSignInRecordIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingSignInRecord/MeetingSignInRecordIBLL.cs new file mode 100644 index 000000000..a52ab50b7 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingSignInRecord/MeetingSignInRecordIBLL.cs @@ -0,0 +1,56 @@ +using Learun.Util; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.PersonnelManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-02-21 10:16 + /// 描 述：会议签到记录 + /// + public interface MeetingSignInRecordIBLL + { + #region 获取数据 + + /// + /// 获取页面显示列表分页数据 + /// + /// 查询参数 + /// 查询参数 + /// + IEnumerable GetPageList(Pagination pagination, string queryJson); + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + IEnumerable GetList(string queryJson); + /// + /// 获取MeetingSignInRecord表实体数据 + /// 主键 + /// + /// + MeetingSignInRecordEntity GetMeetingSignInRecordEntity(string keyValue); + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// 主键 + /// + /// + void DeleteEntity(string keyValue); + /// + /// 保存实体数据（新增、修改） + /// 主键 + /// + /// + void SaveEntity(UserInfo userInfo, string keyValue, MeetingSignInRecordEntity entity); + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingSignInRecord/MeetingSignInRecordService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingSignInRecord/MeetingSignInRecordService.cs new file mode 100644 index 000000000..d0805ccd8 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingSignInRecord/MeetingSignInRecordService.cs @@ -0,0 +1,189 @@ +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.PersonnelManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-02-21 10:16 + /// 描 述：会议签到记录 + /// + public class MeetingSignInRecordService : RepositoryFactory + { + #region 获取数据 + + /// + /// 获取页面显示列表分页数据 + /// + /// 分页参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + var strSql = new StringBuilder(); + strSql.Append("SELECT "); + strSql.Append(@" + t.ID, + t.MeetID, + t.ParticipantID, + t.ParticipantName, + t.IsSignIn, + t.SignInTime + "); + strSql.Append(" FROM MeetingSignInRecord t "); + strSql.Append(" WHERE 1=1 "); + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp, pagination); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + public IEnumerable GetList(string queryJson) + { + try + { + var strSql = new StringBuilder(); + strSql.Append("SELECT "); + strSql.Append(@" + t.ID, + t.MeetID, + t.ParticipantID, + t.ParticipantName, + t.IsSignIn, + t.SignInTime + "); + strSql.Append(" FROM MeetingSignInRecord t "); + strSql.Append(" WHERE 1=1 "); + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取MeetingSignInRecord表实体数据 + /// 主键 + /// + /// + public MeetingSignInRecordEntity GetMeetingSignInRecordEntity(string keyValue) + { + try + { + return this.BaseRepository("CollegeMIS").FindEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// 主键 + /// + /// + public void DeleteEntity(string keyValue) + { + try + { + this.BaseRepository("CollegeMIS").Delete(t=>t.ID == keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 保存实体数据（新增、修改） + /// 主键 + /// + /// + public void SaveEntity( UserInfo userInfo, string keyValue, MeetingSignInRecordEntity entity) + { + try + { + if (!string.IsNullOrEmpty(keyValue)) + { + entity.Modify(keyValue,userInfo); + this.BaseRepository("CollegeMIS").Update(entity); + } + else + { + entity.Create(userInfo); + this.BaseRepository("CollegeMIS").Insert(entity); + } + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/list.vue new file mode 100644 index 000000000..814939157 --- /dev/null +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/list.vue @@ -0,0 +1,320 @@ + + + + + + + diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/single.vue new file mode 100644 index 000000000..c68f19217 --- /dev/null +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/single.vue @@ -0,0 +1,248 @@ + + + + + + diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingSignInRecord/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingSignInRecord/list.vue new file mode 100644 index 000000000..956c9f643 --- /dev/null +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingSignInRecord/list.vue @@ -0,0 +1,280 @@ + + + + + + + diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingSignInRecord/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingSignInRecord/single.vue new file mode 100644 index 000000000..cefa67cc3 --- /dev/null +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingSignInRecord/single.vue @@ -0,0 +1,227 @@ + + + + + +