From 5dbd12c12cb217a3285990c7ea3f40dc9d6e7a14 Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Wed, 1 Mar 2023 15:04:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=BF=E8=88=8D=E5=A5=96?= =?UTF-8?q?=E5=8A=B1=E7=BB=9F=E8=AE=A1=E3=80=81=E5=AE=BF=E8=88=8D=E6=83=A9?= =?UTF-8?q?=E7=BD=9A=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Acc_PunishmentController.cs | 42 ++++- .../Controllers/Acc_RewardController.cs | 30 ++++ .../Views/Acc_Punishment/Form.cshtml | 24 +-- .../Acc_Punishment/IndexStatistics.cshtml | 71 ++++++++ .../Views/Acc_Punishment/IndexStatistics.js | 158 ++++++++++++++++++ .../Views/Acc_Reward/Form.cshtml | 24 +-- .../Views/Acc_Reward/IndexStatistics.cshtml | 71 ++++++++ .../Views/Acc_Reward/IndexStatistics.js | 158 ++++++++++++++++++ .../Learun.Application.Web.csproj | 4 + .../Learun.Application.WebApi/Bootstraper.cs | 1 + .../Modules/AnnexesNoLoginApi.cs | 20 +-- .../Acc_Punishment/Acc_PunishmentBLL.cs | 19 +++ .../Acc_Punishment/Acc_PunishmentEntity.cs | 4 +- .../Acc_Punishment/Acc_PunishmentIBLL.cs | 1 + .../Acc_Punishment/Acc_PunishmentService.cs | 68 ++++++++ .../Acc_Reward/Acc_RewardBLL.cs | 24 +++ .../Acc_Reward/Acc_RewardEntity.cs | 4 +- .../Acc_Reward/Acc_RewardIBLL.cs | 1 + .../Acc_Reward/Acc_RewardService.cs | 66 ++++++++ 19 files changed, 748 insertions(+), 42 deletions(-) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Punishment/IndexStatistics.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Punishment/IndexStatistics.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Reward/IndexStatistics.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Reward/IndexStatistics.js diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Acc_PunishmentController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Acc_PunishmentController.cs index 9aee327d3..aaceb5c92 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Acc_PunishmentController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Acc_PunishmentController.cs @@ -26,7 +26,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers [HttpGet] public ActionResult Index() { - return View(); + return View(); } /// /// 表单页 @@ -35,7 +35,17 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers [HttpGet] public ActionResult Form() { - return View(); + return View(); + } + + /// + /// 统计 + /// + /// + [HttpGet] + public ActionResult IndexStatistics() + { + return View(); } #endregion @@ -61,6 +71,27 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers }; return Success(jsonData); } + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetPageListForStatistics(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var data = acc_PunishmentIBLL.GetPageListForStatistics(paginationobj, queryJson); + var jsonData = new + { + rows = data, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records + }; + return Success(jsonData); + } /// /// 获取表单数据 /// @@ -69,8 +100,9 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers [AjaxOnly] public ActionResult GetFormData(string keyValue) { - var Acc_PunishmentData = acc_PunishmentIBLL.GetAcc_PunishmentEntity( keyValue ); - var jsonData = new { + var Acc_PunishmentData = acc_PunishmentIBLL.GetAcc_PunishmentEntity(keyValue); + var jsonData = new + { Acc_Punishment = Acc_PunishmentData, }; return Success(jsonData); @@ -102,7 +134,7 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers public ActionResult SaveForm(string keyValue, string strEntity) { Acc_PunishmentEntity entity = strEntity.ToObject(); - acc_PunishmentIBLL.SaveEntity(keyValue,entity); + acc_PunishmentIBLL.SaveEntity(keyValue, entity); return Success("保存成功！"); } #endregion diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Acc_RewardController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Acc_RewardController.cs index 12c31043d..8cc2e22b1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Acc_RewardController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Acc_RewardController.cs @@ -37,6 +37,16 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers { return View(); } + /// + /// 奖励统计 + /// + /// + [HttpGet] + public ActionResult IndexStatistics() + { + return View(); + } + #endregion #region 获取数据 @@ -62,6 +72,26 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers return Success(jsonData); } /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetPageListForStatistics(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var data = acc_RewardIBLL.GetPageListForStatistics(paginationobj, queryJson); + var jsonData = new + { + rows = data, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records + }; + return Success(jsonData); + } + /// /// 获取表单数据 /// /// diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Punishment/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Punishment/Form.cshtml index 32f593bc5..674bb63d6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Punishment/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Punishment/Form.cshtml @@ -4,28 +4,28 @@ }
-
学年
-
+
学年*
+
-
学期
-
+
学期*
+
-
宿舍楼
-
+
宿舍楼*
+
-
单元
-
+
单元*
+
-
楼层
-
+
楼层*
+
-
宿舍
-
+
宿舍*
+
惩罚
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Punishment/IndexStatistics.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Punishment/IndexStatistics.cshtml new file mode 100644 index 000000000..b838b0682 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Punishment/IndexStatistics.cshtml @@ -0,0 +1,71 @@ +@{ + ViewBag.Title = "宿舍奖励"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
+
+ @*
+
+
统计条件
+
+
*@ +
+
+
学年
+
+
+
+
+
+
学期
+
+
+
+
+
+
宿舍楼
+
+
+
+
+
+
单元
+
+
+
+
+
+
楼层
+
+
+
+
+
+
宿舍
+
+
+
+
+  统计 +
+ +
+
+
+ +
+
+  新增 +  编辑 +  删除 +
+
+
+
+
+
+
+@Html.AppendJsFile("/Areas/LogisticsManagement/Views/Acc_Punishment/IndexStatistics.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Punishment/IndexStatistics.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Punishment/IndexStatistics.js new file mode 100644 index 000000000..1e0c119ee --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Punishment/IndexStatistics.js @@ -0,0 +1,158 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2020-08-11 16:46 + * 描 述：宿舍奖励 + */ +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var startTime; + var endTime; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 420, 400); + $('#SYear').lrRadioCheckbox({ + type: 'radio', + code: 'YesOrNoInt', + }); + $('#SYear').lrselectSet('1'); + $('#Semester').lrRadioCheckbox({ + type: 'radio', + code: 'YesOrNoInt', + }); + $('#Dormitory').lrRadioCheckbox({ + type: 'radio', + code: 'YesOrNoInt', + }); + $('#Unit').lrRadioCheckbox({ + type: 'radio', + code: 'YesOrNoInt', + }); + $('#Floor').lrRadioCheckbox({ + type: 'radio', + code: 'YesOrNoInt', + }); + $('#RId').lrRadioCheckbox({ + type: 'radio', + code: 'YesOrNoInt', + }); + // 时间搜索框 + $('#datesearch').lrdate({ + dfdata: [ + { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } } + ], + // 月 + mShow: false, + premShow: false, + // 季度 + jShow: false, + prejShow: false, + // 年 + ysShow: false, + yxShow: false, + preyShow: false, + yShow: false, + // 默认 + dfvalue: '1', + selectfn: function (begin, end) { + startTime = begin; + endTime = end; + page.search(); + } + }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + //查询 + $('#btn_Search').on('click', function () { + refreshGirdData(); + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').jfGrid({ + url: top.$.rootUrl + '/LogisticsManagement/Acc_Punishment/GetPageListForStatistics', + headData: [ + { label: "学年", name: "SYear", width: 100, align: "left" }, + { label: "学期", name: "Semester", width: 100, align: "left" }, + { + label: "宿舍楼", name: "Dormitory", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Acc_DormitoryData', + key: value, + keyId: 'id', + callback: function (_data) { + callback(_data['name']); + } + }); + } + }, + { + label: "单元", name: "Unit", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Acc_UnitData', + key: value, + keyId: 'id', + callback: function (_data) { + callback(_data['name']); + } + }); + } + }, + { + label: "楼层", name: "Floor", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Acc_FloorData', + key: value, + keyId: 'id', + callback: function (_data) { + callback(_data['name']); + } + }); + } + }, + { + label: "宿舍", name: "RId", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Acc_RoomData', + key: value, + keyId: 'id', + callback: function (_data) { + callback(_data['name']); + } + }); + } + }, + { label: "数量", name: "num", width: 100, align: "left" }, + ], + mainId: 'ID', + isPage: true + }); + }, + search: function (param) { + param = param || {}; + var $content = $('body').find('.lr-layout-tool-left'); + param = $content.lrGetFormData(); + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + page.search(); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Reward/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Reward/Form.cshtml index 682b3f444..35f73987f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Reward/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Reward/Form.cshtml @@ -4,28 +4,28 @@ }
-
学年
-
+
学年*
+
-
学期
-
+
学期*
+
-
宿舍楼
-
+
宿舍楼*
+
-
单元
-
+
单元*
+
-
楼层
-
+
楼层*
+
-
宿舍
-
+
宿舍*
+
奖励
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Reward/IndexStatistics.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Reward/IndexStatistics.cshtml new file mode 100644 index 000000000..7f89f3e82 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Reward/IndexStatistics.cshtml @@ -0,0 +1,71 @@ +@{ + ViewBag.Title = "宿舍奖励"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
+
+ @*
+
+
统计条件
+
+
*@ +
+
+
学年
+
+
+
+
+
+
学期
+
+
+
+
+
+
宿舍楼
+
+
+
+
+
+
单元
+
+
+
+
+
+
楼层
+
+
+
+
+
+
宿舍
+
+
+
+
+  统计 +
+ +
+
+
+ +
+
+  新增 +  编辑 +  删除 +
+
+
+
+
+
+
+@Html.AppendJsFile("/Areas/LogisticsManagement/Views/Acc_Reward/IndexStatistics.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Reward/IndexStatistics.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Reward/IndexStatistics.js new file mode 100644 index 000000000..c5ca7c9a2 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_Reward/IndexStatistics.js @@ -0,0 +1,158 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2020-08-11 16:46 + * 描 述：宿舍奖励 + */ +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var startTime; + var endTime; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 420, 400); + $('#SYear').lrRadioCheckbox({ + type: 'radio', + code: 'YesOrNoInt', + }); + $('#SYear').lrselectSet('1'); + $('#Semester').lrRadioCheckbox({ + type: 'radio', + code: 'YesOrNoInt', + }); + $('#Dormitory').lrRadioCheckbox({ + type: 'radio', + code: 'YesOrNoInt', + }); + $('#Unit').lrRadioCheckbox({ + type: 'radio', + code: 'YesOrNoInt', + }); + $('#Floor').lrRadioCheckbox({ + type: 'radio', + code: 'YesOrNoInt', + }); + $('#RId').lrRadioCheckbox({ + type: 'radio', + code: 'YesOrNoInt', + }); + // 时间搜索框 + $('#datesearch').lrdate({ + dfdata: [ + { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } } + ], + // 月 + mShow: false, + premShow: false, + // 季度 + jShow: false, + prejShow: false, + // 年 + ysShow: false, + yxShow: false, + preyShow: false, + yShow: false, + // 默认 + dfvalue: '1', + selectfn: function (begin, end) { + startTime = begin; + endTime = end; + page.search(); + } + }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + //查询 + $('#btn_Search').on('click', function () { + refreshGirdData(); + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').jfGrid({ + url: top.$.rootUrl + '/LogisticsManagement/Acc_Reward/GetPageListForStatistics', + headData: [ + { label: "学年", name: "SYear", width: 100, align: "left" }, + { label: "学期", name: "Semester", width: 100, align: "left" }, + { + label: "宿舍楼", name: "Dormitory", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Acc_DormitoryData', + key: value, + keyId: 'id', + callback: function (_data) { + callback(_data['name']); + } + }); + } + }, + { + label: "单元", name: "Unit", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Acc_UnitData', + key: value, + keyId: 'id', + callback: function (_data) { + callback(_data['name']); + } + }); + } + }, + { + label: "楼层", name: "Floor", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Acc_FloorData', + key: value, + keyId: 'id', + callback: function (_data) { + callback(_data['name']); + } + }); + } + }, + { + label: "宿舍", name: "RId", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Acc_RoomData', + key: value, + keyId: 'id', + callback: function (_data) { + callback(_data['name']); + } + }); + } + }, + { label: "数量", name: "num", width: 100, align: "left" }, + ], + mainId: 'ID', + isPage: true + }); + }, + search: function (param) { + param = param || {}; + var $content = $('body').find('.lr-layout-tool-left'); + param = $content.lrGetFormData(); + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + page.search(); + }; + 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 e1aee856a..46cb1eb8f 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 @@ -1390,6 +1390,8 @@ + + @@ -8044,6 +8046,8 @@ + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Bootstraper.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Bootstraper.cs index 71856318e..5883c4ec9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Bootstraper.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Bootstraper.cs @@ -38,6 +38,7 @@ namespace Learun.Application.WebApi protected override void ApplicationStartup(TinyIoCContainer container, IPipelines pipelines) { base.ApplicationStartup(container, pipelines); + StaticConfiguration.DisableErrorTraces = false; Nancy.Json.JsonSettings.MaxJsonLength = int.MaxValue; } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/AnnexesNoLoginApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/AnnexesNoLoginApi.cs index d66f695e6..dde435470 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/AnnexesNoLoginApi.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/AnnexesNoLoginApi.cs @@ -32,7 +32,6 @@ namespace Learun.Application.WebApi.Modules return Success(list); } - /// /// 上传附件图片文件 /// @@ -40,14 +39,14 @@ namespace Learun.Application.WebApi.Modules public Response Upload(dynamic _) { var files = (List)this.Context.Request.Files; - var folderId = this.GetReqData(); - + string folderId = Guid.NewGuid().ToString(); string filePath = Config.GetValue("AnnexesFile"); string uploadDate = DateTime.Now.ToString("yyyyMMdd"); - string FileEextension = Path.GetExtension(files[0].Name); + string fileEextension = Path.GetExtension(files[0].Name); + string fileType = fileEextension.Replace(".", ""); string fileGuid = Guid.NewGuid().ToString(); - string virtualPath = string.Format("{0}/{1}/{2}/{3}{4}", filePath, userInfo.userId, uploadDate, fileGuid, FileEextension); + string virtualPath = string.Format("{0}/{1}/{2}/{3}{4}", filePath, "system", uploadDate, fileGuid, fileEextension); //创建文件夹 string path = Path.GetDirectoryName(virtualPath); @@ -67,17 +66,16 @@ namespace Learun.Application.WebApi.Modules fileAnnexesEntity.F_FileName = files[0].Name; fileAnnexesEntity.F_FilePath = virtualPath; fileAnnexesEntity.F_FileSize = files[0].Value.Length.ToString(); - fileAnnexesEntity.F_FileExtensions = FileEextension; - fileAnnexesEntity.F_FileType = FileEextension.Replace(".", ""); - fileAnnexesEntity.F_CreateUserId = userInfo.userId; - fileAnnexesEntity.F_CreateUserName = userInfo.realName; + fileAnnexesEntity.F_FileExtensions = fileEextension; + fileAnnexesEntity.F_FileType = fileType; + fileAnnexesEntity.F_CreateUserId = "system"; + fileAnnexesEntity.F_CreateUserName = "system"; annexesFileIBLL.SaveEntity(folderId, fileAnnexesEntity); } - return SuccessString(fileGuid); + return SuccessString(folderId); } - /// /// 删除文件 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Punishment/Acc_PunishmentBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Punishment/Acc_PunishmentBLL.cs index f95046a35..60c677772 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Punishment/Acc_PunishmentBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Punishment/Acc_PunishmentBLL.cs @@ -42,6 +42,25 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } + public IEnumerable GetPageListForStatistics(Pagination pagination, string queryJson) + { + try + { + return acc_PunishmentService.GetPageListForStatistics(pagination, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + /// /// 获取Acc_Punishment表实体数据 /// 主键 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Punishment/Acc_PunishmentEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Punishment/Acc_PunishmentEntity.cs index 3376a7001..51720b642 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Punishment/Acc_PunishmentEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Punishment/Acc_PunishmentEntity.cs @@ -11,7 +11,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement /// 日 期：2020-08-11 16:48 /// 描 述：惩罚管理 /// - public class Acc_PunishmentEntity + public class Acc_PunishmentEntity { #region 实体成员 /// @@ -112,6 +112,8 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } #endregion #region 扩展字段 + [NotMapped] + public string num { get; set; } #endregion } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Punishment/Acc_PunishmentIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Punishment/Acc_PunishmentIBLL.cs index 6eed7ef46..37fca7a4c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Punishment/Acc_PunishmentIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Punishment/Acc_PunishmentIBLL.cs @@ -21,6 +21,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement /// 查询参数 /// IEnumerable GetPageList(Pagination pagination, string queryJson); + IEnumerable GetPageListForStatistics(Pagination pagination, string queryJson); /// /// 获取Acc_Punishment表实体数据 /// 主键 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Punishment/Acc_PunishmentService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Punishment/Acc_PunishmentService.cs index 68c64c042..9a6879540 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Punishment/Acc_PunishmentService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Punishment/Acc_PunishmentService.cs @@ -57,6 +57,74 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } + + /// + /// 奖励统计 + /// + /// + /// + /// + public IEnumerable GetPageListForStatistics(Pagination pagination, string queryJson) + { + try + { + var strSql = new StringBuilder(); + var filedSql = ""; + var groupSql = ""; + strSql.Append("SELECT "); + + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + if (!queryParam["SYear"].IsEmpty() && queryParam["SYear"].ToString().Trim() == "1") + { + filedSql += " SYear,"; + } + if (!queryParam["Semester"].IsEmpty() && queryParam["Semester"].ToString().Trim() == "1") + { + filedSql += " Semester,"; + } + if (!queryParam["Dormitory"].IsEmpty() && queryParam["Dormitory"].ToString().Trim() == "1") + { + filedSql += " Dormitory,"; + } + if (!queryParam["Unit"].IsEmpty() && queryParam["Unit"].ToString().Trim() == "1") + { + filedSql += " Unit,"; + } + if (!queryParam["Floor"].IsEmpty() && queryParam["Floor"].ToString().Trim() == "1") + { + filedSql += " Floor,"; + } + if (!queryParam["RId"].IsEmpty() && queryParam["RId"].ToString().Trim() == "1") + { + filedSql += " RId,"; + } + if (!string.IsNullOrEmpty(filedSql)) + { + strSql.Append(filedSql); + groupSql = " group by " + filedSql.Substring(0, filedSql.Length - 1); + } + + strSql.Append(" count(1) as num FROM Acc_Punishment t "); + strSql.Append(" WHERE 1=1 "); + strSql.Append(groupSql); + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// /// 获取Acc_Punishment表实体数据 /// 主键 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Reward/Acc_RewardBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Reward/Acc_RewardBLL.cs index ceb3c66dd..5a06e3f8a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Reward/Acc_RewardBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Reward/Acc_RewardBLL.cs @@ -42,6 +42,30 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + public IEnumerable GetPageListForStatistics(Pagination pagination, string queryJson) + { + try + { + return acc_RewardService.GetPageListForStatistics(pagination, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + /// /// 获取Acc_Reward表实体数据 /// 主键 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Reward/Acc_RewardEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Reward/Acc_RewardEntity.cs index f621f851a..23dc88a99 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Reward/Acc_RewardEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Reward/Acc_RewardEntity.cs @@ -11,7 +11,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement /// 日 期：2020-08-11 16:46 /// 描 述：宿舍奖励 /// - public class Acc_RewardEntity + public class Acc_RewardEntity { #region 实体成员 /// @@ -112,6 +112,8 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } #endregion #region 扩展字段 + [NotMapped] + public string num { get; set; } #endregion } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Reward/Acc_RewardIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Reward/Acc_RewardIBLL.cs index 09744a4eb..a884dbf53 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Reward/Acc_RewardIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Reward/Acc_RewardIBLL.cs @@ -21,6 +21,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement /// 查询参数 /// IEnumerable GetPageList(Pagination pagination, string queryJson); + IEnumerable GetPageListForStatistics(Pagination pagination, string queryJson); /// /// 获取Acc_Reward表实体数据 /// 主键 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Reward/Acc_RewardService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Reward/Acc_RewardService.cs index 5641fe07d..d8296a1a6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Reward/Acc_RewardService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_Reward/Acc_RewardService.cs @@ -57,6 +57,72 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } } + /// + /// 奖励统计 + /// + /// + /// + /// + public IEnumerable GetPageListForStatistics(Pagination pagination, string queryJson) + { + try + { + var strSql = new StringBuilder(); + var filedSql = ""; + var groupSql = ""; + strSql.Append("SELECT "); + + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + if (!queryParam["SYear"].IsEmpty()&& queryParam["SYear"].ToString().Trim()=="1") + { + filedSql += " SYear,"; + } + if (!queryParam["Semester"].IsEmpty() && queryParam["Semester"].ToString().Trim() == "1") + { + filedSql += " Semester,"; + } + if (!queryParam["Dormitory"].IsEmpty() && queryParam["Dormitory"].ToString().Trim() == "1") + { + filedSql += " Dormitory,"; + } + if (!queryParam["Unit"].IsEmpty() && queryParam["Unit"].ToString().Trim() == "1") + { + filedSql += " Unit,"; + } + if (!queryParam["Floor"].IsEmpty() && queryParam["Floor"].ToString().Trim() == "1") + { + filedSql += " Floor,"; + } + if (!queryParam["RId"].IsEmpty() && queryParam["RId"].ToString().Trim() == "1") + { + filedSql += " RId,"; + } + if (!string.IsNullOrEmpty(filedSql)) + { + strSql.Append(filedSql); + groupSql = " group by " + filedSql.Substring(0, filedSql.Length - 1); + } + + strSql.Append(" count(1) as num FROM Acc_Reward t "); + strSql.Append(" WHERE 1=1 "); + strSql.Append(groupSql); + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + /// /// 获取Acc_Reward表实体数据 /// 主键