diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/YKTStateMentController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/YKTStateMentController.cs index 838358ac7..490abd3a2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/YKTStateMentController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/YKTStateMentController.cs @@ -30,10 +30,12 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } - /// - /// 表单页 - /// - /// + + [HttpGet] + public ActionResult ManageIndexTeacher() + { + return View(); + } [HttpGet] public ActionResult IndexForStudent() { @@ -41,13 +43,11 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers ViewBag.StuNo = userinfo.account; return View(); } - /// - /// 表单页 - /// - /// [HttpGet] - public ActionResult FormView() + public ActionResult IndexForTeacher() { + var userinfo = LoginUserInfo.Get(); + ViewBag.EmpNo = userinfo.account; return View(); } @@ -76,9 +76,24 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers }; return Success(jsonData); } - + + [HttpGet] + [AjaxOnly] + public ActionResult GetTeacherPageList(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var data = yktStateMentIbll.GetTeacherPageList(paginationobj, queryJson); + var jsonData = new + { + rows = data, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records + }; + return Success(jsonData); + } #endregion - + } } 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 80d18c82b..e1f3a62c7 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 @@ -120,7 +120,7 @@ var bootstrap = function ($, learun) { { 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: "MONEY", width: 100, align: "left", statistics: true }, //{ label: "余额", name: "BALANCE", width: 100, align: "left" }, { label: "发生时间", name: "HAPPENTIME", width: 120, align: "left" }, { label: "科目", name: "SUBJECT", width: 100, 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 cd044def1..892f1b6dd 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 @@ -60,7 +60,7 @@ var bootstrap = function ($, learun) { { 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: "MONEY", width: 100, align: "left", statistics: true }, //{ label: "余额", name: "BALANCE", width: 100, align: "left" }, { label: "发生时间", name: "HAPPENTIME", width: 120, align: "left" }, { label: "科目", name: "SUBJECT", width: 100, align: "left" }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/YKTStateMent/IndexForTeacher.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/YKTStateMent/IndexForTeacher.cshtml new file mode 100644 index 000000000..3df3cc296 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/YKTStateMent/IndexForTeacher.cshtml @@ -0,0 +1,27 @@ +@{ + ViewBag.Title = "宿舍调换申请"; + Layout = "~/Views/Shared/_Index.cshtml"; +} + +
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/YKTStateMent/IndexForTeacher.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/YKTStateMent/IndexForTeacher.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/YKTStateMent/IndexForTeacher.js new file mode 100644 index 000000000..7c8f07d8e --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/YKTStateMent/IndexForTeacher.js @@ -0,0 +1,85 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2022-07-11 14:34 + * 描 述：宿舍调换申请 + */ +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') }, 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, + premShow: false, + // 季度 + jShow: false, + prejShow: false, + // 年 + ysShow: false, + yxShow: false, + preyShow: false, + yShow: false, + // 默认 + dfvalue: '2', + selectfn: function (begin, end) { + startTime = begin; + endTime = end; + page.search(); + } + }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + + }, + // 初始化列表 + initGird: function () { + $('#gridtable').jfGrid({ + url: top.$.rootUrl + '/EducationalAdministration/YKTStateMent/GetTeacherPageList', + headData: [ + { label: "一卡通账号", name: "YKTNO", width: 100, align: "left" }, + { label: "教职工号", name: "EmpNo", width: 100, align: "left" }, + { label: "姓名", name: "EmpName", width: 100, align: "left" }, + { label: "部门", name: "DepartmentName", width: 100, align: "left" }, + { label: "身份证号", name: "IdentityCardNo", width: 150, align: "left" }, + { label: "消费金额", name: "MONEY", width: 100, align: "left", statistics: true }, + //{ 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" } + ], + sidx: 'A.OPDT', + sord: 'desc', + isPage: true + }); + //page.search(); + }, + search: function (param) { + param = param || {}; + param.StartDate = startTime; + param.EndDate = endTime; + param.EmpNo = EmpNo; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + page.search(); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/YKTStateMent/ManageIndexTeacher.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/YKTStateMent/ManageIndexTeacher.cshtml new file mode 100644 index 000000000..6c746f32b --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/YKTStateMent/ManageIndexTeacher.cshtml @@ -0,0 +1,46 @@ +@{ + ViewBag.Title = "宿舍调换申请"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
+
+
+
+
+
+
+
+
+
一卡通账号
+ +
+
+
教职工号
+ +
+
+
姓名
+ +
+
+
部门
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/YKTStateMent/ManageIndexTeacher.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/YKTStateMent/ManageIndexTeacher.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/YKTStateMent/ManageIndexTeacher.js new file mode 100644 index 000000000..9d370191f --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/YKTStateMent/ManageIndexTeacher.js @@ -0,0 +1,88 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2022-07-11 14:34 + * 描 述：宿舍调换申请 + */ +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') }, 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, + premShow: false, + // 季度 + jShow: false, + prejShow: false, + // 年 + ysShow: false, + yxShow: false, + preyShow: false, + yShow: false, + // 默认 + dfvalue: '2', + 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(); + }); + $('#DepartmentId').lrDepartmentSelect({ type:'tree'}); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').jfGrid({ + url: top.$.rootUrl + '/EducationalAdministration/YKTStateMent/GetTeacherPageList', + headData: [ + { label: "一卡通账号", name: "YKTNO", width: 100, align: "left" }, + { label: "教职工号", name: "EmpNo", width: 100, align: "left" }, + { label: "姓名", name: "EmpName", width: 100, align: "left" }, + { label: "部门", name: "DepartmentName", width: 100, align: "left" }, + { label: "身份证号", name: "IdentityCardNo", width: 150, align: "left" }, + { label: "消费金额", name: "MONEY", width: 100, align: "left", statistics:true }, + //{ 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" } + ], + //mainId: 'AId', + sidx: 'A.OPDT', + sord: 'desc', + isPage: true + }); + //page.search(); + }, + search: function (param) { + param = param || {}; + param.StartDate = startTime; + param.EndDate = endTime; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + page.search(); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/LR_OA_NewsReadController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/LR_OA_NewsReadController.cs index 06ce7b9b9..bc566a4eb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/LR_OA_NewsReadController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/LR_OA_NewsReadController.cs @@ -18,6 +18,7 @@ namespace Learun.Application.Web.Areas.LR_Desktop.Controllers public class LR_OA_NewsReadController : MvcControllerBase { private LR_OA_NewsReadIBLL lR_OA_NewsReadIBLL = new LR_OA_NewsReadBLL(); + private MessageRindIBLL messageRindIBLL = new MessageRindBLL(); #region 视图功能 @@ -156,6 +157,16 @@ namespace Learun.Application.Web.Areas.LR_Desktop.Controllers //修改当前通知公告的浏览量 lR_OA_NewsReadIBLL.UpdateNewsPV(newsId); } + //判断消息提醒表中的消息是否已读 + var mrentity = messageRindIBLL.GetMessageRemindEntityByInstanceId(newsId, loginUserInfo.userId); + if (mrentity != null) + { + if (!mrentity.ReadSigns.HasValue || mrentity.ReadSigns.Value != true) + { + //修改消息为已读 + messageRindIBLL.SaveReadSigns(mrentity.MessageId); + } + } return Success("阅读成功！"); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/MessageRindController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/MessageRindController.cs index 80bade281..31ef71198 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/MessageRindController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/MessageRindController.cs @@ -182,6 +182,23 @@ namespace Learun.Application.Web.Areas.LR_Desktop.Controllers return Success("保存成功！"); } + /// + /// 更改状态为已读 + /// + /// 主键 + /// + [HttpPost] + [AjaxOnly] + public ActionResult SaveReadSignsByUserId() + { + var loginUserInfo = LoginUserInfo.Get(); + if (!string.IsNullOrEmpty(loginUserInfo.userId)) + { + messageRindIBLL.SaveReadSignsByUserId(loginUserInfo.userId); + } + return Success("保存成功！"); + } + #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/MessageRind/UnreadIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/MessageRind/UnreadIndex.cshtml index c970e5dc8..d116ad82d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/MessageRind/UnreadIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/MessageRind/UnreadIndex.cshtml @@ -25,9 +25,20 @@ "/Views/LR_Content/style/lr-iframe-index.css", "~/Content/jquery/plugin/toastr/toastr.css" ) - + +
全部已读
@@ -39,7 +50,7 @@ "~/Areas/LR_Desktop/Views/MessageRind/Index.js" ) - + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/AnnexesController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/AnnexesController.cs index 918e5e506..f2f8dee9d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/AnnexesController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/AnnexesController.cs @@ -1,6 +1,7 @@ using Learun.Application.Base.SystemModule; using Learun.Application.OA.File.FilePreview; using Learun.Util; +using Quanjiang.DigitalSchool.AsposeHelper; using System.Web; using System.Web.Mvc; @@ -195,7 +196,8 @@ namespace Learun.Application.Web.Areas.LR_SystemModule.Controllers filepath = filepath.Substring(0, filepath.LastIndexOf(".")) + ".pdf";//文件名 if (!DirFileHelper.IsExistFile(filepath)) { - filePreviewIBLL.GetExcelData(data.F_FilePath); + AsposeCore.GetExcelData(data.F_FilePath); + //filePreviewIBLL.GetExcelData(data.F_FilePath); } } if (data.F_FileType == "docx" || data.F_FileType == "doc") @@ -203,7 +205,8 @@ namespace Learun.Application.Web.Areas.LR_SystemModule.Controllers filepath = filepath.Substring(0, filepath.LastIndexOf(".")) + ".pdf";//文件名 if (!DirFileHelper.IsExistFile(filepath)) { - filePreviewIBLL.GetWordData(data.F_FilePath); + AsposeCore.GetWordData(data.F_FilePath); + //filePreviewIBLL.GetWordData(data.F_FilePath); } } if (data.F_FileType == "ppt" || data.F_FileType == "pptx") @@ -211,7 +214,8 @@ namespace Learun.Application.Web.Areas.LR_SystemModule.Controllers filepath = filepath.Substring(0, filepath.LastIndexOf(".")) + ".pdf";//文件名 if (!DirFileHelper.IsExistFile(filepath)) { - filePreviewIBLL.GetPptData(data.F_FilePath); + AsposeCore.GetWordData(data.F_FilePath); + //filePreviewIBLL.GetPptData(data.F_FilePath); } } Response.ClearContent(); @@ -264,6 +268,7 @@ namespace Learun.Application.Web.Areas.LR_SystemModule.Controllers break; } Response.Charset = "GB2312"; + Response.Charset = "utf-8"; //修改txt文件预览乱码 Response.WriteFile(filepath); //Response.BinaryWrite(ms.ToArray()); } 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/Areas/PersonnelManagement/Controllers/TimeTableController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TimeTableController.cs index f358e03d9..55fc52ecc 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TimeTableController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TimeTableController.cs @@ -245,43 +245,43 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers } var leaveList = stuAttendanceLeaveIBLL.GetList(); var formatData = from d in timeTables - let tt = d.LessonTime.Substring(1) - group d by tt into g - orderby g.Key - select new - { - time = g.Key, - list = from e in timeTables - let ee = e.LessonTime.Substring(1) - where ee == g.Key - select new - { - day = e.LessonTime.ToCharArray()[0], - curriculum = string.IsNullOrEmpty(e.EnName) ? (e.LessonSortNo == "2" ? e.LessonName + "[选修]" : e.LessonName) : (e.LessonSortNo == "2" ? e.EnName + "[选修]" : e.EnName), - lessonName = e.LessonName, - teacher = e.EmpName, - classRoom = e.ClassroomName?.Trim(), - academicyear = semesterAndYear.AcademicYearShort, - semester = strSemester, - lessonNo = e?.LessonNo, - teachClassNo = e?.TeachClassNo, - empno = e?.EmpNo, - lessonTime = e.LessonTime, - lessonDate = e.LessonDate.ToString("yyyy-MM-dd"), - classRoomNo = e?.ClassRoomNo.Trim(), - lessonSortNo = e.LessonSortNo, - e.OLPEId, - className = string.IsNullOrEmpty(e.ClassName) ? "" : e.ClassName, - leaveType = leaveList.Any(c => c.LessonNo == e.LessonNo && c.StuNo == userInfo.account && c.LessonDate == e.LessonDate && c.LessonTime == e.LessonTime) ? 1 : 0, - checkType = leaveList.FirstOrDefault(c => c.LessonNo == e.LessonNo && c.StuNo == userInfo.account && c.LessonDate == e.LessonDate && c.LessonTime == e.LessonTime)?.IsCheck, - - } - } + let tt = d.LessonTime.Substring(1) + group d by tt into g + orderby g.Key + select new + { + time = g.Key, + list = from e in timeTables + let ee = e.LessonTime.Substring(1) + where ee == g.Key + select new + { + day = e.LessonTime.ToCharArray()[0], + curriculum = string.IsNullOrEmpty(e.EnName) ? (e.LessonSortNo == "2" ? e.LessonName + "[选修]" : e.LessonName) : (e.LessonSortNo == "2" ? e.EnName + "[选修]" : e.EnName), + lessonName = e.LessonName, + teacher = e.EmpName, + classRoom = e.ClassroomName?.Trim(), + academicyear = semesterAndYear.AcademicYearShort, + semester = strSemester, + lessonNo = e?.LessonNo, + teachClassNo = e?.TeachClassNo, + empno = e?.EmpNo, + lessonTime = e.LessonTime, + lessonDate = e.LessonDate.ToString("yyyy-MM-dd"), + classRoomNo = e?.ClassRoomNo.Trim(), + lessonSortNo = e.LessonSortNo, + e.OLPEId, + className = string.IsNullOrEmpty(e.ClassName) ? "" : e.ClassName, + leaveType = leaveList.Any(c => c.LessonNo == e.LessonNo && c.StuNo == userInfo.account && c.LessonDate == e.LessonDate && c.LessonTime == e.LessonTime) ? 1 : 0, + checkType = leaveList.FirstOrDefault(c => c.LessonNo == e.LessonNo && c.StuNo == userInfo.account && c.LessonDate == e.LessonDate && c.LessonTime == e.LessonTime)?.IsCheck, + + } + } ; - // var leaveList = stuAttendanceLeaveIBLL.GetList(); + // var leaveList = stuAttendanceLeaveIBLL.GetList(); //var formatData = timeTables.OrderBy(a => a.LessonTime.Substring(1)) // .Select(a => new // { @@ -327,7 +327,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers /// [HttpGet] [AjaxOnly] - public ActionResult GetDataInEducation(string startTime, string endTime, string classNo, string empNo, string schoolId) + public ActionResult GetDataInEducation(string startTime, string endTime, string classNo, string empNo, string schoolId, string classroomNo) { var userInfo = LoginUserInfo.Get(); //开始时间 @@ -341,7 +341,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers var timeTableList = new List(); //课程表 - var data = arrangeLessonTermIBLL.GetTimeTableInEducation(startDate, endDate, classNo, empNo, schoolId); + var data = arrangeLessonTermIBLL.GetTimeTableInEducation(startDate, endDate, classNo, empNo, schoolId, classroomNo); timeTableList.AddRange(data); //选修课课程表 //20220718因 更改教务课表显示格式为班级作为列头，选修课无班级所以不能显示在课表内 @@ -356,9 +356,9 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers return JsonResult(noDataResult); } //最大节次 - int maxlessontime = timeTables.Max(m =>Convert.ToInt32(m.LessonTime.Substring(1))); + int maxlessontime = timeTables.Max(m => Convert.ToInt32(m.LessonTime.Substring(1))); //班级列表 - var classinfolist = timeTables.Select(m => new { m.TeachClassNo, m.ClassName}).OrderBy(m => m.TeachClassNo).GroupBy(m=>new {m.TeachClassNo,m.ClassName}); + var classinfolist = timeTables.Select(m => new { m.TeachClassNo, m.ClassName }).OrderBy(m => m.TeachClassNo).GroupBy(m => new { m.TeachClassNo, m.ClassName }); var formatData = from d in timeTables let tt = d.LessonTime.Substring(1) group d by tt into g @@ -415,7 +415,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers var timeTableList = new List(); //课程表 - var data = arrangeLessonTermIBLL.GetTimeTableInEducation(startDate, endDate, classNo, empNo, schoolId); + var data = arrangeLessonTermIBLL.GetTimeTableInEducation(startDate, endDate, classNo, empNo, schoolId, ""); timeTableList.AddRange(data); //选修课课程表 //var dataOfElective = arrangeLessonTermOfElectiveIBLL.GetTimeTableInEducation(startDate, endDate, classNo, empNo, schoolId); @@ -492,6 +492,19 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers return Success(data); } + /// + /// 课程表【教务】--教室下拉框信息 + /// + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetClassroomData(string schoolId = "") + { + var data = arrangeLessonTermIBLL.GetClassroomData(schoolId); + + return Success(data); + } + /// /// 表单--修改教师所带的课程【教务】--课程下拉框信息 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/IndexInEducation.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/IndexInEducation.cshtml index 8a0985ea9..3b82817c5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/IndexInEducation.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/IndexInEducation.cshtml @@ -123,6 +123,9 @@
+
+
+
查询
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/IndexInEducation.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/IndexInEducation.js index 20482e409..3d1c660bb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/IndexInEducation.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/IndexInEducation.js @@ -153,6 +153,7 @@ var bootstrap = function ($, learun) { p.schoolId = $('#F_SchoolId').lrselectGet(); p.ClassNo = $('#ClassNo').lrselectGet(); p.EmpNo = $('#EmpNo').lrselectGet(); + p.ClassroomNo = $('#ClassroomNo').lrselectGet(); page.search(p); }); // 按条件清空排课数据 @@ -284,6 +285,14 @@ var bootstrap = function ($, learun) { value: 'value', text: 'text' }); + //教室 + $('#ClassroomNo').lrselect({ + placeholder: "请选择教室", + allowSearch: true, + url: top.$.rootUrl + '/PersonnelManagement/TimeTable/GetClassroomData', + value: 'value', + text: 'text' + }); }, search: function (param) { param = param || {}; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Global.asax.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Global.asax.cs index c34761de8..635751398 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Global.asax.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Global.asax.cs @@ -6,6 +6,7 @@ using System.Web.Routing; using Hangfire; using Learun.Application.Extention.TaskScheduling; using Learun.Application.WorkFlow; +using Quanjiang.DigitalSchool.AsposeHelper; namespace Learun.Application.Web { @@ -37,6 +38,8 @@ namespace Learun.Application.Web //cache.RemoveAll(6); WfJobScheduler.Start(); QuartzHelper.InitJob(); + //执行aspose初始化 + AsposeCore.AsposeCoreInit(); } /// 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 eba9d14cc..e6f489162 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 @@ -990,6 +990,8 @@ + + @@ -1393,6 +1395,8 @@ + + @@ -7184,6 +7188,10 @@ {4D841EAD-3FD8-4FAC-BC67-C4CE6C0D1181} Quanjiang.DigitalScholl.WebLicense + + {767d20c4-b983-4940-bf97-74d5479ca558} + Quanjiang.DigitalSchool.Aspose + @@ -8048,6 +8056,10 @@ + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragNoLogin.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragNoLogin.cshtml index 68a323aa5..fa280c492 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragNoLogin.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragNoLogin.cshtml @@ -1060,118 +1060,118 @@ @**@ @**@ - + + 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.Application.WebApi/Modules/TimeTable.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TimeTable.cs index 075f29f3d..b92d60748 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TimeTable.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TimeTable.cs @@ -112,13 +112,13 @@ namespace Learun.Application.WebApi.Modules } - + /// /// 全院课程表【按班级分组】 /// /// /// - + private Response GetTimeTableData(dynamic _) { var param = this.GetReq(); @@ -139,7 +139,7 @@ namespace Learun.Application.WebApi.Modules //课程表数据 var timeTableList = new List(); //必修课课程表 - var data = arrangeLessonTermIBLL.GetTimeTableInEducation(startDate, endDate, param.ClassNo, param.EmpNo, ""); + var data = arrangeLessonTermIBLL.GetTimeTableInEducation(startDate, endDate, param.ClassNo, param.EmpNo, "", ""); timeTableList.AddRange(data); //选修课课程表 var dataOfElective = arrangeLessonTermOfElectiveIBLL.GetTimeTableInEducation(startDate, endDate, param.ClassNo, param.EmpNo, ""); @@ -171,7 +171,7 @@ namespace Learun.Application.WebApi.Modules }).OrderBy(x => x.LessonSortNo).ThenBy(x => x.ClassNo).ToList(); result.ClassDataList = dataTemp; - + return Success(result); } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermBLL.cs index d3c1b684a..7b105a54f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermBLL.cs @@ -437,12 +437,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 查询截止时间 /// 班级编号 /// 教师编号 + /// 教室编号 /// - public IEnumerable GetTimeTableInEducation(string startDate, string endDate, string classNo, string empNo, string schoolId) + public IEnumerable GetTimeTableInEducation(string startDate, string endDate, string classNo, string empNo, string schoolId, string classroomNo) { try { - return arrangeLessonTermService.GetTimeTableInEducation(startDate, endDate, classNo, empNo, schoolId); + return arrangeLessonTermService.GetTimeTableInEducation(startDate, endDate, classNo, empNo, schoolId, classroomNo); } catch (Exception ex) { @@ -504,6 +505,29 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + /// + /// 课程表【教务】--教室下拉框信息 + /// + /// + public IEnumerable GetClassroomData(string schoolId) + { + try + { + return arrangeLessonTermService.GetClassroomData(schoolId); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + /// /// 教学调度【教务】--课程下拉框信息 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermIBLL.cs index 0e921fd08..83ae4c390 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermIBLL.cs @@ -105,8 +105,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 查询截止时间 /// 班级编号 /// 教师编号 + /// 教室编号 /// - IEnumerable GetTimeTableInEducation(string startDate, string endDate, string classNo, string empNo, string schoolId); + IEnumerable GetTimeTableInEducation(string startDate, string endDate, string classNo, string empNo, string schoolId, string classroomNo); /// /// 课程表【教务】--班级下拉框信息 @@ -120,6 +121,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// IEnumerable GetTeacherData(string schoolId); + + /// + /// 课程表【教务】--教室下拉框信息 + /// + /// + IEnumerable GetClassroomData(string schoolId); bool GetAny(); IEnumerable GetDepts(string academicYearNo, string semester); IEnumerable GetDeptsNotRecord(string academicYearNo, string semester); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs index 5b013db55..ec7ee51f3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs @@ -307,7 +307,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// public IEnumerable AttendanceStudents(Pagination pagination, string queryJson) - { + { try { var queryParam = queryJson.ToJObject(); @@ -1593,8 +1593,9 @@ group by AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les /// 查询截止时间 /// 班级编号 /// 教师编号 + /// 教室编号 /// - public IEnumerable GetTimeTableInEducation(string startDate, string endDate, string classNo, string empNo, string schoolId) + public IEnumerable GetTimeTableInEducation(string startDate, string endDate, string classNo, string empNo, string schoolId, string classroomNo) { var semesterAndYear = Common.GetSemesterAndYear(startDate); var strAcademicYear = semesterAndYear.AcademicYearShort; @@ -1621,6 +1622,10 @@ group by AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les { result = result.Where(x => x.F_SchoolId == schoolId); } + if (!string.IsNullOrEmpty(classroomNo)) + { + result = result.Where(x => x.ClassRoomNo == classroomNo); + } return result; } catch (Exception ex) @@ -1644,9 +1649,9 @@ group by AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les { try { - //前三年-后三年 - var preYear = DateTime.Now.AddYears(-3).Year; - var nextYear = DateTime.Now.AddYears(3).Year; + //前五年-后五年 + var preYear = DateTime.Now.AddYears(-5).Year; + var nextYear = DateTime.Now.AddYears(5).Year; var yearList = new List(); for (int i = preYear; i <= nextYear; i++) { @@ -1688,9 +1693,9 @@ group by AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les { try { - //前三年-后三年 - var preYear = DateTime.Now.AddYears(-3).Year; - var nextYear = DateTime.Now.AddYears(3).Year; + //前五年-后五年 + var preYear = DateTime.Now.AddYears(-5).Year; + var nextYear = DateTime.Now.AddYears(5).Year; var yearList = new List(); for (int i = preYear; i <= nextYear; i++) { @@ -1746,6 +1751,49 @@ group by AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les } } + /// + /// 课程表【教务】--教室下拉框信息 + /// + /// + public IEnumerable GetClassroomData(string schoolId) + { + try + { + //前五年-后五年 + var preYear = DateTime.Now.AddYears(-5).Year; + var nextYear = DateTime.Now.AddYears(5).Year; + var yearList = new List(); + for (int i = preYear; i <= nextYear; i++) + { + yearList.Add(string.Format("'{0}-{1}'", i.ToString().Substring(2), (i + 1).ToString().Substring(2))); + } + var yearListStr = string.Join(",", yearList.ToArray()); + + var strSql = new StringBuilder(); + strSql.Append("select distinct a.ClassroomNo as value,c.ClassroomName as text from "); + strSql.Append("ArrangeLessonTerm a inner join ClassroomInfo c on a.ClassroomNo=c.ClassroomNo "); + strSql.Append("where a.AcademicYearNo in (" + yearListStr + ") "); + if (!string.IsNullOrEmpty(schoolId)) + { + strSql.Append(" and a.F_SchoolId = '" + schoolId + "' "); + } + + var result = this.BaseRepository("CollegeMIS").FindList(strSql.ToString()).OrderBy(x => x.value); + return result; + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + public IEnumerable GetDepts(string academicYearNo, string semester) { try diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/YKTStateMent/YKTStateMentBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/YKTStateMent/YKTStateMentBLL.cs index a84a730a6..2c8562094 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/YKTStateMent/YKTStateMentBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/YKTStateMent/YKTStateMentBLL.cs @@ -42,9 +42,28 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } } - + + public IEnumerable GetTeacherPageList(Pagination pagination, string queryJson) + { + try + { + return yKTStateMentService.GetTeacherPageList(pagination, queryJson); + } + 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/YKTStateMent/YKTStateMentEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/YKTStateMent/YKTStateMentEntity.cs index a94b1e8b9..7975449fc 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 @@ -52,6 +52,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration public string IdentityCardNo { get; set; } public string mobile { get; set; } + public string EmpNo { get; set; } + public string EmpName { get; set; } + public string DepartmentName { get; set; } + #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/YKTStateMent/YKTStateMentIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/YKTStateMent/YKTStateMentIBLL.cs index 671f9f2c1..234331c75 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/YKTStateMent/YKTStateMentIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/YKTStateMent/YKTStateMentIBLL.cs @@ -22,9 +22,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 查询参数 /// IEnumerable GetPageList(Pagination pagination, string queryJson); - + + IEnumerable GetTeacherPageList(Pagination pagination, string queryJson); + #endregion - + } } 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 8462a79a1..a7403e2cd 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 @@ -79,6 +79,54 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + public IEnumerable GetTeacherPageList(Pagination pagination, string queryJson) + { + try + { + 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.EmpNo,c.EmpName,d.Name as DepartmentName,c.identityno as IdentityCardNo + FROM M_REC_CONSUME@ykt A LEFT JOIN M_BASE_TERM@ykt B ON A.TERMID = B.TERMID + left join ds_empinfo C on A.OUTID = C.mobile + left join ds_department d on c.departmentid=d.id + where 1=1 and EmpNo is not null"); + if (!queryParam["EmpNo"].IsEmpty()) + { + strSql.Append($" AND C.EmpNo like '%{queryParam["EmpNo"].ToString()}%' "); + } + if (!queryParam["EmpName"].IsEmpty()) + { + strSql.Append($" AND C.EmpName like '%{queryParam["EmpName"].ToString()}%' "); + } + if (!queryParam["DepartmentId"].IsEmpty()) + { + strSql.Append($" AND C.DepartmentId='{queryParam["DepartmentId"].ToString()}' "); + } + if (!queryParam["YKTNO"].IsEmpty()) + { + strSql.Append($" AND a.CUSTOMERID like '%{queryParam["CUSTOMERID"].ToString()}%' "); + } + 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 hh24:mi:ss'))"); + } + + return BaseRepository("TLMZYMIDDLEString").FindList(strSql.ToString(), pagination); + } + 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/LR_Desktop/MessageRind/MessageRindBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/MessageRind/MessageRindBLL.cs index 0b332ac33..d830bf53b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/MessageRind/MessageRindBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/MessageRind/MessageRindBLL.cs @@ -66,7 +66,7 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop } } - + /// /// 未读消息的数量 /// @@ -114,6 +114,29 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop } } + /// + /// 获取MessageRemind表实体数据 + /// + /// 主键 + /// + public MessageRemindEntity GetMessageRemindEntityByInstanceId(string InstanceId, string userId) + { + try + { + return messageRindService.GetMessageRemindEntityByInstanceId(InstanceId, userId); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } #endregion #region 提交数据 @@ -188,6 +211,30 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop } } } + + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + public void SaveReadSignsByUserId(string userId) + { + try + { + messageRindService.SaveReadSignsByUserId(userId); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/MessageRind/MessageRindIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/MessageRind/MessageRindIBLL.cs index ea552d6ee..8ab0be41b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/MessageRind/MessageRindIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/MessageRind/MessageRindIBLL.cs @@ -37,6 +37,13 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop /// 主键 /// MessageRemindEntity GetMessageRemindEntity(string keyValue); + + /// + /// 获取MessageRemind表实体数据 + /// + /// 主键 + /// + MessageRemindEntity GetMessageRemindEntityByInstanceId(string InstanceId, string userId); #endregion #region 提交数据 @@ -57,6 +64,12 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop /// /// void SaveReadSigns(string keyValue); + + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + void SaveReadSignsByUserId(string userId); #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/MessageRind/MessageRindService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/MessageRind/MessageRindService.cs index 58bc868d3..a0ff983cf 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/MessageRind/MessageRindService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/MessageRind/MessageRindService.cs @@ -141,6 +141,30 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop } } + /// + /// 获取MessageRemind表实体数据 + /// + /// 主键 + /// + public MessageRemindEntity GetMessageRemindEntityByInstanceId(string InstanceId, string userId) + { + try + { + return this.BaseRepository().FindEntity(x => x.InstanceId == InstanceId && x.ReceiptId == userId); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + #endregion #region 提交数据 @@ -230,6 +254,31 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop } } } + + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + public void SaveReadSignsByUserId(string userId) + { + try + { + string sql = $"update MessageRemind set ReadSigns=1 where ReceiptId='{userId}' and ReadSigns<>1 "; + this.BaseRepository().ExecuteBySql(sql); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/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表实体数据 /// 主键 diff --git a/Learun.Framework.Ultimate V7/Quanjiang.DigitalSchool.Aspose/AsposeCore.cs b/Learun.Framework.Ultimate V7/Quanjiang.DigitalSchool.Aspose/AsposeCore.cs new file mode 100644 index 000000000..c57845ca5 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Quanjiang.DigitalSchool.Aspose/AsposeCore.cs @@ -0,0 +1,60 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Aspose.Cells; +using Aspose.Words; +using Learun.Util; +using SaveFormat = Aspose.Words.SaveFormat; + +namespace Quanjiang.DigitalSchool.AsposeHelper +{ + public class AsposeCore + { + public static void AsposeCoreInit() + { + new Aspose.Words.License().SetLicense(new MemoryStream(Convert.FromBase64String("PExpY2Vuc2U+CiAgPERhdGE+CiAgICA8TGljZW5zZWRUbz5TdXpob3UgQXVuYm94IFNvZnR3YXJlIENvLiwgTHRkLjwvTGljZW5zZWRUbz4KICAgIDxFbWFpbFRvPnNhbGVzQGF1bnRlYy5jb208L0VtYWlsVG8+CiAgICA8TGljZW5zZVR5cGU+RGV2ZWxvcGVyIE9FTTwvTGljZW5zZVR5cGU+CiAgICA8TGljZW5zZU5vdGU+TGltaXRlZCB0byAxIGRldmVsb3BlciwgdW5saW1pdGVkIHBoeXNpY2FsIGxvY2F0aW9uczwvTGljZW5zZU5vdGU+CiAgICA8T3JkZXJJRD4yMDA2MDIwMTI2MzM8L09yZGVySUQ+CiAgICA8VXNlcklEPjEzNDk3NjAwNjwvVXNlcklEPgogICAgPE9FTT5UaGlzIGlzIGEgcmVkaXN0cmlidXRhYmxlIGxpY2Vuc2U8L09FTT4KICAgIDxQcm9kdWN0cz4KICAgICAgPFByb2R1Y3Q+QXNwb3NlLlRvdGFsIGZvciAuTkVUPC9Qcm9kdWN0PgogICAgPC9Qcm9kdWN0cz4KICAgIDxFZGl0aW9uVHlwZT5FbnRlcnByaXNlPC9FZGl0aW9uVHlwZT4KICAgIDxTZXJpYWxOdW1iZXI+OTM2ZTVmZDEtODY2Mi00YWJmLTk1YmQtYzhkYzBmNTNhZmE2PC9TZXJpYWxOdW1iZXI+CiAgICA8U3Vic2NyaXB0aW9uRXhwaXJ5PjIwMjEwODI3PC9TdWJzY3JpcHRpb25FeHBpcnk+CiAgICA8TGljZW5zZVZlcnNpb24+My4wPC9MaWNlbnNlVmVyc2lvbj4KICAgIDxMaWNlbnNlSW5zdHJ1Y3Rpb25zPmh0dHBzOi8vcHVyY2hhc2UuYXNwb3NlLmNvbS9wb2xpY2llcy91c2UtbGljZW5zZTwvTGljZW5zZUluc3RydWN0aW9ucz4KICA8L0RhdGE+CiAgPFNpZ25hdHVyZT5wSkpjQndRdnYxV1NxZ1kyOHFJYUFKSysvTFFVWWRrQ2x5THE2RUNLU0xDQ3dMNkEwMkJFTnh5L3JzQ1V3UExXbjV2bTl0TDRQRXE1aFAzY2s0WnhEejFiK1JIWTBuQkh1SEhBY01TL1BSeEJES0NGbWg1QVFZRTlrT0FxSzM5NVBSWmJRSGowOUNGTElVUzBMdnRmVkp5cUhjblJvU3dPQnVqT1oyeDc4WFE9PC9TaWduYXR1cmU+CjwvTGljZW5zZT4="))); + new Aspose.Cells.License().SetLicense(new MemoryStream(Convert.FromBase64String("PExpY2Vuc2U+CiAgPERhdGE+CiAgICA8TGljZW5zZWRUbz5TdXpob3UgQXVuYm94IFNvZnR3YXJlIENvLiwgTHRkLjwvTGljZW5zZWRUbz4KICAgIDxFbWFpbFRvPnNhbGVzQGF1bnRlYy5jb208L0VtYWlsVG8+CiAgICA8TGljZW5zZVR5cGU+RGV2ZWxvcGVyIE9FTTwvTGljZW5zZVR5cGU+CiAgICA8TGljZW5zZU5vdGU+TGltaXRlZCB0byAxIGRldmVsb3BlciwgdW5saW1pdGVkIHBoeXNpY2FsIGxvY2F0aW9uczwvTGljZW5zZU5vdGU+CiAgICA8T3JkZXJJRD4yMDA2MDIwMTI2MzM8L09yZGVySUQ+CiAgICA8VXNlcklEPjEzNDk3NjAwNjwvVXNlcklEPgogICAgPE9FTT5UaGlzIGlzIGEgcmVkaXN0cmlidXRhYmxlIGxpY2Vuc2U8L09FTT4KICAgIDxQcm9kdWN0cz4KICAgICAgPFByb2R1Y3Q+QXNwb3NlLlRvdGFsIGZvciAuTkVUPC9Qcm9kdWN0PgogICAgPC9Qcm9kdWN0cz4KICAgIDxFZGl0aW9uVHlwZT5FbnRlcnByaXNlPC9FZGl0aW9uVHlwZT4KICAgIDxTZXJpYWxOdW1iZXI+OTM2ZTVmZDEtODY2Mi00YWJmLTk1YmQtYzhkYzBmNTNhZmE2PC9TZXJpYWxOdW1iZXI+CiAgICA8U3Vic2NyaXB0aW9uRXhwaXJ5PjIwMjEwODI3PC9TdWJzY3JpcHRpb25FeHBpcnk+CiAgICA8TGljZW5zZVZlcnNpb24+My4wPC9MaWNlbnNlVmVyc2lvbj4KICAgIDxMaWNlbnNlSW5zdHJ1Y3Rpb25zPmh0dHBzOi8vcHVyY2hhc2UuYXNwb3NlLmNvbS9wb2xpY2llcy91c2UtbGljZW5zZTwvTGljZW5zZUluc3RydWN0aW9ucz4KICA8L0RhdGE+CiAgPFNpZ25hdHVyZT5wSkpjQndRdnYxV1NxZ1kyOHFJYUFKSysvTFFVWWRrQ2x5THE2RUNLU0xDQ3dMNkEwMkJFTnh5L3JzQ1V3UExXbjV2bTl0TDRQRXE1aFAzY2s0WnhEejFiK1JIWTBuQkh1SEhBY01TL1BSeEJES0NGbWg1QVFZRTlrT0FxSzM5NVBSWmJRSGowOUNGTElVUzBMdnRmVkp5cUhjblJvU3dPQnVqT1oyeDc4WFE9PC9TaWduYXR1cmU+CjwvTGljZW5zZT4="))); + } + public static void GetWordData(string path) + { + try + { + Document document = new Document(path); + document.Save(path.Substring(0, path.LastIndexOf(".")) + ".pdf",SaveFormat.Pdf); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + public static void GetExcelData(string path) + { + try + { + Workbook document = new Workbook(path); + document.Save(path.Substring(0, path.LastIndexOf(".")) + ".pdf", Aspose.Cells.SaveFormat.Pdf); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + } +} diff --git a/Learun.Framework.Ultimate V7/Quanjiang.DigitalSchool.Aspose/Properties/AssemblyInfo.cs b/Learun.Framework.Ultimate V7/Quanjiang.DigitalSchool.Aspose/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..48eda7b36 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Quanjiang.DigitalSchool.Aspose/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// 有关程序集的一般信息由以下 +// 控制。更改这些特性值可修改 +// 与程序集关联的信息。 +[assembly: AssemblyTitle("Quanjiang.DigitalSchool.Aspose")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Quanjiang.DigitalSchool.Aspose")] +[assembly: AssemblyCopyright("Copyright © 2021")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// 将 ComVisible 设置为 false 会使此程序集中的类型 +//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型 +//请将此类型的 ComVisible 特性设置为 true。 +[assembly: ComVisible(false)] + +// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID +[assembly: Guid("767d20c4-b983-4940-bf97-74d5479ca558")] + +// 程序集的版本信息由下列四个值组成: +// +// 主版本 +// 次版本 +// 生成号 +// 修订号 +// +// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号 +//通过使用 "*"，如下所示: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Learun.Framework.Ultimate V7/Quanjiang.DigitalSchool.Aspose/Quanjiang.DigitalSchool.Aspose.csproj b/Learun.Framework.Ultimate V7/Quanjiang.DigitalSchool.Aspose/Quanjiang.DigitalSchool.Aspose.csproj index 2053b563a..abd9a6972 100644 --- a/Learun.Framework.Ultimate V7/Quanjiang.DigitalSchool.Aspose/Quanjiang.DigitalSchool.Aspose.csproj +++ b/Learun.Framework.Ultimate V7/Quanjiang.DigitalSchool.Aspose/Quanjiang.DigitalSchool.Aspose.csproj @@ -55,7 +55,6 @@ - diff --git a/Learun.Framework.Ultimate V7/Quanjiang.DigitalSchool.Aspose/packages.config b/Learun.Framework.Ultimate V7/Quanjiang.DigitalSchool.Aspose/packages.config new file mode 100644 index 000000000..d427b49bb --- /dev/null +++ b/Learun.Framework.Ultimate V7/Quanjiang.DigitalSchool.Aspose/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/西昌单校区版V3.0.sln b/Learun.Framework.Ultimate V7/西昌单校区版V3.0.sln index 90bfa9f31..51754ad01 100644 --- a/Learun.Framework.Ultimate V7/西昌单校区版V3.0.sln +++ b/Learun.Framework.Ultimate V7/西昌单校区版V3.0.sln @@ -126,6 +126,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Quanjiang.DigitalSchool.IMS EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Quanjiang.DigitalScholl.Tools", "Quanjiang.Application.Tools\Quanjiang.DigitalScholl.Tools.csproj", "{E17E5ACC-AF20-45EB-8A78-6DC07C9E01D0}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Quanjiang.DigitalSchool.Aspose", "Quanjiang.DigitalSchool.Aspose\Quanjiang.DigitalSchool.Aspose.csproj", "{767D20C4-B983-4940-BF97-74D5479CA558}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Android = Debug|Android @@ -1624,6 +1626,42 @@ Global {E17E5ACC-AF20-45EB-8A78-6DC07C9E01D0}.Release|Windows-x64.Build.0 = Release|Any CPU {E17E5ACC-AF20-45EB-8A78-6DC07C9E01D0}.Release|Windows-x86.ActiveCfg = Release|Any CPU {E17E5ACC-AF20-45EB-8A78-6DC07C9E01D0}.Release|Windows-x86.Build.0 = Release|Any CPU + {767D20C4-B983-4940-BF97-74D5479CA558}.Debug|Android.ActiveCfg = Debug|Any CPU + {767D20C4-B983-4940-BF97-74D5479CA558}.Debug|Android.Build.0 = Debug|Any CPU + {767D20C4-B983-4940-BF97-74D5479CA558}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {767D20C4-B983-4940-BF97-74D5479CA558}.Debug|Any CPU.Build.0 = Debug|Any CPU + {767D20C4-B983-4940-BF97-74D5479CA558}.Debug|iOS.ActiveCfg = Debug|Any CPU + {767D20C4-B983-4940-BF97-74D5479CA558}.Debug|iOS.Build.0 = Debug|Any CPU + {767D20C4-B983-4940-BF97-74D5479CA558}.Debug|Windows-ARM.ActiveCfg = Debug|Any CPU + {767D20C4-B983-4940-BF97-74D5479CA558}.Debug|Windows-ARM.Build.0 = Debug|Any CPU + {767D20C4-B983-4940-BF97-74D5479CA558}.Debug|Windows-x64.ActiveCfg = Debug|Any CPU + {767D20C4-B983-4940-BF97-74D5479CA558}.Debug|Windows-x64.Build.0 = Debug|Any CPU + {767D20C4-B983-4940-BF97-74D5479CA558}.Debug|Windows-x86.ActiveCfg = Debug|Any CPU + {767D20C4-B983-4940-BF97-74D5479CA558}.Debug|Windows-x86.Build.0 = Debug|Any CPU + {767D20C4-B983-4940-BF97-74D5479CA558}.Development|Android.ActiveCfg = Debug|Any CPU + {767D20C4-B983-4940-BF97-74D5479CA558}.Development|Android.Build.0 = Debug|Any CPU + {767D20C4-B983-4940-BF97-74D5479CA558}.Development|Any CPU.ActiveCfg = Debug|Any CPU + {767D20C4-B983-4940-BF97-74D5479CA558}.Development|Any CPU.Build.0 = Debug|Any CPU + {767D20C4-B983-4940-BF97-74D5479CA558}.Development|iOS.ActiveCfg = Debug|Any CPU + {767D20C4-B983-4940-BF97-74D5479CA558}.Development|iOS.Build.0 = Debug|Any CPU + {767D20C4-B983-4940-BF97-74D5479CA558}.Development|Windows-ARM.ActiveCfg = Debug|Any CPU + {767D20C4-B983-4940-BF97-74D5479CA558}.Development|Windows-ARM.Build.0 = Debug|Any CPU + {767D20C4-B983-4940-BF97-74D5479CA558}.Development|Windows-x64.ActiveCfg = Debug|Any CPU + {767D20C4-B983-4940-BF97-74D5479CA558}.Development|Windows-x64.Build.0 = Debug|Any CPU + {767D20C4-B983-4940-BF97-74D5479CA558}.Development|Windows-x86.ActiveCfg = Debug|Any CPU + {767D20C4-B983-4940-BF97-74D5479CA558}.Development|Windows-x86.Build.0 = Debug|Any CPU + {767D20C4-B983-4940-BF97-74D5479CA558}.Release|Android.ActiveCfg = Release|Any CPU + {767D20C4-B983-4940-BF97-74D5479CA558}.Release|Android.Build.0 = Release|Any CPU + {767D20C4-B983-4940-BF97-74D5479CA558}.Release|Any CPU.ActiveCfg = Release|Any CPU + {767D20C4-B983-4940-BF97-74D5479CA558}.Release|Any CPU.Build.0 = Release|Any CPU + {767D20C4-B983-4940-BF97-74D5479CA558}.Release|iOS.ActiveCfg = Release|Any CPU + {767D20C4-B983-4940-BF97-74D5479CA558}.Release|iOS.Build.0 = Release|Any CPU + {767D20C4-B983-4940-BF97-74D5479CA558}.Release|Windows-ARM.ActiveCfg = Release|Any CPU + {767D20C4-B983-4940-BF97-74D5479CA558}.Release|Windows-ARM.Build.0 = Release|Any CPU + {767D20C4-B983-4940-BF97-74D5479CA558}.Release|Windows-x64.ActiveCfg = Release|Any CPU + {767D20C4-B983-4940-BF97-74D5479CA558}.Release|Windows-x64.Build.0 = Release|Any CPU + {767D20C4-B983-4940-BF97-74D5479CA558}.Release|Windows-x86.ActiveCfg = Release|Any CPU + {767D20C4-B983-4940-BF97-74D5479CA558}.Release|Windows-x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1675,7 +1713,7 @@ Global {E05A2B9A-A939-450F-9A44-A8B3201D055A} = {ED258CD0-0A0C-490B-9D8F-B4CEC4467251} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - EnterpriseLibraryConfigurationToolBinariesPath = packages\Unity.2.1.505.0\lib\NET35 SolutionGuid = {968C278F-4142-4DFF-96B0-B3D70A649451} + EnterpriseLibraryConfigurationToolBinariesPath = packages\Unity.2.1.505.0\lib\NET35 EndGlobalSection EndGlobal