diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/CompetitionGroupManagerController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/CompetitionGroupManagerController.cs new file mode 100644 index 000000000..fbaa913a1 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/CompetitionGroupManagerController.cs @@ -0,0 +1,155 @@ +using Learun.Util; +using System.Data; +using Learun.Application.TwoDevelopment.EducationalAdministration; +using System.Web.Mvc; +using System.Collections.Generic; + +namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2024-09-26 10:28 + /// 描 述：民体中心赛事分组管理 + /// + public class CompetitionGroupManagerController : MvcControllerBase + { + private CompetitionGroupManagerIBLL competitionGroupManagerIBLL = new CompetitionGroupManagerBLL(); + + #region 视图功能 + + /// + /// 主页面 + /// + /// + [HttpGet] + public ActionResult Index() + { + return View(); + } + /// + /// 表单页 + /// + /// + [HttpGet] + public ActionResult Form() + { + return View(); + } + /// + ///计算积分 + /// + /// + [HttpGet] + public ActionResult FormScore() + { + return View(); + } + #endregion + + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 分页参数 + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetPageList(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var data = competitionGroupManagerIBLL.GetPageList(paginationobj, queryJson); + var jsonData = new + { + rows = data, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records + }; + return Success(jsonData); + } + /// + /// 获取页面显示列表数据 + /// + /// 分页参数 + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetRankList(string keyValue) + { + var data = competitionGroupManagerIBLL.GetCompetitionGroupManagerListRankByCompId(keyValue); + return Success(data); + } + /// + /// 获取表单数据 + /// + /// 主键 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetFormData(string keyValue) + { + var CompetitionGroupManagerData = competitionGroupManagerIBLL.GetCompetitionGroupManagerEntity( keyValue ); + var jsonData = new { + CompetitionGroupManager = CompetitionGroupManagerData, + }; + return Success(jsonData); + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + /// + [HttpPost] + [AjaxOnly] + public ActionResult DeleteForm(string keyValue) + { + competitionGroupManagerIBLL.DeleteEntity(keyValue); + return Success("删除成功！"); + } + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveForm(string keyValue, string strEntity) + { + CompetitionGroupManagerEntity entity = strEntity.ToObject(); + competitionGroupManagerIBLL.SaveEntity(keyValue,entity); + if (string.IsNullOrEmpty(keyValue)) + { + } + return Success("保存成功！"); + } + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult ComputeForm(string keyValue, string strEntity) + { + List entity = strEntity.ToObject>(); + competitionGroupManagerIBLL.ComputeForm(keyValue, entity); + //competitionGroupManagerIBLL.SaveEntity(keyValue, entity); + return Success("计算成功！"); + } + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/CompetitionInfoManagerController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/CompetitionInfoManagerController.cs new file mode 100644 index 000000000..d6ff8362f --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/CompetitionInfoManagerController.cs @@ -0,0 +1,117 @@ +using Learun.Util; +using System.Data; +using Learun.Application.TwoDevelopment.EducationalAdministration; +using System.Web.Mvc; +using System.Collections.Generic; + +namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2024-09-26 10:49 + /// 描 述：民体中心比赛信息管理 + /// + public class CompetitionInfoManagerController : MvcControllerBase + { + private CompetitionInfoManagerIBLL competitionInfoManagerIBLL = new CompetitionInfoManagerBLL(); + + #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 = competitionInfoManagerIBLL.GetPageList(paginationobj, queryJson); + var jsonData = new + { + rows = data, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records + }; + return Success(jsonData); + } + /// + /// 获取表单数据 + /// + /// 主键 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetFormData(string keyValue) + { + var CompetitionInfoData = competitionInfoManagerIBLL.GetCompetitionInfoEntity( keyValue ); + var jsonData = new { + CompetitionInfo = CompetitionInfoData, + }; + return Success(jsonData); + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + /// + [HttpPost] + [AjaxOnly] + public ActionResult DeleteForm(string keyValue) + { + competitionInfoManagerIBLL.DeleteEntity(keyValue); + return Success("删除成功！"); + } + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveForm(string keyValue, string strEntity) + { + CompetitionInfoEntity entity = strEntity.ToObject(); + competitionInfoManagerIBLL.SaveEntity(keyValue,entity); + if (string.IsNullOrEmpty(keyValue)) + { + } + return Success("保存成功！"); + } + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/CompetitionManagerController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/CompetitionManagerController.cs new file mode 100644 index 000000000..4ceb4474e --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/CompetitionManagerController.cs @@ -0,0 +1,126 @@ +using Learun.Util; +using System.Data; +using Learun.Application.TwoDevelopment.EducationalAdministration; +using System.Web.Mvc; +using System.Collections.Generic; + +namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2024-09-26 10:13 + /// 描 述：民体中心赛事管理 + /// + public class CompetitionManagerController : MvcControllerBase + { + private CompetitionManagerIBLL competitionManagerIBLL = new CompetitionManagerBLL(); + + #region 视图功能 + + /// + /// 主页面 + /// + /// + [HttpGet] + public ActionResult Index() + { + return View(); + } + /// + /// 表单页 + /// + /// + [HttpGet] + public ActionResult Form() + { + return View(); + } + /// + /// 排行页 + /// + /// + [HttpGet] + public ActionResult Ranking() + { + return View(); + } + #endregion + + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 分页参数 + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetPageList(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var data = competitionManagerIBLL.GetPageList(paginationobj, queryJson); + var jsonData = new + { + rows = data, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records + }; + return Success(jsonData); + } + /// + /// 获取表单数据 + /// + /// 主键 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetFormData(string keyValue) + { + var CompetitionManagerData = competitionManagerIBLL.GetCompetitionManagerEntity( keyValue ); + var jsonData = new { + CompetitionManager = CompetitionManagerData, + }; + return Success(jsonData); + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + /// + [HttpPost] + [AjaxOnly] + public ActionResult DeleteForm(string keyValue) + { + competitionManagerIBLL.DeleteEntity(keyValue); + return Success("删除成功！"); + } + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveForm(string keyValue, string strEntity) + { + CompetitionManagerEntity entity = strEntity.ToObject(); + competitionManagerIBLL.SaveEntity(keyValue,entity); + if (string.IsNullOrEmpty(keyValue)) + { + } + return Success("保存成功！"); + } + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassHonors/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassHonors/Index.js index aa52ffc2a..e739184f4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassHonors/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassHonors/Index.js @@ -118,7 +118,21 @@ var bootstrap = function ($, learun) { }); }}, { label: "班级评比荣誉", name: "EvaluationHonor", width: 100, align: "left"}, - { label: "附件上传", name: "Path", width: 100, align: "left"}, + { + label: "附件上传", name: "Path", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', + { + url: '/LR_SystemModule/Annexes/GetAnnexesFileList?folderId=' + value, + sync: true, + callback: function (_data) { + if (_data.F_FileName) { + callback('' + _data['F_FileName'] + ''); + } + } + }); + } + }, ], mainId:'ID', isPage: true @@ -136,3 +150,6 @@ var bootstrap = function ($, learun) { }; page.init(); } +function downLoad(fileId) { + top.learun.download({ url: top.$.rootUrl + '/LR_SystemModule/Annexes/DownAnnexesFile', param: { fileId: fileId, __RequestVerificationToken: $.lrToken }, method: 'POST' }); +} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionGroupManager/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionGroupManager/Form.cshtml new file mode 100644 index 000000000..46a028ad1 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionGroupManager/Form.cshtml @@ -0,0 +1,30 @@ +@{ + ViewBag.Title = "民体中心赛事分组管理"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
+
+ 民体中心赛事分组管理 +
+
+
赛事*
+
+
+
+
分组名称*
+ +
+
+
当前积分*
+ +
+
+
证书
+
+
+
+
分组简介
+ +
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/CompetitionGroupManager/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionGroupManager/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionGroupManager/Form.js new file mode 100644 index 000000000..37fa0363f --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionGroupManager/Form.js @@ -0,0 +1,53 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2024-09-26 10:28 + * 描 述：民体中心赛事分组管理 + */ +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 () { + $('#CompetitionId').lrDataSourceSelect({ code: 'CompetitionManager',value: 'id',text: 'name' }); + $('#Path').lrUploader(); + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/CompetitionGroupManager/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]); + } + } + }); + } + $('#Integral').val('0'); + } + }; + // 保存数据 + acceptClick = function (callBack) { + if (!$('body').lrValidform()) { + return false; + } + var postData = { + strEntity: JSON.stringify($('body').lrGetFormData()) + }; + $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/CompetitionGroupManager/SaveForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionGroupManager/FormScore.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionGroupManager/FormScore.cshtml new file mode 100644 index 000000000..65f9b045b --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionGroupManager/FormScore.cshtml @@ -0,0 +1,38 @@ +@{ + ViewBag.Title = "计算积分"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
+
+ 民体中心赛事分组成绩积分计算 +
+
+
赛事*
+
+
+
+
第一名积分*
+ +
+
+
第二名积分*
+ +
+
+
第三名积分*
+ +
+
+
第四名积分*
+ +
+
+
第五名积分*
+ +
+
+
第六名积分*
+ +
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/CompetitionGroupManager/FormScore.js") \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionGroupManager/FormScore.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionGroupManager/FormScore.js new file mode 100644 index 000000000..c5f3c4247 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionGroupManager/FormScore.js @@ -0,0 +1,57 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2024-09-26 10:28 + * 描 述：民体中心赛事分组计算积分 + */ +var acceptClick; +//var keyValue = request('keyValue'); +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + $('.lr-form-wrap').lrscroll(); + page.bind(); + }, + bind: function () { + $('#CompetitionId').lrDataSourceSelect({ code: 'CompetitionManager', value: 'id', text: 'name', select: SetInfo }); + }, + }; + // 保存数据 + acceptClick = function (callBack) { + if (!$('body').lrValidform()) { + return false; + } + const inputs = document.querySelectorAll('.jifen'); + var postData = { + strEntity: JSON.stringify(Array.from(inputs).map(input => parseInt(input.value))) //JSON.stringify($('body').lrGetFormData()) + }; + // 转换为数组并提取 value + $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/CompetitionGroupManager/ComputeForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} +function SetInfo(val) { + if (val) { + keyValue = val.id + } else { + keyValue="" + } +} +function selectype() { + const selectElement = document.getElementById("mySelect"); + const selectedOptions = Array.from(selectElement.selectedOptions).map(option => option.value); + if (selectedOptions[0] == "pm") { + $("#pm").show(); + $("#cj").hide(); + } else { + $("#pm").hide(); + $("#cj").show(); + } + console.log("选中的选项:", selectedOptions[0]); +} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionGroupManager/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionGroupManager/Index.cshtml new file mode 100644 index 000000000..ecb228a6b --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionGroupManager/Index.cshtml @@ -0,0 +1,46 @@ +@{ + ViewBag.Title = "民体中心赛事分组管理"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
+
+
+
+
+
+
赛事
+
+
+
+
分组名称
+ +
+
+
+
+
+
+
+ +
+
+  计算积分 +  新增 +  编辑 +  删除 +  打印 +
+
+  导出 +  导入 +
+
+
+
+
+
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/CompetitionGroupManager/Index.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionGroupManager/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionGroupManager/Index.js new file mode 100644 index 000000000..d5ed8b849 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionGroupManager/Index.js @@ -0,0 +1,156 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2024-09-26 10:28 + * 描 述：民体中心赛事分组管理 + */ +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); + $('#CompetitionId').lrDataSourceSelect({ code: 'CompetitionManager',value: 'id',text: 'name' }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 新增 + $('#lr_add').on('click', function () { + learun.layerForm({ + id: 'form', + title: '新增', + url: top.$.rootUrl + '/EducationalAdministration/CompetitionGroupManager/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 + '/EducationalAdministration/CompetitionGroupManager/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 + '/EducationalAdministration/CompetitionGroupManager/DeleteForm', { keyValue: keyValue}, function () { + refreshGirdData(); + }); + } + }); + } + }); + //计算积分 + $('#lr_compute').on('click', function () { + learun.layerForm({ + id: 'from_compute', + title: '计算积分', + url: top.$.rootUrl + '/EducationalAdministration/CompetitionGroupManager/FormScore', + width: 500, + height: 350, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + }); + // 打印 + $('#lr_print').on('click', function () { + $('#gridtable').jqprintTable(); + }); + //  导出 + $('#lr_export').on('click', function () { + }); + //  导入 + $('#lr_import').on('click', function () { + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').lrAuthorizeJfGrid({ + url: top.$.rootUrl + '/EducationalAdministration/CompetitionGroupManager/GetPageList', + headData: [ + { label: "赛事", name: "CompetitionId", width: 100, align: "left", + formatterAsync: function (callback, value, row, op,$cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CompetitionManager', + key: value, + keyId: 'id', + callback: function (_data) { + callback(_data['name']); + } + }); + }}, + { label: "分组名称", name: "GroupName", width: 100, align: "left"}, + { label: "当前积分", name: "Integral", width: 100, align: "left"}, + { + label: "证书", name: "Path", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', + { + url: '/LR_SystemModule/Annexes/GetAnnexesFileList?folderId=' + value, + sync: true, + callback: function (_data) { + if (_data.F_FileName) { + callback('' + _data['F_FileName'] + ''); + } + } + }); + } + // learun.clientdata.getAsync('custmerData', + // { + // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'FileInfo', + // key: value, + // keyId: 'f_folderid', + // sync: true, + // callback: function (_data) { + // if (_data.f_filename) { + + // callback('' + _data['f_filename'] + ''); + // } + // } + // }); + //} + }, + { label: "分组简介", name: "GroupDesc", 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(); +} +function downLoad(fileId) { + top.learun.download({ url: top.$.rootUrl + '/LR_SystemModule/Annexes/DownAnnexesFile', param: { fileId: fileId, __RequestVerificationToken: $.lrToken }, method: 'POST' }); +} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionInfoManager/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionInfoManager/Form.cshtml new file mode 100644 index 000000000..67e3a61d0 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionInfoManager/Form.cshtml @@ -0,0 +1,22 @@ +@{ + ViewBag.Title = "民体中心比赛信息管理"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
+
+ 民体中心比赛信息管理 +
+
+
赛事*
+
+
+
+
赛事分组*
+
+
+
+
比赛成绩
+ +
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/CompetitionInfoManager/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionInfoManager/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionInfoManager/Form.js new file mode 100644 index 000000000..0d2af6b80 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionInfoManager/Form.js @@ -0,0 +1,52 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2024-09-26 10:49 + * 描 述：民体中心比赛信息管理 + */ +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 () { + $('#CompetitionId').lrDataSourceSelect({ code: 'CompetitionManager',value: 'id',text: 'name' }); + $('#GroupId').lrDataSourceSelect({ code: 'CompetitionGroupManager',value: 'id',text: 'groupname' }); + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/CompetitionInfoManager/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 + '/EducationalAdministration/CompetitionInfoManager/SaveForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionInfoManager/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionInfoManager/Index.cshtml new file mode 100644 index 000000000..f32d640a4 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionInfoManager/Index.cshtml @@ -0,0 +1,45 @@ +@{ + ViewBag.Title = "民体中心比赛信息管理"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
+
+
+
+
+
+
赛事
+
+
+
+
赛事分组
+
+
+
+
+
+
+
+
+ +
+
+  新增 +  编辑 +  删除 +  打印 +
+
+   导出 +   导入 +
+
+
+
+
+
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/CompetitionInfoManager/Index.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionInfoManager/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionInfoManager/Index.js new file mode 100644 index 000000000..cd99d7911 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionInfoManager/Index.js @@ -0,0 +1,130 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2024-09-26 10:49 + * 描 述：民体中心比赛信息管理 + */ +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); + $('#CompetitionId').lrDataSourceSelect({ code: 'CompetitionManager',value: 'id',text: 'name' }); + $('#GroupId').lrDataSourceSelect({ code: 'CompetitionGroupManager',value: 'id',text: 'groupname' }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 新增 + $('#lr_add').on('click', function () { + learun.layerForm({ + id: 'form', + title: '新增', + url: top.$.rootUrl + '/EducationalAdministration/CompetitionInfoManager/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 + '/EducationalAdministration/CompetitionInfoManager/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 + '/EducationalAdministration/CompetitionInfoManager/DeleteForm', { keyValue: keyValue}, function () { + refreshGirdData(); + }); + } + }); + } + }); + // 打印 + $('#lr_print').on('click', function () { + $('#gridtable').jqprintTable(); + }); + //  导出 + $('#lr_export').on('click', function () { + }); + //  导入 + $('#lr_import').on('click', function () { + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').lrAuthorizeJfGrid({ + url: top.$.rootUrl + '/EducationalAdministration/CompetitionInfoManager/GetPageList', + headData: [ + { label: "赛事", name: "CompetitionId", width: 100, align: "left", + formatterAsync: function (callback, value, row, op,$cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CompetitionManager', + key: value, + keyId: 'id', + callback: function (_data) { + callback(_data['name']); + } + }); + }}, + { label: "赛事分组", name: "GroupId", width: 100, align: "left", + formatterAsync: function (callback, value, row, op,$cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CompetitionGroupManager', + key: value, + keyId: 'id', + callback: function (_data) { + callback(_data['groupname']); + } + }); + }}, + { label: "比赛成绩", name: "Sore", width: 100, align: "left" }, + { + label: "是否计算过积分", name: "IsIntegral", width: 100, align: "left", + formatter: function (cellvalue, row) { + if (!cellvalue) { + return '否'; + } else { + return '是'; + } + } }, + ], + 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/Areas/EducationalAdministration/Views/CompetitionManager/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionManager/Form.cshtml new file mode 100644 index 000000000..3b7b3a572 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionManager/Form.cshtml @@ -0,0 +1,30 @@ +@{ + ViewBag.Title = "民体中心赛事管理"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
+
+ 民体中心赛事管理 +
+
+
赛事名称*
+ +
+
+
赛事类型*
+ +
+
+
比赛时间*
+ +
+
+
赛事级别*
+
+
+
+
赛事备注*
+ +
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/CompetitionManager/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionManager/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionManager/Form.js new file mode 100644 index 000000000..0dd0f75a7 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionManager/Form.js @@ -0,0 +1,51 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2024-09-26 10:13 + * 描 述：民体中心赛事管理 + */ +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 () { + $('#CompetitonLevel').lrDataItemSelect({ code: 'CompetitonLevel' }); + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/CompetitionManager/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 + '/EducationalAdministration/CompetitionManager/SaveForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionManager/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionManager/Index.cshtml new file mode 100644 index 000000000..6a453a0b2 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionManager/Index.cshtml @@ -0,0 +1,49 @@ +@{ + ViewBag.Title = "民体中心赛事管理"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
+
+
+
+
+
+
+
+
+
赛事名称
+ +
+
+
赛事类型
+ +
+
+
+
+
+
+
+ +
+
+  查看排行 +  新增 +  编辑 +  删除 +  打印 +
+
+   导出 +   导入 +
+
+
+
+
+
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/CompetitionManager/Index.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionManager/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionManager/Index.js new file mode 100644 index 000000000..3eead4a77 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionManager/Index.js @@ -0,0 +1,156 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2024-09-26 10:13 + * 描 述：民体中心赛事管理 + */ +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(); + } + }); + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 新增 + $('#lr_add').on('click', function () { + learun.layerForm({ + id: 'form', + title: '新增', + url: top.$.rootUrl + '/EducationalAdministration/CompetitionManager/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 + '/EducationalAdministration/CompetitionManager/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 + '/EducationalAdministration/CompetitionManager/DeleteForm', { keyValue: keyValue}, function () { + refreshGirdData(); + }); + } + }); + } + }); + //查看排行 + $('#lr_ranking').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('ID'); + var name = encodeURIComponent($('#gridtable').jfGridValue('Name')); + console.log(name) + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'from_ranking', + title: '查看排行', + url: top.$.rootUrl + '/EducationalAdministration/CompetitionManager/Ranking?keyValue=' + keyValue + "&Competitionname=" + name, + width: 500, + height: 350, + + }); + } + }); + // 打印 + $('#lr_print').on('click', function () { + $('#gridtable').jqprintTable(); + }); + //  导出 + $('#lr_export').on('click', function () { + }); + //  导入 + $('#lr_import').on('click', function () { + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').lrAuthorizeJfGrid({ + url: top.$.rootUrl + '/EducationalAdministration/CompetitionManager/GetPageList', + headData: [ + { label: "赛事名称", name: "Name", width: 100, align: "left"}, + { label: "赛事类型", name: "CompetitionType", width: 100, align: "left"}, + { label: "比赛时间", name: "CompetitionTime", width: 100, align: "left"}, + { label: "下拉框", name: "CompetitonLevel", width: 100, align: "left", + formatterAsync: function (callback, value, row, op,$cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'CompetitonLevel', + callback: function (_data) { + callback(_data.text); + } + }); + }}, + { label: "赛事备注", name: "Remark", width: 100, align: "left"}, + ], + mainId:'ID', + 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/EducationalAdministration/Views/CompetitionManager/Ranking.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionManager/Ranking.cshtml new file mode 100644 index 000000000..ef816dc4f --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionManager/Ranking.cshtml @@ -0,0 +1,13 @@ +@{ + ViewBag.Title = "计算积分"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
+
+ 民体中心赛事排行榜 +
+
+ +
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/CompetitionManager/Ranking.js") \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionManager/Ranking.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionManager/Ranking.js new file mode 100644 index 000000000..34f062369 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionManager/Ranking.js @@ -0,0 +1,78 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2024-09-26 10:28 + * 描 述：民体中心赛事分组计算积分 + */ +var acceptClick; +var keyValue = request('keyValue'); +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + $("#title").html("民体中心"+getQueryParam("Competitionname") +"排行榜") + $('.lr-form-wrap').lrscroll(); + }, + getData: function () { + $.ajax({ + url: top.$.rootUrl + '/EducationalAdministration/CompetitionGroupManager/GetRankList?keyValue=' + keyValue, + type: "GET", + dataType: "json", + async: true, + success: function (result) { + var html="" + for (var i = 0; i < result.data.length; i++) { + var res = result.data + if (i == 0) { + html += '
冠军:
' + res[i].GroupName + '(' + res[i].Integral + '分)' + '
'; + } else if (i == 1) { + html += '
亚军:
' + res[i].GroupName + '(' + res[i].Integral + '分)' + '
' + } else if (i == 2) { + html += '
季军:
' + res[i].GroupName + '(' + res[i].Integral + '分)' + '
' + } else if (i == 3) { + html += '
优秀奖:
' + res[i].GroupName + '(' + res[i].Integral + '分)' + '
' + } + } + $("#Content").html(html); + } + }); + }, + }; + page.getData(); + page.init(); +} +function getData() { + $.ajax({ + url: top.$.rootUrl + '/EducationalAdministration/CompetitionGroupManager/GetRankList?keyValue=' + keyValue, + type: "GET", + dataType: "json", + async: true, + success: function (res) { + console.log(res) + } + }); +} +function SetInfo(val) { + if (val) { + keyValue = val.id + } else { + keyValue="" + } +} +function selectype() { + const selectElement = document.getElementById("mySelect"); + const selectedOptions = Array.from(selectElement.selectedOptions).map(option => option.value); + if (selectedOptions[0] == "pm") { + $("#pm").show(); + $("#cj").hide(); + } else { + $("#pm").hide(); + $("#cj").show(); + } + console.log("选中的选项:", selectedOptions[0]); +} +function getQueryParam(param) { + const regex = new RegExp('[?&]' + encodeURIComponent(param) + '=([^&]*)'); + const results = regex.exec(window.location.search); + return results ? decodeURIComponent(results[1]) : null; +} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/MajorAchievement/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/MajorAchievement/Index.js index 02b18f145..7292901d4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/MajorAchievement/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/MajorAchievement/Index.js @@ -106,7 +106,21 @@ var bootstrap = function ($, learun) { headData: [ { label: "专业成果", name: "AchievementName", width: 100, align: "left"}, { label: "成果取得时间", name: "AchievementTime", width: 100, align: "left"}, - { label: "附件", name: "Path", width: 100, align: "left"}, + { + label: "附件", name: "Path", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', + { + url: '/LR_SystemModule/Annexes/GetAnnexesFileList?folderId=' + value, + sync: true, + callback: function (_data) { + if (_data.F_FileName) { + callback('' + _data['F_FileName'] + ''); + } + } + }); + } + }, { label: "备注", name: "Remark", width: 100, align: "left"}, ], mainId:'ID', @@ -125,3 +139,6 @@ var bootstrap = function ($, learun) { }; page.init(); } +function downLoad(fileId) { + top.learun.download({ url: top.$.rootUrl + '/LR_SystemModule/Annexes/DownAnnexesFile', param: { fileId: fileId, __RequestVerificationToken: $.lrToken }, method: 'POST' }); +} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/UnionActivities/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/UnionActivities/Index.js index d39f8dac3..283e43990 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/UnionActivities/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/UnionActivities/Index.js @@ -81,7 +81,21 @@ var bootstrap = function ($, learun) { { label: "活动费用", name: "ActivityCost", width: 100, align: "left"}, { label: "参与学生数", name: "ParticipantsTeachNum", width: 100, align: "left"}, { label: "参与学生数", name: "ParticipantsStuNum", width: 100, align: "left"}, - { label: "活动文件", name: "Path", width: 100, align: "left"}, + { + label: "活动文件", name: "Path", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', + { + url: '/LR_SystemModule/Annexes/GetAnnexesFileList?folderId=' + value, + sync: true, + callback: function (_data) { + if (_data.F_FileName) { + callback('' + _data['F_FileName'] + ''); + } + } + }); + } + }, { label: "活动内容", name: "ActivityContent", width: 100, align: "left"}, ], mainId:'ID', @@ -99,3 +113,6 @@ var bootstrap = function ($, learun) { }; page.init(); } +function downLoad(fileId) { + top.learun.download({ url: top.$.rootUrl + '/LR_SystemModule/Annexes/DownAnnexesFile', param: { fileId: fileId, __RequestVerificationToken: $.lrToken }, method: 'POST' }); +} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VariousIsm/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VariousIsm/Index.js index 7165f9305..435384e59 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VariousIsm/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VariousIsm/Index.js @@ -78,7 +78,21 @@ var bootstrap = function ($, learun) { { label: "制度时间", name: "IsmTime", width: 100, align: "left"}, { label: "制度名称", name: "IsmName", width: 100, align: "left"}, { label: "制定部门", name: "IsmDep", width: 100, align: "left"}, - { label: "制度附件", name: "Path", width: 100, align: "left"}, + { + label: "制度附件", name: "Path", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', + { + url: '/LR_SystemModule/Annexes/GetAnnexesFileList?folderId=' + value, + sync: true, + callback: function (_data) { + if (_data.F_FileName) { + callback('' + _data['F_FileName'] + ''); + } + } + }); + } + }, { label: "备注", name: "Remark", width: 100, align: "left"}, ], mainId:'ID', @@ -96,3 +110,6 @@ var bootstrap = function ($, learun) { }; page.init(); } +function downLoad(fileId) { + top.learun.download({ url: top.$.rootUrl + '/LR_SystemModule/Annexes/DownAnnexesFile', param: { fileId: fileId, __RequestVerificationToken: $.lrToken }, method: 'POST' }); +} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VocationalProgram/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VocationalProgram/Index.js index e96236822..bb1fc21bd 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VocationalProgram/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VocationalProgram/Index.js @@ -120,7 +120,21 @@ var bootstrap = function ($, learun) { { label: "专业人数", name: "MajorNum", width: 100, align: "left"}, { label: "对口高职专业", name: "HigherVocational", width: 100, align: "left"}, { label: "高职专业代码", name: "HigherVocationalCode", width: 100, align: "left"}, - { label: "人才培养方案", name: "Path", width: 100, align: "left"}, + { + label: "人才培养方案", name: "Path", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', + { + url: '/LR_SystemModule/Annexes/GetAnnexesFileList?folderId=' + value, + sync: true, + callback: function (_data) { + if (_data.F_FileName) { + callback('' + _data['F_FileName'] + ''); + } + } + }); + } + }, ], mainId:'ID', isPage: true @@ -138,3 +152,6 @@ var bootstrap = function ($, learun) { }; page.init(); } +function downLoad(fileId) { + top.learun.download({ url: top.$.rootUrl + '/LR_SystemModule/Annexes/DownAnnexesFile', param: { fileId: fileId, __RequestVerificationToken: $.lrToken }, method: 'POST' }); +} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WelfareRecord/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WelfareRecord/Index.js index ae0b16839..edb48ebba 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WelfareRecord/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WelfareRecord/Index.js @@ -108,7 +108,21 @@ var bootstrap = function ($, learun) { { label: "承办单位", name: "Organizer", width: 100, align: "left"}, { label: "福利人数", name: "WelfareNum", width: 100, align: "left"}, { label: "金额", name: "Amount", width: 100, align: "left"}, - { label: "附件上传", name: "Path", width: 100, align: "left"}, + { + label: "附件上传", name: "Path", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', + { + url: '/LR_SystemModule/Annexes/GetAnnexesFileList?folderId=' + value, + sync: true, + callback: function (_data) { + if (_data.F_FileName) { + callback('' + _data['F_FileName'] + ''); + } + } + }); + } + }, { label: "福利内容", name: "WelfareContent", width: 100, align: "left"}, ], mainId:'ID', @@ -127,3 +141,6 @@ var bootstrap = function ($, learun) { }; page.init(); } +function downLoad(fileId) { + top.learun.download({ url: top.$.rootUrl + '/LR_SystemModule/Annexes/DownAnnexesFile', param: { fileId: fileId, __RequestVerificationToken: $.lrToken }, method: 'POST' }); +} \ No newline at end of file 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 7a533f361..2353c09e0 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 @@ -916,6 +916,9 @@ + + + @@ -1086,6 +1089,8 @@ + + @@ -1123,6 +1128,8 @@ + + @@ -7203,6 +7210,18 @@ + + + + + + + + + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/CompetitionGroupManagerMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/CompetitionGroupManagerMap.cs new file mode 100644 index 000000000..0751d538e --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/CompetitionGroupManagerMap.cs @@ -0,0 +1,29 @@ +using Learun.Application.TwoDevelopment.EducationalAdministration; +using System.Data.Entity.ModelConfiguration; + +namespace Learun.Application.Mapping +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2024-09-26 10:28 + /// 描 述：民体中心赛事分组管理 + /// + public class CompetitionGroupManagerMap : EntityTypeConfiguration + { + public CompetitionGroupManagerMap() + { + #region 表、主键 + //表 + this.ToTable("COMPETITIONGROUPMANAGER"); + //主键 + this.HasKey(t => t.ID); + #endregion + + #region 配置关系 + #endregion + } + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/CompetitionInfoMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/CompetitionInfoMap.cs new file mode 100644 index 000000000..022a3942e --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/CompetitionInfoMap.cs @@ -0,0 +1,29 @@ +using Learun.Application.TwoDevelopment.EducationalAdministration; +using System.Data.Entity.ModelConfiguration; + +namespace Learun.Application.Mapping +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2024-09-26 10:49 + /// 描 述：民体中心比赛信息管理 + /// + public class CompetitionInfoMap : EntityTypeConfiguration + { + public CompetitionInfoMap() + { + #region 表、主键 + //表 + this.ToTable("COMPETITIONINFO"); + //主键 + this.HasKey(t => t.ID); + #endregion + + #region 配置关系 + #endregion + } + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/CompetitionManagerMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/CompetitionManagerMap.cs new file mode 100644 index 000000000..c04a3a9a0 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/CompetitionManagerMap.cs @@ -0,0 +1,29 @@ +using Learun.Application.TwoDevelopment.EducationalAdministration; +using System.Data.Entity.ModelConfiguration; + +namespace Learun.Application.Mapping +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2024-09-26 10:13 + /// 描 述：民体中心赛事管理 + /// + public class CompetitionManagerMap : EntityTypeConfiguration + { + public CompetitionManagerMap() + { + #region 表、主键 + //表 + this.ToTable("COMPETITIONMANAGER"); + //主键 + this.HasKey(t => t.ID); + #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 38db8644e..2fea5f697 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 @@ -678,6 +678,9 @@ + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CompetitionGroupManager/CompetitionGroupManagerBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CompetitionGroupManager/CompetitionGroupManagerBLL.cs new file mode 100644 index 000000000..9aa00bbc0 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CompetitionGroupManager/CompetitionGroupManagerBLL.cs @@ -0,0 +1,179 @@ +using Learun.Util; +using System; +using System.Data; +using System.Collections.Generic; +using System.Linq; +using static Dapper.SqlMapper; + +namespace Learun.Application.TwoDevelopment.EducationalAdministration +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2024-09-26 10:28 + /// 描 述：民体中心赛事分组管理 + /// + public class CompetitionGroupManagerBLL : CompetitionGroupManagerIBLL + { + private CompetitionGroupManagerService competitionGroupManagerService = new CompetitionGroupManagerService(); + private CompetitionInfoManagerService competitionInfoManagerService = new CompetitionInfoManagerService(); + + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 分页参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + return competitionGroupManagerService.GetPageList(pagination, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 获取CompetitionGroupManager表实体数据 + /// + /// 主键 + /// + public CompetitionGroupManagerEntity GetCompetitionGroupManagerEntity(string keyValue) + { + try + { + return competitionGroupManagerService.GetCompetitionGroupManagerEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + public IEnumerable GetCompetitionGroupManagerListRankByCompId(string keyValue) + { + try + { + return competitionGroupManagerService.GetRankList(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + public void DeleteEntity(string keyValue) + { + try + { + competitionGroupManagerService.DeleteEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + /// + public void SaveEntity(string keyValue, CompetitionGroupManagerEntity entity) + { + try + { + competitionGroupManagerService.SaveEntity(keyValue, entity); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + public void ComputeForm(string keyValue, List strEntity) + { + try + { + var forindex = strEntity.Count; + var infolist = competitionInfoManagerService.GetListByCompetId(keyValue).OrderByDescending(x=>x.Sore).ToList(); + if (infolist.Count + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2024-09-26 10:28 + /// 描 述：民体中心赛事分组管理 + /// + public class CompetitionGroupManagerEntity + { + #region 实体成员 + /// + /// 主键ID + /// + [Column("ID")] + public string ID { get; set; } + /// + /// 赛事id + /// + [Column("COMPETITIONID")] + public string CompetitionId { get; set; } + /// + /// 分组名称 + /// + [Column("GROUPNAME")] + public string GroupName { get; set; } + /// + /// 积分 + /// + [Column("INTEGRAL")] + public int? Integral { get; set; } + /// + /// 分组简介 + /// + [Column("GROUPDESC")] + public string GroupDesc { get; set; } + /// + /// 证书多个 + /// + [Column("PATH")] + public string Path { get; set; } + #endregion + + #region 扩展操作 + /// + /// 新增调用 + /// + public void Create() + { + this.ID = Guid.NewGuid().ToString(); + } + /// + /// 编辑调用 + /// + /// + public void Modify(string keyValue) + { + this.ID = keyValue; + } + #endregion + #region 扩展字段 + #endregion + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CompetitionGroupManager/CompetitionGroupManagerIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CompetitionGroupManager/CompetitionGroupManagerIBLL.cs new file mode 100644 index 000000000..bda2ff232 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CompetitionGroupManager/CompetitionGroupManagerIBLL.cs @@ -0,0 +1,60 @@ +using Learun.Util; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.EducationalAdministration +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2024-09-26 10:28 + /// 描 述：民体中心赛事分组管理 + /// + public interface CompetitionGroupManagerIBLL + { + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + IEnumerable GetPageList(Pagination pagination, string queryJson); + /// + /// 获取CompetitionGroupManager表实体数据 + /// + /// 主键 + /// + CompetitionGroupManagerEntity GetCompetitionGroupManagerEntity(string keyValue); + /// + ///根据比赛id获取排名 + /// + /// 主键 + /// + IEnumerable GetCompetitionGroupManagerListRankByCompId(string keyValue); + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + void DeleteEntity(string keyValue); + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + void SaveEntity(string keyValue, CompetitionGroupManagerEntity entity); + /// + /// 计算积分 + /// + /// + void ComputeForm(string keyValue,List strEntity); + + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CompetitionGroupManager/CompetitionGroupManagerService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CompetitionGroupManager/CompetitionGroupManagerService.cs new file mode 100644 index 000000000..de19fa4b8 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CompetitionGroupManager/CompetitionGroupManagerService.cs @@ -0,0 +1,208 @@ +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.EducationalAdministration +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2024-09-26 10:28 + /// 描 述：民体中心赛事分组管理 + /// + public class CompetitionGroupManagerService : RepositoryFactory + { + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + var strSql = new StringBuilder(); + strSql.Append("SELECT "); + strSql.Append(@" + t.ID, + t.CompetitionId, + t.GroupName, + t.Integral, + t.Path, + t.GroupDesc + "); + strSql.Append(" FROM CompetitionGroupManager t "); + strSql.Append(" WHERE 1=1 "); + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + if (!queryParam["CompetitionId"].IsEmpty()) + { + dp.Add("CompetitionId", queryParam["CompetitionId"].ToString(), DbType.String); + strSql.Append(" AND t.CompetitionId = @CompetitionId "); + } + if (!queryParam["GroupName"].IsEmpty()) + { + dp.Add("GroupName", "%" + queryParam["GroupName"].ToString() + "%", DbType.String); + strSql.Append(" AND t.GroupName Like @GroupName "); + } + //strSql.Append(" order by t.Integral desc"); + pagination.sidx = "Integral"; + pagination.sord = "desc"; + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// 查询参数 + /// + public IEnumerable GetRankList(string compId) + { + try + { + Pagination pagination = new Pagination(); + var strSql = new StringBuilder(); + strSql.Append("SELECT "); + strSql.Append(@" + t.ID, + t.CompetitionId, + t.GroupName, + t.Integral, + t.Path, + t.GroupDesc + "); + strSql.Append(" FROM CompetitionGroupManager t "); + strSql.Append(" WHERE 1=1 "); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + dp.Add("CompetitionId", compId, DbType.String); + strSql.Append(" AND t.CompetitionId = @CompetitionId "); + + //strSql.Append(" order by t.Integral desc"); + pagination.sidx = "Integral"; + pagination.sord = "desc"; + pagination.page = 1; + pagination.rows = 4; + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + /// + /// 获取CompetitionGroupManager表实体数据 + /// + /// 主键 + /// + public CompetitionGroupManagerEntity GetCompetitionGroupManagerEntity(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(string keyValue, CompetitionGroupManagerEntity entity) + { + try + { + if (!string.IsNullOrEmpty(keyValue)) + { + entity.Modify(keyValue); + this.BaseRepository("CollegeMIS").Update(entity); + } + else + { + entity.Create(); + 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/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CompetitionInfoManager/CompetitionInfoEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CompetitionInfoManager/CompetitionInfoEntity.cs new file mode 100644 index 000000000..610fbd978 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CompetitionInfoManager/CompetitionInfoEntity.cs @@ -0,0 +1,65 @@ +using Learun.Util; +using System; +using System.ComponentModel.DataAnnotations.Schema; + +namespace Learun.Application.TwoDevelopment.EducationalAdministration +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2024-09-26 10:49 + /// 描 述：民体中心比赛信息管理 + /// + public class CompetitionInfoEntity + { + #region 实体成员 + /// + /// 主键ID + /// + [Column("ID")] + public string ID { get; set; } + /// + /// 赛事id + /// + [Column("COMPETITIONID")] + public string CompetitionId { get; set; } + /// + /// 分组id + /// + [Column("GROUPID")] + public string GroupId { get; set; } + /// + /// 成绩 + /// + [Column("SORE")] + public decimal? Sore { get; set; } + /// + /// 是否计算过积分 + /// + [Column("ISINTEGRAL")] + public bool? IsIntegral { get; set; } + #endregion + + #region 扩展操作 + /// + /// 新增调用 + /// + public void Create() + { + this.ID = Guid.NewGuid().ToString(); + } + /// + /// 编辑调用 + /// + /// + public void Modify(string keyValue) + { + this.ID = keyValue; + } + #endregion + #region 扩展字段 + #endregion + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CompetitionInfoManager/CompetitionInfoManagerBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CompetitionInfoManager/CompetitionInfoManagerBLL.cs new file mode 100644 index 000000000..e4ff65945 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CompetitionInfoManager/CompetitionInfoManagerBLL.cs @@ -0,0 +1,125 @@ +using Learun.Util; +using System; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.EducationalAdministration +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2024-09-26 10:49 + /// 描 述：民体中心比赛信息管理 + /// + public class CompetitionInfoManagerBLL : CompetitionInfoManagerIBLL + { + private CompetitionInfoManagerService competitionInfoManagerService = new CompetitionInfoManagerService(); + + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 分页参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + return competitionInfoManagerService.GetPageList(pagination, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 获取CompetitionInfo表实体数据 + /// + /// 主键 + /// + public CompetitionInfoEntity GetCompetitionInfoEntity(string keyValue) + { + try + { + return competitionInfoManagerService.GetCompetitionInfoEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + public void DeleteEntity(string keyValue) + { + try + { + competitionInfoManagerService.DeleteEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + /// + public void SaveEntity(string keyValue, CompetitionInfoEntity entity) + { + try + { + competitionInfoManagerService.SaveEntity(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/EducationalAdministration/CompetitionInfoManager/CompetitionInfoManagerIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CompetitionInfoManager/CompetitionInfoManagerIBLL.cs new file mode 100644 index 000000000..dc8d44795 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CompetitionInfoManager/CompetitionInfoManagerIBLL.cs @@ -0,0 +1,48 @@ +using Learun.Util; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.EducationalAdministration +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2024-09-26 10:49 + /// 描 述：民体中心比赛信息管理 + /// + public interface CompetitionInfoManagerIBLL + { + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + IEnumerable GetPageList(Pagination pagination, string queryJson); + /// + /// 获取CompetitionInfo表实体数据 + /// + /// 主键 + /// + CompetitionInfoEntity GetCompetitionInfoEntity(string keyValue); + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + void DeleteEntity(string keyValue); + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + void SaveEntity(string keyValue, CompetitionInfoEntity entity); + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CompetitionInfoManager/CompetitionInfoManagerService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CompetitionInfoManager/CompetitionInfoManagerService.cs new file mode 100644 index 000000000..d7431f28d --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CompetitionInfoManager/CompetitionInfoManagerService.cs @@ -0,0 +1,181 @@ +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.EducationalAdministration +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2024-09-26 10:49 + /// 描 述：民体中心比赛信息管理 + /// + public class CompetitionInfoManagerService : RepositoryFactory + { + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + var strSql = new StringBuilder(); + strSql.Append("SELECT "); + strSql.Append(@" + t.ID, + t.CompetitionId, + t.GroupId, + t.Sore, + t.IsIntegral + "); + strSql.Append(" FROM CompetitionInfo t "); + strSql.Append(" WHERE 1=1 "); + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + if (!queryParam["CompetitionId"].IsEmpty()) + { + dp.Add("CompetitionId",queryParam["CompetitionId"].ToString(), DbType.String); + strSql.Append(" AND t.CompetitionId = @CompetitionId "); + } + if (!queryParam["GroupId"].IsEmpty()) + { + dp.Add("GroupId",queryParam["GroupId"].ToString(), DbType.String); + strSql.Append(" AND t.GroupId = @GroupId "); + } + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp, pagination); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取CompetitionInfo表实体数据 + /// + /// 主键 + /// + public CompetitionInfoEntity GetCompetitionInfoEntity(string keyValue) + { + try + { + return this.BaseRepository("CollegeMIS").FindEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + /// + /// 获取页面显示列表数据 + /// + /// + public IEnumerable GetListByCompetId(string CompetId) + { + try + { + return this.BaseRepository("CollegeMIS") + .FindList(x => x.CompetitionId == CompetId && !x.IsIntegral.Value); + } + 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(string keyValue, CompetitionInfoEntity entity) + { + try + { + if (!string.IsNullOrEmpty(keyValue)) + { + entity.Modify(keyValue); + this.BaseRepository("CollegeMIS").Update(entity); + } + else + { + entity.IsIntegral = false; + entity.Create(); + 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/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CompetitionManager/CompetitionManagerBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CompetitionManager/CompetitionManagerBLL.cs new file mode 100644 index 000000000..a8cc88f1c --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CompetitionManager/CompetitionManagerBLL.cs @@ -0,0 +1,125 @@ +using Learun.Util; +using System; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.EducationalAdministration +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2024-09-26 10:13 + /// 描 述：民体中心赛事管理 + /// + public class CompetitionManagerBLL : CompetitionManagerIBLL + { + private CompetitionManagerService competitionManagerService = new CompetitionManagerService(); + + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 分页参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + return competitionManagerService.GetPageList(pagination, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 获取CompetitionManager表实体数据 + /// + /// 主键 + /// + public CompetitionManagerEntity GetCompetitionManagerEntity(string keyValue) + { + try + { + return competitionManagerService.GetCompetitionManagerEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + public void DeleteEntity(string keyValue) + { + try + { + competitionManagerService.DeleteEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + /// + public void SaveEntity(string keyValue, CompetitionManagerEntity entity) + { + try + { + competitionManagerService.SaveEntity(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/EducationalAdministration/CompetitionManager/CompetitionManagerEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CompetitionManager/CompetitionManagerEntity.cs new file mode 100644 index 000000000..adb7bb33d --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CompetitionManager/CompetitionManagerEntity.cs @@ -0,0 +1,70 @@ +using Learun.Util; +using System; +using System.ComponentModel.DataAnnotations.Schema; + +namespace Learun.Application.TwoDevelopment.EducationalAdministration +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2024-09-26 10:13 + /// 描 述：民体中心赛事管理 + /// + public class CompetitionManagerEntity + { + #region 实体成员 + /// + /// 主键ID + /// + [Column("ID")] + public string ID { get; set; } + /// + /// 赛事名称 + /// + [Column("NAME")] + public string Name { get; set; } + /// + /// 赛事类型 + /// + [Column("COMPETITIONTYPE")] + public string CompetitionType { get; set; } + /// + /// 比赛时间 + /// + [Column("COMPETITIONTIME")] + public DateTime? CompetitionTime { get; set; } + /// + /// 比赛级别 + /// + [Column("COMPETITONLEVEL")] + public string CompetitonLevel { get; set; } + /// + /// 赛事备注 + /// + [Column("REMARK")] + public string Remark { get; set; } + #endregion + + #region 扩展操作 + /// + /// 新增调用 + /// + public void Create() + { + this.ID = Guid.NewGuid().ToString(); + } + /// + /// 编辑调用 + /// + /// + public void Modify(string keyValue) + { + this.ID = keyValue; + } + #endregion + #region 扩展字段 + #endregion + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CompetitionManager/CompetitionManagerIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CompetitionManager/CompetitionManagerIBLL.cs new file mode 100644 index 000000000..3461808b3 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CompetitionManager/CompetitionManagerIBLL.cs @@ -0,0 +1,48 @@ +using Learun.Util; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.EducationalAdministration +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2024-09-26 10:13 + /// 描 述：民体中心赛事管理 + /// + public interface CompetitionManagerIBLL + { + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + IEnumerable GetPageList(Pagination pagination, string queryJson); + /// + /// 获取CompetitionManager表实体数据 + /// + /// 主键 + /// + CompetitionManagerEntity GetCompetitionManagerEntity(string keyValue); + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + void DeleteEntity(string keyValue); + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + void SaveEntity(string keyValue, CompetitionManagerEntity entity); + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CompetitionManager/CompetitionManagerService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CompetitionManager/CompetitionManagerService.cs new file mode 100644 index 000000000..88d1b769c --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/CompetitionManager/CompetitionManagerService.cs @@ -0,0 +1,165 @@ +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.EducationalAdministration +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2024-09-26 10:13 + /// 描 述：民体中心赛事管理 + /// + public class CompetitionManagerService : RepositoryFactory + { + #region 获取数据 + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + var strSql = new StringBuilder(); + strSql.Append("SELECT "); + strSql.Append(@" + t.ID, + t.Name, + t.CompetitionType, + t.CompetitionTime, + t.CompetitonLevel, + t.Remark + "); + strSql.Append(" FROM CompetitionManager 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.CompetitionTime >= @startTime AND t.CompetitionTime <= @endTime ) "); + } + if (!queryParam["Name"].IsEmpty()) + { + dp.Add("Name", "%" + queryParam["Name"].ToString() + "%", DbType.String); + strSql.Append(" AND t.Name Like @Name "); + } + if (!queryParam["CompetitionType"].IsEmpty()) + { + dp.Add("CompetitionType", "%" + queryParam["CompetitionType"].ToString() + "%", DbType.String); + strSql.Append(" AND t.CompetitionType Like @CompetitionType "); + } + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp, pagination); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取CompetitionManager表实体数据 + /// + /// 主键 + /// + public CompetitionManagerEntity GetCompetitionManagerEntity(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(string keyValue, CompetitionManagerEntity entity) + { + try + { + if (!string.IsNullOrEmpty(keyValue)) + { + entity.Modify(keyValue); + this.BaseRepository("CollegeMIS").Update(entity); + } + else + { + entity.Create(); + 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/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 77199a4c0..a086d7f8a 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 @@ -2132,6 +2132,18 @@ + + + + + + + + + + + +