diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/YKTStateMent/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/YKTStateMent/Index.js index e3a6ca5e7..80d18c82b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/YKTStateMent/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/YKTStateMent/Index.js @@ -18,10 +18,10 @@ var bootstrap = function ($, learun) { // 时间搜索框 $('#datesearch').lrdate({ dfdata: [ - { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd') }, end: function () { return learun.getDate('yyyy-MM-dd') } }, - { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd') } }, - { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd') } }, - { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd') } } + { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } } ], // 月 mShow: false, @@ -117,10 +117,11 @@ var bootstrap = function ($, learun) { { label: "学号", name: "StuNo", width: 100, align: "left" }, { label: "姓名", name: "StuName", width: 100, align: "left" }, { label: "系部", name: "DeptName", width: 100, align: "left" }, + { label: "专业", name: "MajorName", width: 100, align: "left" }, { label: "班级", name: "ClassName", width: 100, align: "left" }, { label: "身份证号", name: "IdentityCardNo", width: 150, align: "left" }, { label: "消费金额", name: "MONEY", width: 100, align: "left" }, - { label: "余额", name: "BALANCE", width: 100, align: "left" }, + //{ label: "余额", name: "BALANCE", width: 100, align: "left" }, { label: "发生时间", name: "HAPPENTIME", width: 120, align: "left" }, { label: "科目", name: "SUBJECT", width: 100, align: "left" }, { label: "终端名称", name: "TERMNAME", width: 150, align: "left" }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/YKTStateMent/IndexForStudent.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/YKTStateMent/IndexForStudent.js index 904f9b0e9..cd044def1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/YKTStateMent/IndexForStudent.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/YKTStateMent/IndexForStudent.js @@ -18,10 +18,10 @@ var bootstrap = function ($, learun) { // 时间搜索框 $('#datesearch').lrdate({ dfdata: [ - { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd') }, end: function () { return learun.getDate('yyyy-MM-dd') } }, - { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd') } }, - { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd') } }, - { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd') } } + { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, + { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } } ], // 月 mShow: false, @@ -57,10 +57,11 @@ var bootstrap = function ($, learun) { { label: "学号", name: "StuNo", width: 100, align: "left" }, { label: "姓名", name: "StuName", width: 100, align: "left" }, { label: "系部", name: "DeptName", width: 100, align: "left" }, + { label: "专业", name: "MajorName", width: 100, align: "left" }, { label: "班级", name: "ClassName", width: 100, align: "left" }, { label: "身份证号", name: "IdentityCardNo", width: 150, align: "left" }, { label: "消费金额", name: "MONEY", width: 100, align: "left" }, - { label: "余额", name: "BALANCE", width: 100, align: "left" }, + //{ label: "余额", name: "BALANCE", width: 100, align: "left" }, { label: "发生时间", name: "HAPPENTIME", width: 120, align: "left" }, { label: "科目", name: "SUBJECT", width: 100, align: "left" }, { label: "终端名称", name: "TERMNAME", width: 150, align: "left" }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Controllers/Eval_MainController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Controllers/Eval_MainController.cs index bc0e21325..20cfc439a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Controllers/Eval_MainController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Controllers/Eval_MainController.cs @@ -125,6 +125,18 @@ namespace Learun.Application.Web.Areas.EvaluationTeach.Controllers ViewBag.VSerial = "EvaluationTeach_" + CommonHelper.CreateNo(); return View(); } + + /// + /// 快速复制 + /// + /// + [HttpGet] + public ActionResult CopyForm() + { + ViewBag.VSerial = "EvaluationTeach_" + CommonHelper.CreateNo(); + return View(); + } + #endregion #region 获取数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Views/Eval_Main/CopyForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Views/Eval_Main/CopyForm.cshtml new file mode 100644 index 000000000..af80d5b58 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Views/Eval_Main/CopyForm.cshtml @@ -0,0 +1,42 @@ +@{ + ViewBag.Title = "问卷管理"; + Layout = "~/Views/Shared/_Form.cshtml"; +} + +
+
+
评教编号
+ +
+
+
标题*
+ +
+
+
开始时间*
+ +
+
+
结束时间*
+ +
+
+
评教学年*
+
+
+
+
评教学期*
+
+
+
+
排序*
+ +
+
+
备注说明
+ +
+
+@Html.AppendJsFile("/Areas/EvaluationTeach/Views/Eval_Main/CopyForm.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Views/Eval_Main/CopyForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Views/Eval_Main/CopyForm.js new file mode 100644 index 000000000..c657c315f --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Views/Eval_Main/CopyForm.js @@ -0,0 +1,59 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2019-04-23 15:50 + * 描 述：问卷管理 + */ +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 () { + $("#AcademicYearNo").lrselect({ + url: "/EvaluationTeach/Eval_Main/GenerateNearByAcademic", + value: "value", + text: "text" + }); + $("#Semester").lrDataItemSelect({ code: 'Semester' }); + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/EvaluationTeach/Eval_Main/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]); + } + } + $("#VSerial").val(NewVSerial); + }); + //} else { + // $("#VSerial").val(NewVSerial); + } + } + }; + // 保存数据 + acceptClick = function (callBack) { + if (!$('body').lrValidform()) { + return false; + } + var postData = { + strEntity: JSON.stringify($('body').lrGetFormData()) + }; + $.lrSaveForm(top.$.rootUrl + '/EvaluationTeach/Eval_Main/SaveForm?keyValue=' + '', postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Views/Eval_Main/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Views/Eval_Main/Index.cshtml index d45940a7a..843e01bb6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Views/Eval_Main/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Views/Eval_Main/Index.cshtml @@ -30,6 +30,7 @@  录入  修改  删除 +  快速复制  管理问题  学生评教情况  教师被评情况 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Views/Eval_Main/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Views/Eval_Main/Index.js index c419fb78e..0c62d475c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Views/Eval_Main/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EvaluationTeach/Views/Eval_Main/Index.js @@ -5,6 +5,7 @@ * 描 述：问卷管理 */ var refreshGirdData; +var selectedRow; var bootstrap = function ($, learun) { "use strict"; var page = { @@ -33,6 +34,23 @@ var bootstrap = function ($, learun) { } }); }); + // 快速复制 + $('#lr_copy').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('VID'); + if (learun.checkrow(keyValue)) { + selectedRow = $('#gridtable').jfGridGet('rowdata'); + learun.layerForm({ + id: 'form', + title: '快速新增', + url: top.$.rootUrl + '/EvaluationTeach/Eval_Main/CopyForm?keyValue=' + keyValue, + width: 780, + height: 560, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); // 编辑 $('#lr_edit').on('click', function () { var keyValue = $('#gridtable').jfGridValue('VID'); @@ -87,7 +105,7 @@ var bootstrap = function ($, learun) { url: top.$.rootUrl + '/EvaluationTeach/Eval_Question/Index?VID=' + keyValue, width: 980, height: 760, - btn:null + btn: null }); } }); @@ -101,7 +119,7 @@ var bootstrap = function ($, learun) { url: top.$.rootUrl + '/EvaluationTeach/Eval_Main/AnswerIndex?VID=' + keyValue, width: 980, height: 760, - btn:null + btn: null }); } }); @@ -115,7 +133,7 @@ var bootstrap = function ($, learun) { url: top.$.rootUrl + '/EvaluationTeach/Eval_Main/TeacherIndex?VID=' + keyValue, width: 980, height: 760, - btn:null + btn: null }); } }); @@ -181,7 +199,7 @@ var bootstrap = function ($, learun) { $('#gridtable').lrAuthorizeJfGrid({ url: top.$.rootUrl + '/EvaluationTeach/Eval_Main/GetPageList', headData: [ - { label: "评教编号", name: "VSerial", width: 180, align: "left" }, + { label: "评教编号", name: "VSerial", width: 250, align: "left" }, { label: "标题", name: "VTitle", width: 200, align: "left" }, { label: "开始时间", name: "VStartTime", width: 100, align: "left" }, { label: "结束时间", name: "VStopTime", width: 100, align: "left" }, @@ -196,7 +214,7 @@ var bootstrap = function ($, learun) { ], mainId: 'VID', isPage: true, - sidx:'VOrder' + sidx: 'VOrder' }); page.search(); }, 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..9a053aca1 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 @@ -1251,6 +1251,7 @@ + @@ -1390,6 +1391,8 @@ + + @@ -8044,6 +8047,9 @@ + + + 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/DBModel/中间库.PDM b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/DBModel/中间库.PDM index db7f25663..c0023e022 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/DBModel/中间库.PDM +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/DBModel/中间库.PDM @@ -1,5 +1,5 @@ - + @@ -12,7 +12,7 @@ PHYSICAL_DATA_MODEL_1 0 -1677489461 +1677635508 l [FolderOptions] @@ -1207,7 +1207,7 @@ PhysOpts= DIAGRAM_1 0 -1657693977 +1677635508 l [DisplayPreferences] @@ -1655,8 +1655,8 @@ Shadow=0 基础信息，数据无论是否有更新，每天1点都会全量更新一次。 1657685099 -1657685193 -((-9337,-23701), (4312,-19276)) +1677635494 +((8663,-28876), (22312,-24451)) 4130 0 0 @@ -1988,6 +1988,33 @@ LABL 0 新宋体,8,N 新宋体,12,B 1 + +1677635508 +1677635510 +-1 +((-18550,-28681), (-3175,-15869)) +0 +12615680 +16570034 +12632256 +STRN 0 新宋体,8,N +DISPNAME 0 新宋体,8,N +OWNRDISPNAME 0 新宋体,8,N +Columns 0 新宋体,8,N +TablePkColumns 0 新宋体,8,U +TableFkColumns 0 新宋体,8,N +Keys 0 新宋体,8,N +Indexes 0 新宋体,8,N +Triggers 0 新宋体,8,N +LABL 0 新宋体,8,N +6 +65 +16777215 +1 + + + + @@ -2005,7 +2032,7 @@ LABL 0 新宋体,8,N l - + 558ED300-C20F-42DE-B3A6-A2026F8B8090 Related Columns Related Columns @@ -2016,7 +2043,7 @@ LABL 0 新宋体,8,N - + 3595DD6F-8483-4B8D-92A5-6F94C77CBB96 Id Id @@ -2028,7 +2055,7 @@ LABL 0 新宋体,8,N 50 1 - + C35E233D-EE5E-44BD-BC73-481300E32B7B 父级部门Id ParentId @@ -2039,7 +2066,7 @@ LABL 0 新宋体,8,N VARCHAR2(50) 50 - + CB412D00-DA74-4995-8AE1-5946D4697118 部门编号 Code @@ -2050,7 +2077,7 @@ LABL 0 新宋体,8,N VARCHAR2(50) 50 - + AB391F98-15E9-4545-98DC-94164D6FBE74 部门名称 Name @@ -2061,7 +2088,7 @@ LABL 0 新宋体,8,N VARCHAR2(50) 50 - + 0C2EA7B3-C16E-4756-B01E-1037AB6BF076 部门负责人Id ManagerId @@ -2072,7 +2099,7 @@ LABL 0 新宋体,8,N VARCHAR2(50) 50 - + 681C88A1-510A-4CF8-AD68-A369D4C049C7 分管校长Id SMId @@ -2083,7 +2110,7 @@ LABL 0 新宋体,8,N VARCHAR2(50) 50 - + 6BB164A7-9B2A-4C8B-803B-D9FF5A1CDB4B 排序号 IOrder @@ -2095,7 +2122,7 @@ LABL 0 新宋体,8,N - + 6FD90701-CDC4-4BE2-9094-F3151F356179 Key_1 Key_1 @@ -2104,12 +2131,12 @@ LABL 0 新宋体,8,N 1657617405 l - + - + @@ -2122,7 +2149,7 @@ LABL 0 新宋体,8,N l - + 01720DCA-B288-4B05-84BC-63357E9EE0AB Id Id @@ -2134,7 +2161,7 @@ LABL 0 新宋体,8,N 50 1 - + 3CE5A1FC-C7E1-49C7-9043-35CE439A9628 系部编号 DeptNo @@ -2145,7 +2172,7 @@ LABL 0 新宋体,8,N VARCHAR2(50) 50 - + 1E89BF25-4639-43A3-89AE-FF8DBCC8B303 系部名称 DeptName @@ -2156,7 +2183,7 @@ LABL 0 新宋体,8,N VARCHAR2(50) 50 - + 7E784D19-A634-43F8-8615-56A470DF8547 部门负责人Id DMId @@ -2169,7 +2196,7 @@ LABL 0 新宋体,8,N - + 6194A0FA-1EE9-4311-9FBE-717B7B76FF5A Key_1 Key_1 @@ -2178,12 +2205,12 @@ LABL 0 新宋体,8,N 1657618612 l - + - + @@ -2196,7 +2223,7 @@ LABL 0 新宋体,8,N l - + 03C6A62A-3644-49F3-99C5-92B1F3692903 Id Id @@ -2208,7 +2235,7 @@ LABL 0 新宋体,8,N 50 1 - + BFBDE752-328A-4401-BF30-37F9294EF4DB 系部编号 DeptNo @@ -2219,7 +2246,7 @@ LABL 0 新宋体,8,N VARCHAR2(50) 50 - + 0E1A8FFC-53D3-417E-890E-4BCAD53FF0CE 专业编号 MajorNo @@ -2230,7 +2257,7 @@ LABL 0 新宋体,8,N VARCHAR2(50) 50 - + 8F34DFD9-5DB2-43B2-9620-882FC7FB7618 专业名称 MajorName @@ -2241,7 +2268,7 @@ LABL 0 新宋体,8,N VARCHAR2(50) 50 - + 925347EA-AC73-41CF-9F48-5D4E11F216F6 学制 EduSystem @@ -2253,7 +2280,7 @@ LABL 0 新宋体,8,N - + 4AD61D05-C03C-436F-9851-8737CA4A67A0 Key_1 Key_1 @@ -2262,12 +2289,12 @@ LABL 0 新宋体,8,N 1657619057 l - + - + @@ -2280,7 +2307,7 @@ LABL 0 新宋体,8,N l - + 722109E4-54F4-4648-AB91-8D54D8085C97 Id Id @@ -2292,7 +2319,7 @@ LABL 0 新宋体,8,N 50 1 - + 5B11B296-ABD4-4E50-85E1-D8D946E8C76B 系部编号 DeptNo @@ -2303,7 +2330,7 @@ LABL 0 新宋体,8,N VARCHAR2(50) 50 - + 14B27FA9-B8C0-48F4-A09B-08A0182DE8D3 专业编号 MajorNo @@ -2314,7 +2341,7 @@ LABL 0 新宋体,8,N VARCHAR2(50) 50 - + DF2215BC-3EF9-4C24-A71B-7D810562F2C5 班级名称 ClassName @@ -2325,7 +2352,7 @@ LABL 0 新宋体,8,N VARCHAR2(50) 50 - + C6775154-39D1-4A70-A68F-D6CA180848C3 班级编号 ClassNo @@ -2336,7 +2363,7 @@ LABL 0 新宋体,8,N VARCHAR2(50) 50 - + BC73F282-AEA4-44F0-8D3E-1313343A7989 年级 Grade @@ -2347,7 +2374,7 @@ LABL 0 新宋体,8,N VARCHAR2(50) 50 - + 51B12E2D-A1E0-47FD-99B8-778B7E6811E6 班主任编号 ClassDiredctorNo @@ -2358,7 +2385,7 @@ LABL 0 新宋体,8,N VARCHAR2(50) 50 - + 1786F396-5EA4-484A-9AE0-1DAA14570E67 辅导员编号 ClassTutorNo @@ -2371,7 +2398,7 @@ LABL 0 新宋体,8,N - + 7929E237-29B2-48D5-A59A-1F42A8BFE6FB Key_1 Key_1 @@ -2380,12 +2407,12 @@ LABL 0 新宋体,8,N 1657679435 l - + - + @@ -2398,7 +2425,7 @@ LABL 0 新宋体,8,N l - + FB699D7A-6267-41D1-9C74-DD5D1BF0DBBF Id Id @@ -2410,7 +2437,7 @@ LABL 0 新宋体,8,N 50 1 - + 36F815DD-14A0-4C21-A0A4-436F01FC0C73 教室编号 ClassroomNo @@ -2421,7 +2448,7 @@ LABL 0 新宋体,8,N VARCHAR2(50) 50 - + 4D9928D1-D647-42C9-B2DF-14B177A89D99 教室名称 ClassroomName @@ -2432,7 +2459,7 @@ LABL 0 新宋体,8,N VARCHAR2(50) 50 - + 8F7C6CD6-49AB-4945-AFEC-A78D993F0433 容纳人数 ContainStuNum @@ -2444,7 +2471,7 @@ LABL 0 新宋体,8,N - + 62A53ED8-5B19-49F2-A3E9-71CC109A26F7 Key_1 Key_1 @@ -2453,12 +2480,12 @@ LABL 0 新宋体,8,N 1657679722 l - + - + @@ -2471,7 +2498,7 @@ LABL 0 新宋体,8,N l - + ED58F529-833D-47E7-90C0-D4A87D413C24 Id Id @@ -2483,7 +2510,7 @@ LABL 0 新宋体,8,N 50 1 - + B1D90F4D-456C-46F6-A7CB-842036844EB8 学生编号 StuNo @@ -2494,7 +2521,7 @@ LABL 0 新宋体,8,N VARCHAR2(50) 50 - + 792DB026-752C-4204-8B65-E79C20C31054 姓名 StuName @@ -2505,7 +2532,7 @@ LABL 0 新宋体,8,N VARCHAR2(100) 100 - + 7D8241D7-77C2-478B-815D-4E7B3BE2B9E6 系部编号 DeptNo @@ -2516,7 +2543,7 @@ LABL 0 新宋体,8,N VARCHAR2(50) 50 - + 1A146A9E-7A18-4E9E-A752-DE13D04AB00D 专业编号 MajorNo @@ -2527,7 +2554,7 @@ LABL 0 新宋体,8,N VARCHAR2(50) 50 - + A57C3BFD-DF44-480D-A716-AAB5AB8BB1AE 班级编号 ClassNo @@ -2538,7 +2565,7 @@ LABL 0 新宋体,8,N VARCHAR2(50) 50 - + 2AF4E230-E28B-45D4-B53F-B054BEDD7EBA 年级 Grade @@ -2549,7 +2576,7 @@ LABL 0 新宋体,8,N VARCHAR2(50) 50 - + 8C8C3184-3774-477F-9794-41D37FEEA493 出生日期 Birth @@ -2559,7 +2586,7 @@ LABL 0 新宋体,8,N l DATE - + 22F8F70C-410B-4A5B-9B89-0C131B199B0B 性别 GenderNo @@ -2570,7 +2597,7 @@ LABL 0 新宋体,8,N CHAR(1) 1 - + 44C9FBC1-46A6-44C4-A93D-1721235FB73B 身份证号 IdentityNo @@ -2581,7 +2608,7 @@ LABL 0 新宋体,8,N VARCHAR2(50) 50 - + DB840626-AECF-4EA7-BAA1-C8F16DBC5EB0 联系电话 Mobile @@ -2594,7 +2621,7 @@ LABL 0 新宋体,8,N - + AE735D7A-D489-4A3C-BA6B-89680DBC2DDF Key_1 Key_1 @@ -2603,12 +2630,12 @@ LABL 0 新宋体,8,N 1657680259 l - + - + @@ -2621,7 +2648,7 @@ LABL 0 新宋体,8,N l - + 746D87CA-6014-4561-BDA3-7A467EA3C6F4 Related Columns Related Columns @@ -2632,7 +2659,7 @@ LABL 0 新宋体,8,N - + C0B04110-9C71-408C-A7A4-803DFD125792 Id Id @@ -2644,7 +2671,7 @@ LABL 0 新宋体,8,N 50 1 - + 824877E7-2C98-46A2-BF9A-BA15FDC107CE 教师编号 EmpNo @@ -2655,7 +2682,7 @@ LABL 0 新宋体,8,N VARCHAR2(50) 50 - + ACCD9438-788D-4274-A358-2C201C618257 姓名 EmpName @@ -2666,7 +2693,7 @@ LABL 0 新宋体,8,N VARCHAR2(100) 100 - + 42DE8C48-F02E-47D2-90D6-52ADE85C67D9 部门Id DepartmentId @@ -2677,7 +2704,7 @@ LABL 0 新宋体,8,N VARCHAR2(50) 50 - + DB03B7D5-E5CA-492C-A4AA-8FCD55299CCA 教学系部编号 DeptNo @@ -2688,7 +2715,7 @@ LABL 0 新宋体,8,N VARCHAR2(50) 50 - + 6A4CF63B-C673-40D7-B4B1-6E384FD768E8 出生日期 Birth @@ -2698,7 +2725,7 @@ LABL 0 新宋体,8,N l DATE - + C586C289-061B-4A9A-AB10-C03092A53626 性别 GenderNo @@ -2709,7 +2736,7 @@ LABL 0 新宋体,8,N CHAR(1) 1 - + 87B1BC29-8CF8-43AD-BEDB-8587BDBD931D 身份证号 IdentityNo @@ -2720,7 +2747,7 @@ LABL 0 新宋体,8,N VARCHAR2(50) 50 - + 21A503A9-9F6A-4FB7-8C2D-80205D0F1FC8 联系电话 Mobile @@ -2733,7 +2760,7 @@ LABL 0 新宋体,8,N - + 95F85F33-69EB-4704-86D0-BBEC72D9AE1A Key_1 Key_1 @@ -2742,12 +2769,12 @@ LABL 0 新宋体,8,N 1657680820 l - + - + @@ -2760,7 +2787,7 @@ LABL 0 新宋体,8,N l - + 0913886D-4511-408C-8BB6-7EE9E7EA4008 Related Columns Related Columns @@ -2771,7 +2798,7 @@ LABL 0 新宋体,8,N - + 0F6F186D-3A1B-4C1E-99CF-D782685B21BA Id Id @@ -2782,7 +2809,7 @@ LABL 0 新宋体,8,N NVARCHAR2(50) 50 - + 7B6CAE4E-C137-4AA5-888B-A7B9A753DF43 学生学号 StuNo @@ -2793,7 +2820,7 @@ LABL 0 新宋体,8,N NVARCHAR2(50) 50 - + 20413846-FE6C-4415-A4C2-7CD7E8B139CF 身份证号 IdentityNo @@ -2804,7 +2831,7 @@ LABL 0 新宋体,8,N NVARCHAR2(50) 50 - + 80A83A2D-F20F-45BD-A6B9-1C77D79C055F 人脸图片Url FaceUrl @@ -2827,7 +2854,7 @@ LABL 0 新宋体,8,N l - + DEFF5BA6-9BEF-44B5-B4A6-254A59A5A55B Related Columns Related Columns @@ -2838,7 +2865,7 @@ LABL 0 新宋体,8,N - + 1DF34B9F-EBDF-4530-9554-8587C84E964F Id Id @@ -2849,7 +2876,7 @@ LABL 0 新宋体,8,N NVARCHAR2(50) 50 - + 4094E0BC-8242-4DAD-98AF-B1601C95A1DC 学生学号 StuNo @@ -2860,7 +2887,7 @@ LABL 0 新宋体,8,N NVARCHAR2(50) 50 - + 07E1BDF0-350A-420A-9409-578D60116CD4 身份证号 IdentityNo @@ -2871,7 +2898,7 @@ LABL 0 新宋体,8,N NVARCHAR2(50) 50 - + 7092EFB1-DBDD-40B9-9016-7D2AF961A914 一卡通号 CardNo @@ -2882,7 +2909,7 @@ LABL 0 新宋体,8,N NVARCHAR2(100) 100 - + 3F5122A6-4236-4D21-A438-B3FA6160882D 用户类型(1教师，2学生，3其他) UType @@ -2893,7 +2920,7 @@ LABL 0 新宋体,8,N CHAR(1) 1 - + 61DB9EFE-A4E9-4A3D-841E-4E4DEFA14A51 交易类型（1交易，2充值） TransType @@ -2904,7 +2931,7 @@ LABL 0 新宋体,8,N CHAR(1) 1 - + 891DB1A1-5893-466D-AB8C-0A0C4A9AB531 交易金额（元，精确到1位小数） TransAmount @@ -2916,7 +2943,7 @@ LABL 0 新宋体,8,N 10 1 - + 64C30399-01FB-4C0E-9ED3-4D83FF039706 交易时间 TransTime @@ -2926,7 +2953,7 @@ LABL 0 新宋体,8,N l DATE - + 2DDBE0BC-3C5F-4E43-A100-D4B19DBEF540 交易地点（文字说明） TransAddr @@ -2939,9 +2966,115 @@ LABL 0 新宋体,8,N + +49DC18D7-AA40-4DDE-B6B6-AB2AEF55B30F +宿舍信息表 +DS_Dormitory +1657616336 +l +1677636783 +l + + + +D3952E27-151B-4912-86E5-B4F56618B6E1 +Related Columns +Related Columns +1677636790 +l +1677636790 +l + + + + +7C97549E-6FF4-4865-971C-AFEA87D8D8D3 +Id +Id +1657616446 +l +1677635508 +l +VARCHAR2(50) +50 +1 + + +6462C7DF-82A3-4235-B299-35DFE06E710C +父Id +DParentId +1677636643 +l +1677636679 +l +VARCHAR2(50) +50 + + +DC94952C-4A3F-487B-8016-16592EA1D044 +学生编号 +StuNo +1657679511 +l +1677635508 +l +VARCHAR2(50) +50 + + +0E87FE81-E407-4E62-99B7-F829EC333151 +编号 +DNo +1677635565 +l +1677636559 +l +VARCHAR(50) +50 + + +C850C88F-3B60-4D43-B201-93B3F59782C1 +名称 +DName +1677636537 +l +1677636559 +l +VARCHAR(50) +50 + + +B388BC3E-2C39-4950-A9DB-3006FCFC5E5B +类型(1宿舍楼，2单元，3楼层，4寝室，5床位) +DType +1677636562 +l +1677636641 +l +NUMBER + + + + +DC095920-290B-4E8C-9631-AEAAC9E73191 +Key_1 +Key_1 +1657617396 +l +1677635508 +l + + + + + + + + + - + 46EC3E2A-6CBF-421A-9DA8-6BCCEDEC7DF5 PUBLIC PUBLIC @@ -2952,7 +3085,7 @@ LABL 0 新宋体,8,N - + AF25C190-A5BF-4CF4-8137-C7E7446D61A4 ORACLE Version 11g ORA11GR1 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/YKTStateMent/YKTStateMentEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/YKTStateMent/YKTStateMentEntity.cs index 35bffe7e8..a94b1e8b9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/YKTStateMent/YKTStateMentEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/YKTStateMent/YKTStateMentEntity.cs @@ -47,6 +47,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration public string StuNo { get; set; } public string StuName { get; set; } public string DeptName { get; set; } + public string MajorName { get; set; } public string ClassName { get; set; } public string IdentityCardNo { get; set; } public string mobile { get; set; } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/YKTStateMent/YKTStateMentService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/YKTStateMent/YKTStateMentService.cs index 942f55394..8462a79a1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/YKTStateMent/YKTStateMentService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/YKTStateMent/YKTStateMentService.cs @@ -32,11 +32,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { var queryParam = queryJson.ToJObject(); var strSql = new StringBuilder(); - strSql.Append(@"SELECT A.OUTID AS STUPHONE,A.CUSTOMERID AS YKTNO,round(A.OPFARE/100,2) AS MONEY,round(A.ODDFARE/100,2) AS BALANCE,A.OPDT AS HAPPENTIME,A.DSCRP AS SUBJECT,B.TERMNAME,C.StuNo,C.StuName,d.DeptName,e.ClassName,c.identityno as IdentityCardNo + strSql.Append(@"SELECT A.OUTID AS STUPHONE,A.CUSTOMERID AS YKTNO,round(A.OPFARE/100,2) AS MONEY,round(A.ODDFARE/100,2) AS BALANCE,A.OPDT AS HAPPENTIME,A.DSCRP AS SUBJECT,B.TERMNAME,C.StuNo,C.StuName,d.DeptName,e.ClassName,c.identityno as IdentityCardNo, f.MajorName FROM M_REC_CONSUME@ykt A LEFT JOIN M_BASE_TERM@ykt B ON A.TERMID = B.TERMID left join ds_stuinfo C on A.OUTID = C.mobile left join ds_dept d on c.deptno = d.deptno left join ds_classinfo e on c.classno = e.classno + left join ds_major f on c.majorno=f.majorno where 1=1 and stuno is not null "); if (!queryParam["StuNo"].IsEmpty()) { @@ -60,7 +61,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } if (!queryParam["StartDate"].IsEmpty() && !queryParam["EndDate"].IsEmpty()) { - strSql.Append(" and (A.OPDT>=to_date('" + queryParam["StartDate"] + "','yyyy-mm-dd') and A.OPDT<=to_date('" + queryParam["EndDate"] + "','yyyy-mm-dd'))"); + strSql.Append(" and (A.OPDT>=to_date('" + queryParam["StartDate"] + "','yyyy-mm-dd') and A.OPDT<=to_date('" + queryParam["EndDate"] + "','yyyy-mm-dd hh24:mi:ss'))"); } return BaseRepository("TLMZYMIDDLEString").FindList(strSql.ToString(), pagination); 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表实体数据 /// 主键