From 523ffaa7f360f36a4dfc0ac8d6eadd03fbc7d928 Mon Sep 17 00:00:00 2001 From: edy Date: Thu, 19 Aug 2021 09:59:51 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E8=BE=93=E5=85=A5=E5=AD=A6=E7=94=9F?= =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=20=E4=B8=8D=E5=BE=97=E5=B0=91?= =?UTF-8?q?=E4=BA=8E8=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../www/pages/login/IdCardLogin/IdCardLogin.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/login/IdCardLogin/IdCardLogin.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/login/IdCardLogin/IdCardLogin.js index 5c155699d..23b7d9a92 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/login/IdCardLogin/IdCardLogin.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/login/IdCardLogin/IdCardLogin.js @@ -41,7 +41,7 @@ var up = false; if (account === "") { learun.layer.warning('身份证号不能为空！', function () { }, '提示', '关闭'); - }else if(account.length<=6){ + }else if(account.length<=8){ learun.layer.warning('身份证号输入有误！', function () { }, '提示', '关闭'); } else if (password === "") { learun.layer.warning('密码不能为空！', function () { }, '提示', '关闭'); From bdaeecec64a0c63c4c1669ee698a0de00480fce3 Mon Sep 17 00:00:00 2001 From: liangkun Date: Thu, 19 Aug 2021 17:33:17 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9h5=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=E8=AF=81=E9=A6=96=E6=AC=A1=E7=99=BB=E9=99=86=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=AF=86=E7=A0=81=E5=90=8E=E8=B7=B3=E8=BD=AC=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=AE=8C=E5=96=84=E4=BF=A1=E6=81=AF=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=88=B7=E6=96=B0=E5=8E=BB=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Learun.Application.Mobile/www/pages/welcome/welcome.js | 7 ++++++- .../www/pages/workspace/workspace.html | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.js index a580dac62..202bae52e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.js @@ -118,6 +118,12 @@ data) => { //console.log('datadata',data); if (data) { + if(!data['StuInfoFreshEntity']) + { + learun.layer.loading(false); + learun.layer.toast('未查询到新生数据，请确认是否为新生。'); + return; + } //基本信息 for (var id in data['StuInfoFreshEntity']) { var dom = $('#' + id)[0]; @@ -260,7 +266,6 @@ learun.layer.loading(false); if (data) { learun.layer.toast('保存成功'); - location.reload(); } }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/workspace/workspace.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/workspace/workspace.html index 9bf901e5d..a65cbfa5a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/workspace/workspace.html +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/workspace/workspace.html @@ -226,7 +226,7 @@ } if (learun.storage.get('isUpdStu') === true) { learun.storage.set('isUpdStu',null); - learun.nav.go({ path: 'login/IdCardLogin', title: '身份证登录', type: 'right' }); + learun.nav.go({ path: 'welcome', title: '完善信息', type: 'right' }); //learun.nav.go({ path: 'my/modifypassword', isBack: false, isHead: true, title:'修改密码' }); } var _html = ''; From 08e9a246a66142582975af2d8546c1a5b20a10d7 Mon Sep 17 00:00:00 2001 From: liangkun Date: Fri, 20 Aug 2021 14:52:53 +0800 Subject: [PATCH 03/16] =?UTF-8?q?dragsso=E7=A7=BB=E6=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SSO_Drag_CardSortManageController.cs | 121 ++ .../SSO_Drag_DesktopManageController.cs | 121 ++ .../Views/SSO_Drag_CardSortManage/Form.cshtml | 27 + .../Views/SSO_Drag_CardSortManage/Form.js | 38 + .../SSO_Drag_CardSortManage/Index.cshtml | 39 + .../Views/SSO_Drag_CardSortManage/Index.js | 94 + .../Views/SSO_Drag_DesktopManage/Form.cshtml | 31 + .../Views/SSO_Drag_DesktopManage/Form.js | 38 + .../Views/SSO_Drag_DesktopManage/Index.cshtml | 39 + .../Views/SSO_Drag_DesktopManage/Index.js | 95 + .../Controllers/SSOSystemController.cs | 975 ++++++++++ .../Learun.Application.Web.csproj | 16 + .../Views/SSOSystem/DragModelOne.cshtml | 1662 +++++++++++++++++ .../Views/SSOSystem/DragModelThree.cshtml | 709 +++++++ .../Views/SSOSystem/DragModelTwo.cshtml | 1613 ++++++++++++++++ .../Views/SSOSystem/DragNoLogin.cshtml | 1177 ++++++++++++ .../Views/SSOSystem/DragNoWxLogin.cshtml | 1184 ++++++++++++ .../Views/SSOSystem/_LayoutSSODrag.cshtml | 155 ++ .../SystemModule/Module/ModuleEntity.cs | 21 +- .../LR_Desktop/SSO_Drag_CardSortManageMap.cs | 29 + .../LR_Desktop/SSO_Drag_DesktopManageMap.cs | 29 + .../Learun.Application.Mapping.csproj | 2 + .../EmpInfo/EmpInfoBLL.cs | 22 + .../EmpInfo/EmpInfoEntity.cs | 20 + .../EmpInfo/EmpInfoIBLL.cs | 6 + .../EmpInfo/EmpInfoService.cs | 31 +- .../LessonInfo/LessonInfoBLL.cs | 20 +- .../LessonInfo/LessonInfoIBLL.cs | 3 +- .../LessonInfo/LessonInfoService.cs | 20 +- .../SYS_SendMessage/SYS_SendMessageBLL.cs | 26 +- .../SYS_SendMessage/SYS_SendMessageIBLL.cs | 9 +- .../SYS_SendMessage/SYS_SendMessageService.cs | 74 +- .../StuConsumption/StuConsumptionBLL.cs | 26 +- .../StuConsumption/StuConsumptionIBLL.cs | 9 +- .../StuConsumption/StuConsumptionService.cs | 36 +- .../SSO_Drag_CardSortManageBLL.cs | 169 ++ .../SSO_Drag_CardSortManageEntity.cs | 68 + .../SSO_Drag_CardSortManageIBLL.cs | 60 + .../SSO_Drag_CardSortManageService.cs | 216 +++ .../SSO_Drag_DesktopManageBLL.cs | 261 +++ .../SSO_Drag_DesktopManageEntity.cs | 99 + .../SSO_Drag_DesktopManageIBLL.cs | 85 + .../SSO_Drag_DesktopManageService.cs | 426 +++++ .../Learun.Application.TwoDevelopment.csproj | 8 + .../Perm_Function/Perm_FunctionEntity.cs | 6 + .../StuSaverecord/StuSaverecordBLL.cs | 27 +- .../StuSaverecord/StuSaverecordIBLL.cs | 9 +- .../StuSaverecord/StuSaverecordService.cs | 26 +- 48 files changed, 9957 insertions(+), 20 deletions(-) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/SSO_Drag_CardSortManageController.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/SSO_Drag_DesktopManageController.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CardSortManage/Form.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CardSortManage/Form.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CardSortManage/Index.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CardSortManage/Index.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_DesktopManage/Form.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_DesktopManage/Form.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_DesktopManage/Index.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_DesktopManage/Index.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelOne.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelThree.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelTwo.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragNoLogin.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragNoWxLogin.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/_LayoutSSODrag.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_Desktop/SSO_Drag_CardSortManageMap.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_Desktop/SSO_Drag_DesktopManageMap.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_CardSortManage/SSO_Drag_CardSortManageBLL.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_CardSortManage/SSO_Drag_CardSortManageEntity.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_CardSortManage/SSO_Drag_CardSortManageIBLL.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_CardSortManage/SSO_Drag_CardSortManageService.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_DesktopManage/SSO_Drag_DesktopManageBLL.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_DesktopManage/SSO_Drag_DesktopManageEntity.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_DesktopManage/SSO_Drag_DesktopManageIBLL.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_DesktopManage/SSO_Drag_DesktopManageService.cs diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/SSO_Drag_CardSortManageController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/SSO_Drag_CardSortManageController.cs new file mode 100644 index 000000000..5cd41d24d --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/SSO_Drag_CardSortManageController.cs @@ -0,0 +1,121 @@ +using Learun.Application.TwoDevelopment.LR_Desktop; +using Learun.Util; +using System.Data; +using System.Web.Mvc; + +namespace Learun.Application.Web.Areas.LR_Desktop.Controllers +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-03-18 09:54 + /// 描 述：网上办事大厅拖拽版-卡片块排序管理 + /// + public class SSO_Drag_CardSortManageController : MvcControllerBase + { + private SSO_Drag_CardSortManageIBLL sSO_Drag_CardSortManageIBLL = new SSO_Drag_CardSortManageBLL(); + + #region 视图功能 + + /// + /// 主页面 + /// + /// + [HttpGet] + public ActionResult Index() + { + return View(); + } + /// + /// 表单页 + /// + /// + [HttpGet] + public ActionResult Form() + { + return View(); + } + #endregion + + #region 获取数据 + + /// + /// 获取列表数据 + /// + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetList( string queryJson ) + { + var data = sSO_Drag_CardSortManageIBLL.GetList(queryJson); + return Success(data); + } + /// + /// 获取列表分页数据 + /// + /// 分页参数 + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetPageList(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var data = sSO_Drag_CardSortManageIBLL.GetPageList(paginationobj, queryJson); + var jsonData = new + { + rows = data, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records + }; + return Success(jsonData); + } + /// + /// 获取表单数据 + /// + /// 主键 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetFormData(string keyValue) + { + var data = sSO_Drag_CardSortManageIBLL.GetEntity(keyValue); + return Success(data); + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + /// + [HttpPost] + [AjaxOnly] + public ActionResult DeleteForm(string keyValue) + { + sSO_Drag_CardSortManageIBLL.DeleteEntity(keyValue); + return Success("删除成功！"); + } + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveForm(string keyValue,SSO_Drag_CardSortManageEntity entity) + { + sSO_Drag_CardSortManageIBLL.SaveEntity(keyValue, entity); + return Success("保存成功！"); + } + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/SSO_Drag_DesktopManageController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/SSO_Drag_DesktopManageController.cs new file mode 100644 index 000000000..e1485361f --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/SSO_Drag_DesktopManageController.cs @@ -0,0 +1,121 @@ +using Learun.Application.TwoDevelopment.LR_Desktop; +using Learun.Util; +using System.Data; +using System.Web.Mvc; + +namespace Learun.Application.Web.Areas.LR_Desktop.Controllers +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-03-18 09:47 + /// 描 述：网上办事大厅拖拽版-桌面管理 + /// + public class SSO_Drag_DesktopManageController : MvcControllerBase + { + private SSO_Drag_DesktopManageIBLL sSO_Drag_DesktopManageIBLL = new SSO_Drag_DesktopManageBLL(); + + #region 视图功能 + + /// + /// 主页面 + /// + /// + [HttpGet] + public ActionResult Index() + { + return View(); + } + /// + /// 表单页 + /// + /// + [HttpGet] + public ActionResult Form() + { + return View(); + } + #endregion + + #region 获取数据 + + /// + /// 获取列表数据 + /// + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetList( string queryJson ) + { + var data = sSO_Drag_DesktopManageIBLL.GetList(queryJson); + return Success(data); + } + /// + /// 获取列表分页数据 + /// + /// 分页参数 + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetPageList(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var data = sSO_Drag_DesktopManageIBLL.GetPageList(paginationobj, queryJson); + var jsonData = new + { + rows = data, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records + }; + return Success(jsonData); + } + /// + /// 获取表单数据 + /// + /// 主键 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetFormData(string keyValue) + { + var data = sSO_Drag_DesktopManageIBLL.GetEntity(keyValue); + return Success(data); + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + /// + [HttpPost] + [AjaxOnly] + public ActionResult DeleteForm(string keyValue) + { + sSO_Drag_DesktopManageIBLL.DeleteEntity(keyValue); + return Success("删除成功！"); + } + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveForm(string keyValue,SSO_Drag_DesktopManageEntity entity) + { + sSO_Drag_DesktopManageIBLL.SaveEntity(keyValue, entity); + return Success("保存成功！"); + } + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CardSortManage/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CardSortManage/Form.cshtml new file mode 100644 index 000000000..38067da43 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CardSortManage/Form.cshtml @@ -0,0 +1,27 @@ +@{ + ViewBag.Title = "网上办事大厅拖拽版-卡片块排序管理"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
+
+
主键*
+ +
+
+
用户*
+ +
+
+
模式编号：0办事大厅模式，1效率优先模式，2管理驾驶舱模式*
+ +
+
+
桌面Id*
+ +
+
+
卡片块排序*
+ +
+
+@Html.AppendJsFile("/Areas/LR_Desktop/Views/SSO_Drag_CardSortManage/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CardSortManage/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CardSortManage/Form.js new file mode 100644 index 000000000..8340ba761 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CardSortManage/Form.js @@ -0,0 +1,38 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2021-03-18 09:54 + * 描 述：网上办事大厅拖拽版-卡片块排序管理 + */ +var acceptClick; +var keyValue = request('keyValue'); +var bootstrap = function ($, learun) { + "use strict"; + var selectedRow = learun.frameTab.currentIframe().selectedRow; + var page = { + init: function () { + page.initData(); + }, + bind: function () { + }, + initData: function () { + if (!!selectedRow) { + $('#form').lrSetFormData(selectedRow); + } + } + }; + // 保存数据 + acceptClick = function (callBack) { + if (!$('#form').lrValidform()) { + return false; + } + var postData = $('#form').lrGetFormData(); + $.lrSaveForm(top.$.rootUrl + '/LR_Desktop/SSO_Drag_CardSortManage/SaveForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CardSortManage/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CardSortManage/Index.cshtml new file mode 100644 index 000000000..e433c543c --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CardSortManage/Index.cshtml @@ -0,0 +1,39 @@ +@{ + ViewBag.Title = "网上办事大厅拖拽版-卡片块排序管理"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
树形目录
+
+
+
+
+
+
标题
+
+
+
+ +
+
+  查询 +
+
+
+
+ +
+
+  新增 +  编辑 +  删除 +
+
+
+
+
+
+
+@Html.AppendJsFile("/Areas/LR_Desktop/Views/SSO_Drag_CardSortManage/Index.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CardSortManage/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CardSortManage/Index.js new file mode 100644 index 000000000..ca3f0dc19 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CardSortManage/Index.js @@ -0,0 +1,94 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2021-03-18 09:54 + * 描 述：网上办事大厅拖拽版-卡片块排序管理 + */ +var selectedRow; +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + // 查询 + $('#btn_Search').on('click', function () { + var keyword = $('#txt_Keyword').val(); + page.search({ keyword: keyword }); + }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 新增 + $('#lr_add').on('click', function () { + selectedRow = null; + learun.layerForm({ + id: 'form', + title: '新增', + url: top.$.rootUrl + '/LR_Desktop/SSO_Drag_CardSortManage/Form', + width: 700, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + }); + // 编辑 + $('#lr_edit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + selectedRow = $('#gridtable').jfGridGet('rowdata'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'form', + title: '编辑', + url: top.$.rootUrl + '/LR_Desktop/SSO_Drag_CardSortManage/Form?keyValue=' + keyValue, + width: 700, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); + // 删除 + $('#lr_delete').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + learun.layerConfirm('是否确认删除该项！', function (res) { + if (res) { + learun.deleteForm(top.$.rootUrl + '/LR_Desktop/SSO_Drag_CardSortManage/DeleteForm', { keyValue: keyValue}, function () { + }); + } + }); + } + }); + }, + initGird: function () { + $('#gridtable').lrAuthorizeJfGrid({ + url: top.$.rootUrl + '/LR_Desktop/SSO_Drag_CardSortManage/GetPageList', + headData: [ + { label: '主键', name: 'Id', width: 200, align: "left" }, + { label: '用户', name: 'UserId', width: 200, align: "left" }, + { label: '模式编号：0办事大厅模式，1效率优先模式，2管理驾驶舱模式', name: 'ModelCode', width: 200, align: "left" }, + { label: '桌面Id', name: 'DesktopId', width: 200, align: "left" }, + { label: '卡片块排序', name: 'CardSort', width: 200, align: "left" }, + ], + mainId:'Id', + isPage: true + }); + page.search(); + }, + search: function (param) { + param = param || {}; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + $('#gridtable').jfGridSet('reload'); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_DesktopManage/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_DesktopManage/Form.cshtml new file mode 100644 index 000000000..fbd990750 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_DesktopManage/Form.cshtml @@ -0,0 +1,31 @@ +@{ + ViewBag.Title = "网上办事大厅拖拽版-桌面管理"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
+
+
主键*
+ +
+
+
用户*
+ +
+
+
模式编号：0办事大厅模式，1效率优先模式，2管理驾驶舱模式*
+ +
+
+
桌面名称*
+ +
+
+
桌面编号*
+ +
+
+
排序号*
+ +
+
+@Html.AppendJsFile("/Areas/LR_Desktop/Views/SSO_Drag_DesktopManage/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_DesktopManage/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_DesktopManage/Form.js new file mode 100644 index 000000000..8997ddfd3 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_DesktopManage/Form.js @@ -0,0 +1,38 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2021-03-18 09:47 + * 描 述：网上办事大厅拖拽版-桌面管理 + */ +var acceptClick; +var keyValue = request('keyValue'); +var bootstrap = function ($, learun) { + "use strict"; + var selectedRow = learun.frameTab.currentIframe().selectedRow; + var page = { + init: function () { + page.initData(); + }, + bind: function () { + }, + initData: function () { + if (!!selectedRow) { + $('#form').lrSetFormData(selectedRow); + } + } + }; + // 保存数据 + acceptClick = function (callBack) { + if (!$('#form').lrValidform()) { + return false; + } + var postData = $('#form').lrGetFormData(); + $.lrSaveForm(top.$.rootUrl + '/LR_Desktop/SSO_Drag_DesktopManage/SaveForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_DesktopManage/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_DesktopManage/Index.cshtml new file mode 100644 index 000000000..ffa2e7665 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_DesktopManage/Index.cshtml @@ -0,0 +1,39 @@ +@{ + ViewBag.Title = "网上办事大厅拖拽版-桌面管理"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
树形目录
+
+
+
+
+
+
标题
+
+
+
+ +
+
+  查询 +
+
+
+
+ +
+
+  新增 +  编辑 +  删除 +
+
+
+
+
+
+
+@Html.AppendJsFile("/Areas/LR_Desktop/Views/SSO_Drag_DesktopManage/Index.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_DesktopManage/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_DesktopManage/Index.js new file mode 100644 index 000000000..2246bd730 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_DesktopManage/Index.js @@ -0,0 +1,95 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2021-03-18 09:47 + * 描 述：网上办事大厅拖拽版-桌面管理 + */ +var selectedRow; +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + // 查询 + $('#btn_Search').on('click', function () { + var keyword = $('#txt_Keyword').val(); + page.search({ keyword: keyword }); + }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 新增 + $('#lr_add').on('click', function () { + selectedRow = null; + learun.layerForm({ + id: 'form', + title: '新增', + url: top.$.rootUrl + '/LR_Desktop/SSO_Drag_DesktopManage/Form', + width: 700, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + }); + // 编辑 + $('#lr_edit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + selectedRow = $('#gridtable').jfGridGet('rowdata'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'form', + title: '编辑', + url: top.$.rootUrl + '/LR_Desktop/SSO_Drag_DesktopManage/Form?keyValue=' + keyValue, + width: 700, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); + // 删除 + $('#lr_delete').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + learun.layerConfirm('是否确认删除该项！', function (res) { + if (res) { + learun.deleteForm(top.$.rootUrl + '/LR_Desktop/SSO_Drag_DesktopManage/DeleteForm', { keyValue: keyValue}, function () { + }); + } + }); + } + }); + }, + initGird: function () { + $('#gridtable').lrAuthorizeJfGrid({ + url: top.$.rootUrl + '/LR_Desktop/SSO_Drag_DesktopManage/GetPageList', + headData: [ + { label: '主键', name: 'Id', width: 200, align: "left" }, + { label: '用户', name: 'UserId', width: 200, align: "left" }, + { label: '模式编号：0办事大厅模式，1效率优先模式，2管理驾驶舱模式', name: 'ModelCode', width: 200, align: "left" }, + { label: '桌面名称', name: 'DesktopName', width: 200, align: "left" }, + { label: '桌面编号', name: 'DesktopCode', width: 200, align: "left" }, + { label: '排序号', name: 'Sort', width: 200, align: "left" }, + ], + mainId:'Id', + isPage: true + }); + page.search(); + }, + search: function (param) { + param = param || {}; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + $('#gridtable').jfGridSet('reload'); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs index c7f7ea87f..e6dd2a1b3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs @@ -16,6 +16,8 @@ using System.Web.Mvc; using Learun.Cache.Base; using Learun.Cache.Factory; using Newtonsoft.Json; +using Learun.Application.TwoDevelopment.LR_Desktop; +using Learun.Application.TwoDevelopment.PersonnelManagement; namespace Learun.Application.Web.Controllers { @@ -37,6 +39,23 @@ namespace Learun.Application.Web.Controllers private Sys_ReceiveFileIBLL sys_ReceiveFileIBLL = new Sys_ReceiveFileBLL(); private Perm_FunctionVisitIBLL functionVisitIbll = new Perm_FunctionVisitBLL(); private ICache redisCache = CacheFactory.CaChe(); + private SSO_Drag_DesktopManageIBLL sSO_Drag_DesktopManageIBLL = new SSO_Drag_DesktopManageBLL(); + private SYS_SendMessageIBLL sYS_SendMessageIBLL = new SYS_SendMessageBLL(); + private CdMajorIBLL cdMajorIBLL = new CdMajorBLL(); + private ClassInfoIBLL classInfoIBLL = new ClassInfoBLL(); + private StuInfoBasicIBLL stuInfoBasicIBLL = new StuInfoBasicBLL(); + private ClassroomInfoIBLL classroomInfoIBLL = new ClassroomInfoBLL(); + private EmpInfoIBLL empInfoIBLL = new EmpInfoBLL(); + private SSO_Drag_CardSortManageIBLL sSO_Drag_CardSortManageIBLL = new SSO_Drag_CardSortManageBLL(); + private LessonInfoIBLL lessonInfoIBLL = new LessonInfoBLL(); + private CdLessonSortIBLL cdLessonSortIBLL = new CdLessonSortBLL(); + private CdLessonTypeIBLL cdLessonTypeIBLL = new CdLessonTypeBLL(); + private BCdCultureDegreeIBLL bCdCultureDegreeIBLL = new BCdCultureDegreeBLL(); + private StuScoreNotPassIBLL stuScoreNotPassIBLL = new StuScoreNotPassBLL(); + private Sys_QRCodeInLoginIBLL sys_QRCodeInLoginIBLL = new Sys_QRCodeInLoginBLL(); + private TeachSwitchIBLL teachSwitchIBLL = new TeachSwitchBLL(); + private StuSaverecordIBLL stuSaverecordIBLL = new StuSaverecordBLL(); + private StuConsumptionIBLL stuConsumptionIBLL = new StuConsumptionBLL(); #region 统一身份认证2.0 /// @@ -840,5 +859,961 @@ namespace Learun.Application.Web.Controllers return ip; } + /// + /// 网上办事大厅拖拽版-未登录页面 + /// + /// + public ActionResult DragNoLogin() + { + //获取错误次数 + ViewBag.errornum = OperatorHelper.Instance.GetCurrentErrorNum(); + //获取高职版跳转地址 + ViewBag.DigitalschoolMisLoginurl = ConfigurationManager.AppSettings["DigitalschoolMisLoginurl"]; + ViewBag.Returnurl = "http://" + Request.Url.Host + ":" + Request.Url.Port; + //获取登录页二维码配置信息 + ViewBag.HasQRCode = false; + var qrcodelist = sys_QRCodeInLoginIBLL.GetList().ToList().Where(x => x.EnabledMark == 1).OrderByDescending(x => x.CreateTime); + if (qrcodelist.Any()) + { + ViewBag.HasQRCode = true; + ViewBag.QRCodeUrl = qrcodelist.FirstOrDefault().QRCodeUrl; + ViewBag.QRCodeText = qrcodelist.FirstOrDefault().Title; + } + //微信快捷登录 + var result4 = teachSwitchIBLL.FindFirst("wxloginforpc"); + ViewBag.WeixinLoginSwitch = result4; + + + return View(); + } + + /// + /// 网上办事大厅拖拽版-未登录页面-微信登录 + /// + /// + public ActionResult DragNoWxLogin() + { + string QQOpenId = Request.QueryString["QQOpenId"]; + string WeixinOpenId = Request.QueryString["WeixinOpenId"]; + ViewBag.WeixinOpenId = WeixinOpenId; + ViewBag.QQOpenId = QQOpenId; + + //获取错误次数 + ViewBag.errornum = OperatorHelper.Instance.GetCurrentErrorNum(); + //获取高职版跳转地址 + ViewBag.DigitalschoolMisLoginurl = ConfigurationManager.AppSettings["DigitalschoolMisLoginurl"]; + ViewBag.Returnurl = "http://" + Request.Url.Host + ":" + Request.Url.Port; + //获取登录页二维码配置信息 + ViewBag.HasQRCode = false; + var qrcodelist = sys_QRCodeInLoginIBLL.GetList().ToList().Where(x => x.EnabledMark == 1).OrderByDescending(x => x.CreateTime); + if (qrcodelist.Any()) + { + ViewBag.HasQRCode = true; + ViewBag.QRCodeUrl = qrcodelist.FirstOrDefault().QRCodeUrl; + ViewBag.QRCodeText = qrcodelist.FirstOrDefault().Title; + } + + + return View(); + } + /// + /// 网上办事大厅拖拽版-办事大厅模式 + /// + /// + public ActionResult DragModelOne() + { + //判断登录状态码 + string account = ""; + if (!Request.Headers["account"].IsEmpty()) + { + account = Request.Headers["account"].ToString(); + } + OperatorHelper helper = new OperatorHelper(); + var result = helper.IsOnLine(account); + if (result.stateCode != 1) + { + return Redirect("DragNoLogin"); + } + //登录用户 + var userInfo = LoginUserInfo.Get(); + ViewBag.UserId = userInfo.userId; + //桌面管理表、卡片块排序管理表增加默认数据 + sSO_Drag_DesktopManageIBLL.AddDefaultData(userInfo.userId, "one"); + //获取桌面、卡片块排序列表 + ViewBag.DesktopList = sSO_Drag_DesktopManageIBLL.GetListByModelCode(userInfo.userId, "one").OrderByDescending(x => x.DefaultFlag).ThenBy(x => x.Sort).ThenBy(x => x.CreateDate); + ViewBag.DesktopListStr = JsonConvert.SerializeObject(ViewBag.DesktopList); + //分页查询条件设置 + Pagination paginationobj = new Pagination() { rows = 5, page = 1, sidx = "readflag asc,SENDTIME desc ", sord = "desc" }; + //邮件-收件箱 + var maildata = sYS_ReceiveMessageIBLL.GetPageList(paginationobj, "{\"userId\":\"" + userInfo.userId + "\"}"); + var maildataAll = sYS_ReceiveMessageIBLL.GetList("{\"userId\":\"" + userInfo.userId + "\"}"); + ViewBag.LanMail = maildata; + ViewBag.LanMailStr = JsonConvert.SerializeObject(ViewBag.LanMail); + ViewBag.LanMailUnReadCount = maildataAll.Count(m => m.READFLAG == 0); + //邮件-已发送 + paginationobj.sidx = "SENDTIME desc"; + var mailsenddata = sYS_SendMessageIBLL.GetPageList(paginationobj, "{\"userId\":\"" + userInfo.userId + "\"}"); + var mailsenddataAll = sYS_SendMessageIBLL.GetList2("{\"userId\":\"" + userInfo.userId + "\"}"); + ViewBag.LanMailSend = mailsenddata; + ViewBag.LanMailSendStr = JsonConvert.SerializeObject(ViewBag.LanMailSend); + //来往邮件数量 + ViewBag.LanMailTotalNum = maildataAll.Count() + mailsenddataAll.Count(); + //公文 + paginationobj.sidx = "SendTime"; + ViewBag.ReceiveFileList = sys_ReceiveFileIBLL.GetPageList(paginationobj, "{\"ReceiverId\":\"" + userInfo.userId + "\"}"); + ViewBag.ReceiveFileListStr = JsonConvert.SerializeObject(ViewBag.ReceiveFileList); + //公告 + List outnewslist = new List(); + var newsList = newsIBLL.GetList("", userInfo.userId); + foreach (var newsitemEntity in newsList) + { + if (!string.IsNullOrEmpty(newsitemEntity.F_SendPostId)) + { + if (!string.IsNullOrEmpty(userInfo.postIds)) + { + if (userInfo.postIds.Contains(",")) + { + foreach (var postid in userInfo.postIds.Split(',')) + { + if (newsitemEntity.F_SendPostId.Contains(postid)) + { + outnewslist.Add(newsitemEntity); + break; + } + } + } + else + { + if (newsitemEntity.F_SendPostId.Contains(userInfo.postIds)) + { + outnewslist.Add(newsitemEntity); + } + } + } + } + else + { + if (!string.IsNullOrEmpty(newsitemEntity.F_SendDeptId)) + { + if (newsitemEntity.F_SendDeptId.Contains(userInfo.departmentId)) + { + outnewslist.Add(newsitemEntity); + } + } + else + { + outnewslist.Add(newsitemEntity); + } + } + } + ViewBag.NewsList = outnewslist.Take(5); + ViewBag.NewsListStr = JsonConvert.SerializeObject(ViewBag.NewsList); + //宣传报道 + var newsListOfxuanchuan = outnewslist.Where(x => x.F_CategoryId == "15").Take(4); + foreach (var item in newsListOfxuanchuan) + { + if (!string.IsNullOrEmpty(item.F_NewsImage)) + { + var imagePath = annexesFileIBLL.GetEntityByFolderId(item.F_NewsImage)?.F_FilePath; + if (!string.IsNullOrEmpty(imagePath)) + { + item.F_NewsImage = imagePath.Substring(imagePath.IndexOf("Resource")); + } + else + { + item.F_NewsImage = "/Content/images/DragSSO/noLogin.png"; + } + } + } + ViewBag.NewsListOfxuanchuan = newsListOfxuanchuan; + ViewBag.NewsListOfxuanchuanStr = JsonConvert.SerializeObject(ViewBag.NewsListOfxuanchuan); + //智慧教育 + ViewBag.NewsListOfzhihui = outnewslist.Where(x => x.F_CategoryId == "16").Take(6); + ViewBag.NewsListOfzhihuiStr = JsonConvert.SerializeObject(ViewBag.NewsListOfzhihui); + //专题推荐 + var newsListOfzhuanti = outnewslist.Where(x => x.F_CategoryId == "17").Take(7); + foreach (var item in newsListOfzhuanti) + { + if (!string.IsNullOrEmpty(item.F_NewsImage)) + { + var imagePath = annexesFileIBLL.GetEntityByFolderId(item.F_NewsImage)?.F_FilePath; + if (!string.IsNullOrEmpty(imagePath)) + { + item.F_NewsImage = imagePath.Substring(imagePath.IndexOf("Resource")); + } + else + { + item.F_NewsImage = "/Content/images/DragSSO/noLogin.png"; + } + } + } + ViewBag.NewsListOfzhuanti = newsListOfzhuanti; + ViewBag.NewsListOfzhuantiStr = JsonConvert.SerializeObject(ViewBag.NewsListOfzhuanti); + //办公事项-待办任务 + paginationobj.sidx = "F_CreateDate"; + paginationobj.rows = 4; + var taskListAll = nWFProcessIBLL.GetMyTaskPageList(userInfo, "{}"); + ViewBag.TaskList = nWFProcessIBLL.GetMyTaskPageList(userInfo, paginationobj, "{}"); + ViewBag.TaskListStr = JsonConvert.SerializeObject(ViewBag.TaskList); + ViewBag.TaskTotalNum = taskListAll.Count(); + //办公事项-已办任务 + var finishTaskListAll = nWFProcessIBLL.GetMyFinishTaskPageList(userInfo, "{}"); + ViewBag.FinishTaskList = nWFProcessIBLL.GetMyFinishTaskPageList(userInfo, paginationobj, "{}"); + ViewBag.FinishTaskListStr = JsonConvert.SerializeObject(ViewBag.FinishTaskList); + ViewBag.FinishTaskTotalNum = finishTaskListAll.Count(); + //办公事项-我发起的 + var myListAll = nWFProcessIBLL.GetMyPageList(userInfo.userId, "{}"); + ViewBag.MyList = nWFProcessIBLL.GetMyPageList(userInfo.userId, paginationobj, "{}"); + ViewBag.MyListStr = JsonConvert.SerializeObject(ViewBag.MyList); + ViewBag.MyListTotalNum = myListAll.Count(); + //常用服务 + List modulelist = new List(); + List offenused = LogBLL.GetGroupLog(userInfo.userId).Select(m => m.F_Module).Take(20).ToList(); + var moduledata = moduleIBLL.GetModuleList().Where(m => m.F_EnabledMark == 1 && m.F_DeleteMark == 0 && !string.IsNullOrEmpty(m.F_UrlAddress) && m.F_IsMenu == 1 && m.F_Target == "iframe" && !string.IsNullOrEmpty(m.F_ParentId)); + foreach (var oitem in offenused) + { + ModuleEntity fod = moduledata.FirstOrDefault(m => m.F_FullName == oitem); + if (fod != null) + { + //找父级 + if (fod.F_ParentId == "0") + { + fod.ParentName = fod.F_FullName; + fod.F_ParentId = fod.F_ModuleId; + } + else + { + var parent1 = moduleIBLL.GetModuleEntity(fod.F_ParentId); + if (parent1 != null) + { + if (parent1.F_ParentId == "0") + { + fod.ParentName = parent1.F_FullName; + fod.F_ParentId = parent1.F_ModuleId; + } + else + { + //下一级 + var parent2 = moduleIBLL.GetModuleEntity(parent1.F_ParentId); + if (parent2 != null) + { + if (parent2.F_ParentId == "0") + { + fod.ParentName = parent2.F_FullName; + fod.F_ParentId = parent2.F_ModuleId; + } + else + { + //下一级 + var parent3 = moduleIBLL.GetModuleEntity(parent2.F_ParentId); + if (parent3 != null) + { + if (parent3.F_ParentId == "0") + { + fod.ParentName = parent3.F_FullName; + fod.F_ParentId = parent3.F_ModuleId; + } + else + { + //下一级 + var parent4 = moduleIBLL.GetModuleEntity(parent3.F_ParentId); + if (parent4 != null) + { + if (parent4.F_ParentId == "0") + { + fod.ParentName = parent4.F_FullName; + fod.F_ParentId = parent4.F_ModuleId; + } + } + } + } + } + } + } + } + } + + modulelist.Add(fod); + } + } + ViewBag.OffenusedAll = modulelist; + + var mm = modulelist.GroupBy(x => x.F_ParentId).Select(x => new ModuleEntity() + { + F_ParentId = x.Key, + ParentName = x.FirstOrDefault().ParentName, + ChildrenList = x.Select(y => new ModuleEntity() + { + F_ModuleId = y.F_ModuleId, + F_FullName = y.F_FullName + }).ToList() + }).ToList(); + ViewBag.OffenusedGroup = mm; + ViewBag.OffenusedGroupStr = JsonConvert.SerializeObject(ViewBag.OffenusedGroup); + //查找服务 + List searchmodulelist = new List(); + foreach (var item in moduledata) + { + if (moduleIBLL.GetColumnList(item.F_ModuleId).Any()) + { + item.FirstLetter = Str.PinYin(item.F_FullName).Substring(0, 1); + searchmodulelist.Add(item); + } + } + ViewBag.SearchModule = searchmodulelist; + //校园总览 + //专业 + var majorData = cdMajorIBLL.GetAllList(); + ViewBag.MajorTotalNum = majorData.Count(); + //班级 + var classInfoData = classInfoIBLL.GetAllClass(); + ViewBag.ClassInfoTotalNum = classInfoData.Count(); + //学生 + var stuInfoData = stuInfoBasicIBLL.GetAllList(); + ViewBag.StuInfoTotalNum = stuInfoData.Count(); + //教师 + var teacherData = empInfoIBLL.GetAllList(); + ViewBag.TeacherTotalNum = teacherData.Count(); + //教室 + var classRoomData = classroomInfoIBLL.GetAllList(); + ViewBag.ClassRoomTotalNum = classRoomData.Count(); + //课程 + var lessonData = lessonInfoIBLL.GetAllList(); + ViewBag.LessonTotalNum = lessonData.Count(); + //专业总览 + //专业学生 + var stuByMajor = stuInfoData.GroupBy(x => x.MajorNo).Select(x => new + { + value = x.Select(y => y.StuId).Count(), + name = cdMajorIBLL.GetCdMajorEntityByMajorNo(x.Key)?.MajorName + }); + ViewBag.StuByMajorStr = JsonConvert.SerializeObject(stuByMajor); + //流程 + var flowType = dataItemIBLL.GetDetailList("FlowSort", ""); + var flowList = wfSchemeIBLL.GetWfSchemeStart().ToList(); + var allCount = 0; + foreach (var flow in flowType) + { + var count = flowList.Count(a => a.F_Category == flow.F_ItemName); + flow.FlowCount = count; + allCount += count; + + } + ViewBag.AllCount = allCount; + ViewBag.FlowType = flowType; + ViewBag.FlowList = JsonConvert.SerializeObject(flowList); + //校园一卡通余额 + ViewBag.StuSaveRecordTotalNum = 0; + var stuSaveRecordList = stuSaverecordIBLL.GetListByAccount(userInfo.account).OrderByDescending(x => x.UPLOADDATE); + if (stuSaveRecordList.Any()) + { + ViewBag.StuSaveRecordTotalNum = stuSaveRecordList.FirstOrDefault().ODDFARE; + } + //红湖付款码余额 + ViewBag.StuConsumptionTotalNum = 0; + var stuConsumptionList = stuConsumptionIBLL.GetListByAccount(userInfo.account); + if (stuConsumptionList.Any()) + { + ViewBag.StuConsumptionTotalNum = stuConsumptionList.Select(x => x.OPFARE.ToDecimal()).Sum(); + } + //常用链接 + var userfunctionlist = perm_FunctionIBLL.GetListByUserId(userInfo.userId); + var ff = userfunctionlist.GroupBy(x => x.FTName).Select(x => new Perm_FunctionEntity() + { + FTName = x.Key, + PFunctionList = x.Select(y => new Perm_FunctionEntity() + { + FId = y.FId, + FTId = y.FTId, + FName = y.FName, + UPId = DESEncrypt.Encrypt(y.FId, ConfigurationManager.AppSettings["SSOPublicSecret"]),//sysid + UserId = DESEncrypt.Encrypt(userInfo.userId, ConfigurationManager.AppSettings["SSOPublicSecret"])//openid + }).Take(8).ToList() + }); + ViewBag.FunctionList = ff; + ViewBag.FunctionListStr = JsonConvert.SerializeObject(ViewBag.FunctionList); + + + return View(); + } + + /// + /// 网上办事大厅拖拽版-效率优先模式 + /// + /// + public ActionResult DragModelTwo() + { + //判断登录状态码 + string account = ""; + if (!Request.Headers["account"].IsEmpty()) + { + account = Request.Headers["account"].ToString(); + } + OperatorHelper helper = new OperatorHelper(); + var result = helper.IsOnLine(account); + if (result.stateCode != 1) + { + return Redirect("DragNoLogin"); + } + //登录用户 + var userInfo = LoginUserInfo.Get(); + ViewBag.UserId = userInfo.userId; + //桌面管理表、卡片块排序管理表增加默认数据 + sSO_Drag_DesktopManageIBLL.AddDefaultData(userInfo.userId, "two"); + //获取桌面、卡片块排序列表 + ViewBag.DesktopList = sSO_Drag_DesktopManageIBLL.GetListByModelCode(userInfo.userId, "two").OrderByDescending(x => x.DefaultFlag).ThenBy(x => x.Sort).ThenBy(x => x.CreateDate); + ViewBag.DesktopListStr = JsonConvert.SerializeObject(ViewBag.DesktopList); + //分页查询条件设置 + Pagination paginationobj = new Pagination() { rows = 5, page = 1, sidx = "readflag asc,SENDTIME desc ", sord = "desc" }; + //邮件-收件箱 + var maildata = sYS_ReceiveMessageIBLL.GetPageList(paginationobj, "{\"userId\":\"" + userInfo.userId + "\"}"); + var maildataAll = sYS_ReceiveMessageIBLL.GetList("{\"userId\":\"" + userInfo.userId + "\"}"); + ViewBag.LanMail = maildata; + ViewBag.LanMailStr = JsonConvert.SerializeObject(ViewBag.LanMail); + ViewBag.LanMailUnReadCount = maildataAll.Count(m => m.READFLAG == 0); + //邮件-已发送 + paginationobj.sidx = "SENDTIME desc"; + var mailsenddata = sYS_SendMessageIBLL.GetPageList(paginationobj, "{\"userId\":\"" + userInfo.userId + "\"}"); + var mailsenddataAll = sYS_SendMessageIBLL.GetList2("{\"userId\":\"" + userInfo.userId + "\"}"); + ViewBag.LanMailSend = mailsenddata; + ViewBag.LanMailSendStr = JsonConvert.SerializeObject(ViewBag.LanMailSend); + //来往邮件数量 + ViewBag.LanMailTotalNum = maildataAll.Count() + mailsenddataAll.Count(); + //公文 + paginationobj.sidx = "SendTime"; + ViewBag.ReceiveFileList = sys_ReceiveFileIBLL.GetPageList(paginationobj, "{\"ReceiverId\":\"" + userInfo.userId + "\"}"); + ViewBag.ReceiveFileListStr = JsonConvert.SerializeObject(ViewBag.ReceiveFileList); + //公告 + List outnewslist = new List(); + var newsList = newsIBLL.GetList("", userInfo.userId); + foreach (var newsitemEntity in newsList) + { + if (!string.IsNullOrEmpty(newsitemEntity.F_SendPostId)) + { + if (!string.IsNullOrEmpty(userInfo.postIds)) + { + if (userInfo.postIds.Contains(",")) + { + foreach (var postid in userInfo.postIds.Split(',')) + { + if (newsitemEntity.F_SendPostId.Contains(postid)) + { + outnewslist.Add(newsitemEntity); + break; + } + } + } + else + { + if (newsitemEntity.F_SendPostId.Contains(userInfo.postIds)) + { + outnewslist.Add(newsitemEntity); + } + } + } + } + else + { + if (!string.IsNullOrEmpty(newsitemEntity.F_SendDeptId)) + { + if (newsitemEntity.F_SendDeptId.Contains(userInfo.departmentId)) + { + outnewslist.Add(newsitemEntity); + } + } + else + { + outnewslist.Add(newsitemEntity); + } + } + } + ViewBag.NewsList = outnewslist.Take(5); + ViewBag.NewsListStr = JsonConvert.SerializeObject(ViewBag.NewsList); + //宣传报道 + var newsListOfxuanchuan = outnewslist.Where(x => x.F_CategoryId == "15").Take(4); + foreach (var item in newsListOfxuanchuan) + { + if (!string.IsNullOrEmpty(item.F_NewsImage)) + { + var imagePath = annexesFileIBLL.GetEntityByFolderId(item.F_NewsImage)?.F_FilePath; + if (!string.IsNullOrEmpty(imagePath)) + { + item.F_NewsImage = imagePath.Substring(imagePath.IndexOf("Resource")); + } + else + { + item.F_NewsImage = "/Content/images/DragSSO/noLogin.png"; + } + } + } + ViewBag.NewsListOfxuanchuan = newsListOfxuanchuan; + ViewBag.NewsListOfxuanchuanStr = JsonConvert.SerializeObject(ViewBag.NewsListOfxuanchuan); + //智慧教育 + ViewBag.NewsListOfzhihui = outnewslist.Where(x => x.F_CategoryId == "16").Take(6); + ViewBag.NewsListOfzhihuiStr = JsonConvert.SerializeObject(ViewBag.NewsListOfzhihui); + //专题推荐 + var newsListOfzhuanti = outnewslist.Where(x => x.F_CategoryId == "17").Take(7); + foreach (var item in newsListOfzhuanti) + { + if (!string.IsNullOrEmpty(item.F_NewsImage)) + { + var imagePath = annexesFileIBLL.GetEntityByFolderId(item.F_NewsImage)?.F_FilePath; + if (!string.IsNullOrEmpty(imagePath)) + { + item.F_NewsImage = imagePath.Substring(imagePath.IndexOf("Resource")); + } + else + { + item.F_NewsImage = "/Content/images/DragSSO/noLogin.png"; + } + } + } + ViewBag.NewsListOfzhuanti = newsListOfzhuanti; + ViewBag.NewsListOfzhuantiStr = JsonConvert.SerializeObject(ViewBag.NewsListOfzhuanti); + //办公事项-待办任务 + paginationobj.sidx = "F_CreateDate"; + paginationobj.rows = 4; + var taskListAll = nWFProcessIBLL.GetMyTaskPageList(userInfo, "{}"); + ViewBag.TaskList = nWFProcessIBLL.GetMyTaskPageList(userInfo, paginationobj, "{}"); + ViewBag.TaskListStr = JsonConvert.SerializeObject(ViewBag.TaskList); + ViewBag.TaskTotalNum = taskListAll.Count(); + //办公事项-已办任务 + var finishTaskListAll = nWFProcessIBLL.GetMyFinishTaskPageList(userInfo, "{}"); + ViewBag.FinishTaskList = nWFProcessIBLL.GetMyFinishTaskPageList(userInfo, paginationobj, "{}"); + ViewBag.FinishTaskListStr = JsonConvert.SerializeObject(ViewBag.FinishTaskList); + ViewBag.FinishTaskTotalNum = finishTaskListAll.Count(); + //办公事项-我发起的 + var myListAll = nWFProcessIBLL.GetMyPageList(userInfo.userId, "{}"); + ViewBag.MyList = nWFProcessIBLL.GetMyPageList(userInfo.userId, paginationobj, "{}"); + ViewBag.MyListStr = JsonConvert.SerializeObject(ViewBag.MyList); + ViewBag.MyListTotalNum = myListAll.Count(); + //常用服务 + List modulelist = new List(); + List offenused = LogBLL.GetGroupLog(userInfo.userId).Select(m => m.F_Module).Take(20).ToList(); + var moduledata = moduleIBLL.GetModuleList().Where(m => m.F_EnabledMark == 1 && m.F_DeleteMark == 0 && !string.IsNullOrEmpty(m.F_UrlAddress) && m.F_IsMenu == 1 && m.F_Target == "iframe" && !string.IsNullOrEmpty(m.F_ParentId)); + foreach (var oitem in offenused) + { + ModuleEntity fod = moduledata.FirstOrDefault(m => m.F_FullName == oitem); + if (fod != null) + { + //找父级 + if (fod.F_ParentId == "0") + { + fod.ParentName = fod.F_FullName; + fod.F_ParentId = fod.F_ModuleId; + } + else + { + var parent1 = moduleIBLL.GetModuleEntity(fod.F_ParentId); + if (parent1 != null) + { + if (parent1.F_ParentId == "0") + { + fod.ParentName = parent1.F_FullName; + fod.F_ParentId = parent1.F_ModuleId; + } + else + { + //下一级 + var parent2 = moduleIBLL.GetModuleEntity(parent1.F_ParentId); + if (parent2 != null) + { + if (parent2.F_ParentId == "0") + { + fod.ParentName = parent2.F_FullName; + fod.F_ParentId = parent2.F_ModuleId; + } + else + { + //下一级 + var parent3 = moduleIBLL.GetModuleEntity(parent2.F_ParentId); + if (parent3 != null) + { + if (parent3.F_ParentId == "0") + { + fod.ParentName = parent3.F_FullName; + fod.F_ParentId = parent3.F_ModuleId; + } + else + { + //下一级 + var parent4 = moduleIBLL.GetModuleEntity(parent3.F_ParentId); + if (parent4 != null) + { + if (parent4.F_ParentId == "0") + { + fod.ParentName = parent4.F_FullName; + fod.F_ParentId = parent4.F_ModuleId; + } + } + } + } + } + } + } + } + } + + modulelist.Add(fod); + } + } + ViewBag.OffenusedAll = modulelist; + + var mm = modulelist.GroupBy(x => x.F_ParentId).Select(x => new ModuleEntity() + { + F_ParentId = x.Key, + ParentName = x.FirstOrDefault().ParentName, + ChildrenList = x.Select(y => new ModuleEntity() + { + F_ModuleId = y.F_ModuleId, + F_FullName = y.F_FullName + }).ToList() + }).ToList(); + ViewBag.OffenusedGroup = mm; + ViewBag.OffenusedGroupStr = JsonConvert.SerializeObject(ViewBag.OffenusedGroup); + //todo: + //删begin + ViewBag.OffenusedJiao = modulelist.Where(x => x.F_FullName.Contains("教")); + ViewBag.OffenusedGuan = modulelist.Where(x => x.F_FullName.Contains("管理")); + ViewBag.Offenused = modulelist.Except(modulelist.Where(x => x.F_FullName.Contains("教") || x.F_FullName.Contains("管理"))).Take(6); + ViewBag.OffenusedJiaoStr = JsonConvert.SerializeObject(ViewBag.OffenusedJiao); + ViewBag.OffenusedGuanStr = JsonConvert.SerializeObject(ViewBag.OffenusedGuan); + ViewBag.OffenusedStr = JsonConvert.SerializeObject(ViewBag.Offenused); + //删end + //查找服务 + List searchmodulelist = new List(); + foreach (var item in moduledata) + { + if (moduleIBLL.GetColumnList(item.F_ModuleId).Any()) + { + item.FirstLetter = Str.PinYin(item.F_FullName).Substring(0, 1); + searchmodulelist.Add(item); + } + } + ViewBag.SearchModule = searchmodulelist; + //校园总览 + //专业 + var majorData = cdMajorIBLL.GetAllList(); + ViewBag.MajorTotalNum = majorData.Count(); + //班级 + var classInfoData = classInfoIBLL.GetAllClass(); + ViewBag.ClassInfoTotalNum = classInfoData.Count(); + //学生 + var stuInfoData = stuInfoBasicIBLL.GetAllList(); + ViewBag.StuInfoTotalNum = stuInfoData.Count(); + //教师 + var teacherData = empInfoIBLL.GetAllList(); + ViewBag.TeacherTotalNum = teacherData.Count(); + //教室 + var classRoomData = classroomInfoIBLL.GetAllList(); + ViewBag.ClassRoomTotalNum = classRoomData.Count(); + //课程 + var lessonData = lessonInfoIBLL.GetAllList(); + ViewBag.LessonTotalNum = lessonData.Count(); + //专业总览 + //专业学生 + var stuByMajor = stuInfoData.GroupBy(x => x.MajorNo).Select(x => new + { + value = x.Select(y => y.StuId).Count(), + name = cdMajorIBLL.GetCdMajorEntityByMajorNo(x.Key)?.MajorName + }); + ViewBag.StuByMajorStr = JsonConvert.SerializeObject(stuByMajor); + //流程 + var flowType = dataItemIBLL.GetDetailList("FlowSort", ""); + var flowList = wfSchemeIBLL.GetWfSchemeStart().ToList(); + var allCount = 0; + foreach (var flow in flowType) + { + var count = flowList.Count(a => a.F_Category == flow.F_ItemName); + flow.FlowCount = count; + allCount += count; + + } + ViewBag.AllCount = allCount; + ViewBag.FlowType = flowType; + ViewBag.FlowList = JsonConvert.SerializeObject(flowList); + //校园一卡通余额 + ViewBag.StuSaveRecordTotalNum = 0; + var stuSaveRecordList = stuSaverecordIBLL.GetListByAccount(userInfo.account).OrderByDescending(x => x.UPLOADDATE); + if (stuSaveRecordList.Any()) + { + ViewBag.StuSaveRecordTotalNum = stuSaveRecordList.FirstOrDefault().ODDFARE; + } + //红湖付款码余额 + ViewBag.StuConsumptionTotalNum = 0; + var stuConsumptionList = stuConsumptionIBLL.GetListByAccount(userInfo.account); + if (stuConsumptionList.Any()) + { + ViewBag.StuConsumptionTotalNum = stuConsumptionList.Select(x => x.OPFARE.ToDecimal()).Sum(); + } + //常用链接 + var userfunctionlist = perm_FunctionIBLL.GetListByUserId(userInfo.userId); + var ff = userfunctionlist.GroupBy(x => x.FTName).Select(x => new Perm_FunctionEntity() + { + FTName = x.Key, + PFunctionList = x.Select(y => new Perm_FunctionEntity() + { + FId = y.FId, + FTId = y.FTId, + FName = y.FName, + UPId = DESEncrypt.Encrypt(y.FId, ConfigurationManager.AppSettings["SSOPublicSecret"]),//sysid + UserId = DESEncrypt.Encrypt(userInfo.userId, ConfigurationManager.AppSettings["SSOPublicSecret"])//openid + }).Take(8).ToList() + }); + ViewBag.FunctionList = ff; + ViewBag.FunctionListStr = JsonConvert.SerializeObject(ViewBag.FunctionList); + + + return View(); + } + /// + /// 网上办事大厅拖拽版-管理驾驶舱模式 + /// + /// + public ActionResult DragModelThree() + { + //判断登录状态码 + string account = ""; + if (!Request.Headers["account"].IsEmpty()) + { + account = Request.Headers["account"].ToString(); + } + OperatorHelper helper = new OperatorHelper(); + var result = helper.IsOnLine(account); + if (result.stateCode != 1) + { + return Redirect("DragNoLogin"); + } + //登录用户 + var userInfo = LoginUserInfo.Get(); + ViewBag.UserId = userInfo.userId; + //校园总览 + //专业 + var majorData = cdMajorIBLL.GetAllList(); + ViewBag.MajorTotalNum = majorData.Count(); + //班级 + var classInfoData = classInfoIBLL.GetAllClass(); + ViewBag.ClassInfoTotalNum = classInfoData.Count(); + //学生 + var stuInfoData = stuInfoBasicIBLL.GetAllList(); + ViewBag.StuInfoTotalNum = stuInfoData.Count(); + ViewBag.StuInfoTotalNumOfMan = stuInfoData.Where(x => x.GenderNo == true).Count(); + //教师 + var teacherData = empInfoIBLL.GetAllList(); + ViewBag.TeacherTotalNum = teacherData.Count(); + ViewBag.TeacherTotalNumOfMan = teacherData.Where(x => x.GenderNo == true).Count(); + ViewBag.TeacherTotalNumOfBianNei = teacherData.Where(x => x.CompilationCategory == "01").Count(); + //教室 + var classRoomData = classroomInfoIBLL.GetAllList(); + ViewBag.ClassRoomTotalNum = classRoomData.Count(); + //专业总览 + //专业学生 + var stuByMajor = stuInfoData.GroupBy(x => x.MajorNo).Select(x => new + { + value = x.Select(y => y.StuId).Count(), + name = cdMajorIBLL.GetCdMajorEntityByMajorNo(x.Key)?.MajorName + }); + ViewBag.StuByMajorStr = JsonConvert.SerializeObject(stuByMajor); + //流程 + var flowType = dataItemIBLL.GetDetailList("FlowSort", ""); + var flowList = wfSchemeIBLL.GetWfSchemeStart().ToList(); + var allCount = 0; + foreach (var flow in flowType) + { + var count = flowList.Count(a => a.F_Category == flow.F_ItemName); + flow.FlowCount = count; + allCount += count; + + } + ViewBag.AllCount = allCount; + ViewBag.FlowType = flowType; + ViewBag.FlowList = JsonConvert.SerializeObject(flowList); + //课程总览 + var lessonInfoData = lessonInfoIBLL.GetAllList(); + ViewBag.LessonTotalNum = lessonInfoData.Count(); + ViewBag.OpenLessonTotalNum = lessonInfoData.Where(x => x.CheckMark == true).Count(); + //课程分类下的课程 + var lessonBySort = lessonInfoData.GroupBy(x => x.LessonSortNo).Select(x => new + { + value = x.Select(y => y.LessonId).Count(), + name = cdLessonSortIBLL.GetCdLessonSortEntityByNo(x.Key)?.LessonSortName + }); + ViewBag.LessonBySortStr = JsonConvert.SerializeObject(lessonBySort); + //课程类型下的课程 + var lessonByType = lessonInfoData.GroupBy(x => x.LessonTypeId).Select(x => new + { + value = x.Select(y => y.LessonId).Count(), + name = cdLessonTypeIBLL.GetCdLessonTypeEntity(x.Key)?.LessonTypeName + }); + ViewBag.LessonByTypeStr = JsonConvert.SerializeObject(lessonByType); + //教师总览 + //教师学历比例 + var teacherByHighestRecord = teacherData.Where(x => !string.IsNullOrEmpty(x.HighestRecord)).GroupBy(x => x.HighestRecord).Select(x => new + { + value = x.Select(y => y.EmpId).Count(), + name = bCdCultureDegreeIBLL.GetEntity(x.Key)?.CultureDegree + }).OrderByDescending(x => x.value); + ViewBag.TeacherByHighestRecordStr = JsonConvert.SerializeObject(teacherByHighestRecord); + //教师年龄比例 + var empInfoAgeRate = empInfoIBLL.GetEmpInfoAgeRate(); + var teacherByAge = new List() { + new { value = empInfoAgeRate.age1, name = "60岁以上" }, + new { value = empInfoAgeRate.age2, name = "50~60岁" }, + new { value = empInfoAgeRate.age3, name = "40~50岁" }, + new { value = empInfoAgeRate.age4, name = "30~40岁" }, + new { value = empInfoAgeRate.age5, name = "20~30岁" }, + }; + ViewBag.TeacherByAgeStr = JsonConvert.SerializeObject(teacherByAge); + //学生总览 + //学生成绩预警 + var stuScoreData = stuScoreNotPassIBLL.GetList("{}").Where(x => x.Score == 0).Select(x => new { x.StuNo, x.MajorNo }).Distinct(); + ViewBag.StuScoreWarnTotalNum = stuScoreData.Count(); + var stuScoreByMajor = stuScoreData.GroupBy(x => x.MajorNo).Select(x => new + { + value = x.Select(y => y.StuNo).Count(), + name = cdMajorIBLL.GetCdMajorEntityByMajorNo(x.Key)?.MajorName + }); + ViewBag.StuScoreByMajorStr = JsonConvert.SerializeObject(stuScoreByMajor); + //常用服务 + List modulelist = new List(); + List offenused = LogBLL.GetGroupLog(userInfo.userId).Select(m => m.F_Module).Take(20).ToList(); + var moduledata = moduleIBLL.GetModuleList().Where(m => m.F_EnabledMark == 1 && m.F_DeleteMark == 0 && !string.IsNullOrEmpty(m.F_UrlAddress) && m.F_IsMenu == 1 && m.F_Target == "iframe" && !string.IsNullOrEmpty(m.F_ParentId)); + foreach (var oitem in offenused) + { + ModuleEntity fod = moduledata.FirstOrDefault(m => m.F_FullName == oitem); + if (fod != null) + { + //找父级 + if (fod.F_ParentId == "0") + { + fod.ParentName = fod.F_FullName; + fod.F_ParentId = fod.F_ModuleId; + } + else + { + var parent1 = moduleIBLL.GetModuleEntity(fod.F_ParentId); + if (parent1 != null) + { + if (parent1.F_ParentId == "0") + { + fod.ParentName = parent1.F_FullName; + fod.F_ParentId = parent1.F_ModuleId; + } + else + { + //下一级 + var parent2 = moduleIBLL.GetModuleEntity(parent1.F_ParentId); + if (parent2 != null) + { + if (parent2.F_ParentId == "0") + { + fod.ParentName = parent2.F_FullName; + fod.F_ParentId = parent2.F_ModuleId; + } + else + { + //下一级 + var parent3 = moduleIBLL.GetModuleEntity(parent2.F_ParentId); + if (parent3 != null) + { + if (parent3.F_ParentId == "0") + { + fod.ParentName = parent3.F_FullName; + fod.F_ParentId = parent3.F_ModuleId; + } + else + { + //下一级 + var parent4 = moduleIBLL.GetModuleEntity(parent3.F_ParentId); + if (parent4 != null) + { + if (parent4.F_ParentId == "0") + { + fod.ParentName = parent4.F_FullName; + fod.F_ParentId = parent4.F_ModuleId; + } + } + } + } + } + } + } + } + } + + modulelist.Add(fod); + } + } + ViewBag.OffenusedAll = modulelist; + //查找服务 + List searchmodulelist = new List(); + foreach (var item in moduledata) + { + if (moduleIBLL.GetColumnList(item.F_ModuleId).Any()) + { + item.FirstLetter = Str.PinYin(item.F_FullName).Substring(0, 1); + searchmodulelist.Add(item); + } + } + ViewBag.SearchModule = searchmodulelist; + + + return View(); + } + /// + /// 网上办事大厅拖拽版-保存卡片块排序 + /// + /// + public ActionResult SaveCardSort(string userId, string modelCode, string desktopId, string cardSort) + { + sSO_Drag_CardSortManageIBLL.SaveCardSort(userId, modelCode, desktopId, cardSort); + return Success("操作成功"); + } + + /// + /// 网上办事大厅拖拽版-新增桌面 + /// + /// + public ActionResult AddDesktop(string userId, string modelCode, string desktopName, string desktopCode) + { + sSO_Drag_DesktopManageIBLL.AddDesktop(userId, modelCode, desktopName, desktopCode); + var data = sSO_Drag_DesktopManageIBLL.GetEntityByDesktopCode(userId, modelCode, desktopCode); + return Success("操作成功", data); + } + + /// + /// 网上办事大厅拖拽版-删除桌面 + /// + /// + public ActionResult DeleteDesktop(string desktopId) + { + sSO_Drag_DesktopManageIBLL.DeleteEntity(desktopId); + return Success("操作成功"); + } + + /// + /// 网上办事大厅拖拽版-修改桌面 + /// + /// + public ActionResult ModifyDesktop(string desktopId, string desktopName) + { + var entity = new SSO_Drag_DesktopManageEntity() + { + DesktopName = desktopName + }; + sSO_Drag_DesktopManageIBLL.SaveEntity(desktopId, entity); + return Success("操作成功"); + } + + /// + /// 网上办事大厅拖拽版-默认桌面恢复默认设置 + /// + /// + public ActionResult RestoreDefaultDesktop(string desktopId) + { + sSO_Drag_DesktopManageIBLL.RestoreDefaultDesktop(desktopId); + return Success("操作成功"); + } + } } \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index 25f1f5312..162deb3d4 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 @@ -391,6 +391,8 @@ + + @@ -1257,6 +1259,10 @@ + + + + @@ -6972,6 +6978,10 @@ + + + + @@ -7042,6 +7052,12 @@ + + + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelOne.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelOne.cshtml new file mode 100644 index 000000000..c955538ce --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelOne.cshtml @@ -0,0 +1,1662 @@ +@using Learun.Application.OA +@using Learun.Application.Base.SystemModule +@using Learun.Application.TwoDevelopment.EducationalAdministration +@using Learun.Application.TwoDevelopment.Permission +@using Learun.Application.WorkFlow +@using Learun.Util +@using Learun.Application.TwoDevelopment.LR_Desktop + + +@{ + ViewBag.Title = "网上办事大厅拖拽版"; + Layout = "~/Views/SSOSystem/_LayoutSSODrag.cshtml"; +} + + + + + + +
+ + + +
+
+
最近使用
+
    + @{ + Random rd = new Random(); + foreach (ModuleEntity item in ViewBag.OffenusedAll) + { +
  • + + @item.F_FullName + +
    • + } + } +
+
+
+ @*
+ 服务角色 +
    +
  • 全部
    • +
  • 校领导
    • +
  • 游客
    • +
  • 教师
    • +
  • 学生
    • +
+
+
+ 服务角色 +
    +
  • 全部
    • +
  • 最新应用
    • +
  • 常用链接
    • +
+
*@ +
+ @{ + var searchModule = ViewBag.SearchModule as List; + +
+ A-D (@searchModule.Where(x=>"abcd".Contains(x.FirstLetter)).Count()) +
+
+ @{ + foreach (var item in searchModule.Where(x => "abcd".Contains(x.FirstLetter)).OrderBy(x => x.FirstLetter)) + { +
+ +
+
@item.F_FullName
+ +
+ } + } +
+
+ E-H (@searchModule.Where(x => "efgh".Contains(x.FirstLetter)).Count()) +
+
+ @{ + foreach (var item in searchModule.Where(x => "efgh".Contains(x.FirstLetter)).OrderBy(x => x.FirstLetter)) + { +
+ +
+
@item.F_FullName
+ +
+ } + } +
+
+ I-L (@searchModule.Where(x => "ijkl".Contains(x.FirstLetter)).Count()) +
+
+ @{ + foreach (var item in searchModule.Where(x => "ijkl".Contains(x.FirstLetter)).OrderBy(x => x.FirstLetter)) + { +
+ +
+
@item.F_FullName
+ +
+ } + } +
+
+ M-P (@searchModule.Where(x => "mnop".Contains(x.FirstLetter)).Count()) +
+
+ @{ + foreach (var item in searchModule.Where(x => "mnop".Contains(x.FirstLetter)).OrderBy(x => x.FirstLetter)) + { +
+ +
+
@item.F_FullName
+ +
+ } + } +
+
+ Q-T (@searchModule.Where(x => "qrst".Contains(x.FirstLetter)).Count()) +
+
+ @{ + foreach (var item in searchModule.Where(x => "qrst".Contains(x.FirstLetter)).OrderBy(x => x.FirstLetter)) + { +
+ +
+
@item.F_FullName
+ +
+ } + } +
+
+ U-X (@searchModule.Where(x => "uvwx".Contains(x.FirstLetter)).Count()) +
+
+ @{ + foreach (var item in searchModule.Where(x => "uvwx".Contains(x.FirstLetter)).OrderBy(x => x.FirstLetter)) + { +
+ +
+
@item.F_FullName
+ +
+ } + } +
+
+ Y-Z (@searchModule.Where(x => "yz".Contains(x.FirstLetter)).Count()) +
+
+ @{ + foreach (var item in searchModule.Where(x => "yz".Contains(x.FirstLetter)).OrderBy(x => x.FirstLetter)) + { +
+ +
+
@item.F_FullName
+ +
+ } + } +
+ } + +
+
+
+ + +
+
+
+
+ + +
+
我的收藏
+
+
+
+ + +
+
可用应用
+
+
+
+ + +
+
可用卡片
+
+
+
+
+ +
+
+
+ + 我的收藏 +
+
+ + 可用应用 +
+
+ + 可用卡片 +
+
+
+
+
+ + + + + + +
+
+ + + + +
    + +
    +
    + + + + +
    +
    +
    + + 数据看板 + +
    +
    + + 办公事项 + +
    +
    + + 学校公文 + +
    +
    + + 专业总览 + +
    +
    + + 常用链接 + +
    +
    + + 常用服务 + +
    +
    + + 校园总览 + +
    +
    + + 宣传报道 + +
    +
    + + 办公邮件 + +
    +
    + + 通知公告 + +
    +
    + + 智慧教育 + +
    +
    + + 专题推荐 + +
    +
    + + 办公业务流量 + +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    待办任务
    +
    +
    +
    + + +
    +
    我发起的
    +
    +
    +
    + + +
    +
    未读消息
    +
    +
    +
    +
    + +
    +
    +
    + + 任务 +
    +
    + + 消息 +
    +
    +
    +
    +
    +
    +
      +
    • + @ViewBag.TaskTotalNum + 待办任务 +
      • +
    • + @ViewBag.MyListTotalNum + 我发起的 +
      • +
    • + @ViewBag.FinishTaskTotalNum + 已办任务 +
      • +
    +
    +
    +
    + @{ + var TaskListIEnumerable = ViewBag.TaskList as IEnumerable; + if (TaskListIEnumerable.Any()) + { + foreach (NWFProcessEntity item in ViewBag.TaskList) + { +
    +
    @item.F_TaskName [@item.F_SchemeName]
    +
    @item.F_CreateDate
    +
    请处理
    +
    + } + } + else + { +
    +
    +
    暂时没有数据
    +
    + } + } + +
    +
    + @{ + var MyListIEnumerable = ViewBag.MyList as IEnumerable; + if (MyListIEnumerable.Any()) + { + foreach (NWFProcessEntity item in ViewBag.MyList) + { +
    +
    @item.F_TaskName [@item.F_SchemeName]
    +
    @item.F_CreateDate
    +
    请处理
    +
    + } + } + else + { +
    +
    +
    暂时没有数据
    +
    + } + } + +
    +
    + @{ + var FinishTaskListIEnumerable = ViewBag.FinishTaskList as IEnumerable; + if (FinishTaskListIEnumerable.Any()) + { + foreach (NWFProcessEntity item in ViewBag.FinishTaskList) + { +
    +
    @item.F_TaskName [@item.F_SchemeName]
    +
    @item.F_CreateDate
    +
    请处理
    +
    + } + } + else + { +
    +
    +
    暂时没有数据
    +
    + } + } + +
    +
    +
    +
    +
    +
    +
    暂时没有数据
    +
    +
    +
    +
    +
    + + +
    +
    +
    +
    +
    + @foreach (SSO_Drag_DesktopManageEntity desktopItem in ViewBag.DesktopList) + { +
    +
    @desktopItem.DesktopName
    +
    +
    + } +
    + @{ + var DesktopList = ViewBag.DesktopList as IEnumerable; + if (DesktopList.Count() < 5) + { +
    + +
    +
    + } + } +
    + +
    +
    +
    + @foreach (SSO_Drag_DesktopManageEntity desktopItem in ViewBag.DesktopList) + { +
    + @if (string.IsNullOrEmpty(desktopItem.CardSort)) + { + + } + else + { + if (desktopItem.CardSort.IndexOf(',') == -1) + { + switch (desktopItem.CardSort) + { + case "card1": + + break; + case "card2": + + break; + case "card3": + + break; + case "card4": + + break; + case "card5": + + break; + case "card6": + + break; + case "card7": + + break; + case "card8": + + break; + case "card9": + + break; + case "card10": + + break; + case "card11": + + break; + case "card12": + + break; + case "card13": + + break; + default: + break; + } + } + else + { + foreach (var item in desktopItem.CardSort.Split(',')) + { + switch (item) + { + case "card1": + + break; + case "card2": + + break; + case "card3": + + break; + case "card4": + + break; + case "card5": + + break; + case "card6": + + break; + case "card7": + + break; + case "card8": + + break; + case "card9": + + break; + case "card10": + + break; + case "card11": + + break; + case "card12": + + break; + case "card13": + + break; + default: + break; + } + } + } + } + +
    + + } + +
    +
    +
    +
    + + +
    +
    +
    + +
    桌面设置
    +
    共 0/3 个自建桌面
    +
    + @foreach (SSO_Drag_DesktopManageEntity item in ViewBag.DesktopList) + { +
    + +
    +
    @item.DesktopName@(item.DefaultFlag == "1" ? "(默认桌面)" : "")
    +
    + + 8/8 +
    +
    + +
    + @(item.DefaultFlag == "1" ? "确认恢复默认设置?" : "确认删除该桌面?") +
    + +
    +
    + +
    +
    +
    + } +
    + @if (DesktopList.Count() < 5) + { +
    + +
    +
    新建桌面
    +
    + + 8/8 +
    +
    +
    + 保存该桌面? +
    + +
    +
    + +
    +
    +
    + } +
    完成
    +
    +
    + + +
    +
    +
    + +
    +
    + +
    + + + + +@**@ + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelThree.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelThree.cshtml new file mode 100644 index 000000000..585de09ec --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelThree.cshtml @@ -0,0 +1,709 @@ +@using Learun.Application.OA +@using Learun.Application.Base.SystemModule +@using Learun.Application.TwoDevelopment.EducationalAdministration +@using Learun.Application.TwoDevelopment.Permission +@using Learun.Application.WorkFlow +@using Learun.Util +@using Learun.Application.TwoDevelopment.LR_Desktop + + +@{ + ViewBag.Title = "网上办事大厅拖拽版"; + Layout = "~/Views/SSOSystem/_LayoutSSODrag.cshtml"; +} + + + + + +
    + +
    +
    +
    最近使用
    +
      + @{ + Random rd = new Random(); + foreach (ModuleEntity item in ViewBag.OffenusedAll) + { +
    • + + @item.F_FullName + +
      • + } + } +
    +
    +
    + @*
    + 服务角色 +
      +
    • 全部
      • +
    • 校领导
      • +
    • 游客
      • +
    • 教师
      • +
    • 学生
      • +
    +
    +
    + 服务角色 +
      +
    • 全部
      • +
    • 最新应用
      • +
    • 常用链接
      • +
    +
    *@ +
    + @{ + var searchModule = ViewBag.SearchModule as List; + +
    + A-D (@searchModule.Where(x => "abcd".Contains(x.FirstLetter)).Count()) +
    +
    + @{ + foreach (var item in searchModule.Where(x => "abcd".Contains(x.FirstLetter)).OrderBy(x => x.FirstLetter)) + { +
    + +
    +
    @item.F_FullName
    +     +
    + } + } +
    +
    + E-H (@searchModule.Where(x => "efgh".Contains(x.FirstLetter)).Count()) +
    +
    + @{ + foreach (var item in searchModule.Where(x => "efgh".Contains(x.FirstLetter)).OrderBy(x => x.FirstLetter)) + { +
    + +
    +
    @item.F_FullName
    +     +
    + } + } +
    +
    + I-L (@searchModule.Where(x => "ijkl".Contains(x.FirstLetter)).Count()) +
    +
    + @{ + foreach (var item in searchModule.Where(x => "ijkl".Contains(x.FirstLetter)).OrderBy(x => x.FirstLetter)) + { +
    + +
    +
    @item.F_FullName
    +     +
    + } + } +
    +
    + M-P (@searchModule.Where(x => "mnop".Contains(x.FirstLetter)).Count()) +
    +
    + @{ + foreach (var item in searchModule.Where(x => "mnop".Contains(x.FirstLetter)).OrderBy(x => x.FirstLetter)) + { +
    + +
    +
    @item.F_FullName
    +     +
    + } + } +
    +
    + Q-T (@searchModule.Where(x => "qrst".Contains(x.FirstLetter)).Count()) +
    +
    + @{ + foreach (var item in searchModule.Where(x => "qrst".Contains(x.FirstLetter)).OrderBy(x => x.FirstLetter)) + { +
    + +
    +
    @item.F_FullName
    +     +
    + } + } +
    +
    + U-X (@searchModule.Where(x => "uvwx".Contains(x.FirstLetter)).Count()) +
    +
    + @{ + foreach (var item in searchModule.Where(x => "uvwx".Contains(x.FirstLetter)).OrderBy(x => x.FirstLetter)) + { +
    + +
    +
    @item.F_FullName
    +     +
    + } + } +
    +
    + Y-Z (@searchModule.Where(x => "yz".Contains(x.FirstLetter)).Count()) +
    +
    + @{ + foreach (var item in searchModule.Where(x => "yz".Contains(x.FirstLetter)).OrderBy(x => x.FirstLetter)) + { +
    + +
    +
    @item.F_FullName
    +     +
    + } + } +
    + } + +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    我的收藏
    +
    +
    +
    + + +
    +
    可用应用
    +
    +
    +
    +
    + +
    +
    +
    + + 我的收藏 +
    +
    + + 可用应用 +
    +
    +
    +
    +
    + + + + + + +
    +
    + + + + +
      + +
      +
      +
      +
      + + +
      +
      +
      +
      +
      +
      +
      + 专业总览 + +
      +
      +
      +
      +
      班级总数
      +
      @ViewBag.ClassInfoTotalNum
      +
      +
      +
      专业学生
      +
      @ViewBag.StuInfoTotalNum
      +
      +
      +
      专业教室
      +
      @ViewBag.ClassRoomTotalNum
      +
      +
      +
      +
      +
      +
      +
      + 学生总览 + +
      +
      +
      +
      在校学生总数 @ViewBag.StuInfoTotalNum 人
      +
      +
      + 男 @ViewBag.StuInfoTotalNumOfMan 人
      +
      +
      +
      +
      + 女 @(ViewBag.StuInfoTotalNum - ViewBag.StuInfoTotalNumOfMan) 人
      +
      +
      +
      +
      +
      +
      学生成绩预警
      +
      @ViewBag.StuScoreWarnTotalNum 人
      +
      + +
      +
      +
      +
      + 学生到课率预警20% +
      +
      +
      + +
      + +
      +
      +
      +
      +
      + 80%~100% +
      +
      + 60%~80% +
      +
      + 0%~60% +
      +
      +
      +
      +
      +
      +
      学生逃课预警
      +
      人
      +
      +
      +
      +
      + 80%~100% +
      +
      + 60%~80% +
      +
      + 0%~60% +
      +
      +
      +
      +
      +
      +
      +
      +
      + 校园总览 + +
      +
      +
      +
      + + 专业总数 +
      +
      @ViewBag.MajorTotalNum
      +
      +
      +
      + + 班级总数 +
      +
      @ViewBag.ClassInfoTotalNum
      +
      +
      +
      + + 在校学生 +
      +
      @ViewBag.StuInfoTotalNum
      +
      +
      +
      + + 在校教师 +
      +
      @ViewBag.TeacherTotalNum
      +
      +
      +
      + + 在用教室 +
      +
      @ViewBag.ClassRoomTotalNum
      +
      +
      +
      + + 课程总数 +
      +
      @ViewBag.LessonTotalNum
      +
      +
      +
      +
      +
      +
      +
      + 教师总览 + +
      +
      +
      +
      教师总数 @ViewBag.TeacherTotalNum 人
      +
      +
      + 男 @ViewBag.TeacherTotalNumOfMan 人
      +
      +
      +
      +
      + 女 @(ViewBag.TeacherTotalNum - ViewBag.TeacherTotalNumOfMan) 人
      +
      +
      +
      +
      +
      +
      教师年龄
      比例
      +
      +
      +
      +
      教师学历比例
      +
      +
      +
      +
      +
      教师编制比例
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      在编教师
      +
      @ViewBag.TeacherTotalNumOfBianNei人
      +
      +
      +
      +
      非在编教师
      +
      @(ViewBag.TeacherTotalNum - ViewBag.TeacherTotalNumOfBianNei)人
      +
      +
      +
      +
      +
      + +
      +
      +
      +
      +
      +
      + 课程总览 + +
      +
      +
      +
      + +
      +
      课程建设总数
      +
      @ViewBag.LessonTotalNum
      +
      +
      +
      + +
      +
      本学期开课总数
      +
      @ViewBag.OpenLessonTotalNum
      +
      +
      +
      + +
      +
      课程运行预警
      +
      @ViewBag.OpenLessonTotalNum
      +
      +
      +
      +
      +
      课程分类
      + @*
      + +
      *@ +
      +
      +
      +
      +
      +
      +
      + + +
      +
      +
      + +
      +
      + +
      + + + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelTwo.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelTwo.cshtml new file mode 100644 index 000000000..1da5c8c0d --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelTwo.cshtml @@ -0,0 +1,1613 @@ +@using Learun.Application.OA +@using Learun.Application.Base.SystemModule +@using Learun.Application.TwoDevelopment.EducationalAdministration +@using Learun.Application.TwoDevelopment.Permission +@using Learun.Application.WorkFlow +@using Learun.Util +@using Learun.Application.TwoDevelopment.LR_Desktop + + +@{ + ViewBag.Title = "网上办事大厅拖拽版"; + Layout = "~/Views/SSOSystem/_LayoutSSODrag.cshtml"; +} + + + + + + + +
      + + + +
      +
      +
      最近使用
      +
        + @{ + Random rd = new Random(); + foreach (ModuleEntity item in ViewBag.OffenusedAll) + { +
      • + + @item.F_FullName + +
        • + } + } +
      +
      +
      + @*
      + 服务角色 +
        +
      • 全部
        • +
      • 校领导
        • +
      • 游客
        • +
      • 教师
        • +
      • 学生
        • +
      +
      +
      + 服务角色 +
        +
      • 全部
        • +
      • 最新应用
        • +
      • 常用链接
        • +
      +
      *@ +
      + @{ + var searchModule = ViewBag.SearchModule as List; + +
      + A-D (@searchModule.Where(x => "abcd".Contains(x.FirstLetter)).Count()) +
      +
      + @{ + foreach (var item in searchModule.Where(x => "abcd".Contains(x.FirstLetter)).OrderBy(x => x.FirstLetter)) + { +
      + +
      +
      @item.F_FullName
      +       +
      + } + } +
      +
      + E-H (@searchModule.Where(x => "efgh".Contains(x.FirstLetter)).Count()) +
      +
      + @{ + foreach (var item in searchModule.Where(x => "efgh".Contains(x.FirstLetter)).OrderBy(x => x.FirstLetter)) + { +
      + +
      +
      @item.F_FullName
      +       +
      + } + } +
      +
      + I-L (@searchModule.Where(x => "ijkl".Contains(x.FirstLetter)).Count()) +
      +
      + @{ + foreach (var item in searchModule.Where(x => "ijkl".Contains(x.FirstLetter)).OrderBy(x => x.FirstLetter)) + { +
      + +
      +
      @item.F_FullName
      +       +
      + } + } +
      +
      + M-P (@searchModule.Where(x => "mnop".Contains(x.FirstLetter)).Count()) +
      +
      + @{ + foreach (var item in searchModule.Where(x => "mnop".Contains(x.FirstLetter)).OrderBy(x => x.FirstLetter)) + { +
      + +
      +
      @item.F_FullName
      +       +
      + } + } +
      +
      + Q-T (@searchModule.Where(x => "qrst".Contains(x.FirstLetter)).Count()) +
      +
      + @{ + foreach (var item in searchModule.Where(x => "qrst".Contains(x.FirstLetter)).OrderBy(x => x.FirstLetter)) + { +
      + +
      +
      @item.F_FullName
      +       +
      + } + } +
      +
      + U-X (@searchModule.Where(x => "uvwx".Contains(x.FirstLetter)).Count()) +
      +
      + @{ + foreach (var item in searchModule.Where(x => "uvwx".Contains(x.FirstLetter)).OrderBy(x => x.FirstLetter)) + { +
      + +
      +
      @item.F_FullName
      +       +
      + } + } +
      +
      + Y-Z (@searchModule.Where(x => "yz".Contains(x.FirstLetter)).Count()) +
      +
      + @{ + foreach (var item in searchModule.Where(x => "yz".Contains(x.FirstLetter)).OrderBy(x => x.FirstLetter)) + { +
      + +
      +
      @item.F_FullName
      +       +
      + } + } +
      + } + +
      +
      +
      + + +
      +
      +
      +
      + + +
      +
      我的收藏
      +
      +
      +
      + + +
      +
      可用应用
      +
      +
      +
      + + +
      +
      可用卡片
      +
      +
      +
      +
      + +
      +
      +
      + + 我的收藏 +
      +
      + + 可用应用 +
      +
      + + 可用卡片 +
      +
      +
      +
      +
      + + + + + + +
      +
      + + + + +
        + +
        +
        + + + + +
        +
        +
        + + 数据看板 + +
        +
        + + 办公事项 + +
        +
        + + 学校公文 + +
        +
        + + 专业总览 + +
        +
        + + 常用链接 + +
        +
        + + 常用服务 + +
        +
        + + 校园总览 + +
        +
        + + 宣传报道 + +
        +
        + + 办公邮件 + +
        +
        + + 通知公告 + +
        +
        + + 智慧教育 + +
        +
        + + 专题推荐 + +
        +
        + + 办公业务流量 + +
        +
        +
        + + +
        +
        +
        +
        + + +
        +
        +
        +
        + + +
        +
        网站设置
        +
        +
        +
        + + +
        +
        用户管理
        +
        +
        +
        + + +
        +
        权限分配
        +
        +
        +
        +
        + +
        +
        +
        + 网站设置 +
        +
        + 用户管理 +
        +
        + 权限分配 +
        +
        +
        +
        +
        +
        +
        + + + 登录页风格 + +
        +
        + + + 桌面客服配置 + +
        +
        + + + 统计配置 + +
        +
        + + + 图表配置 + +
        +
        + + + 消息列配置 + +
        +
        +
        +
        +
        +
        +
        暂时没有数据
        +
        +
        +
        +
        +
        +
        暂时没有数据
        +
        +
        +
        +
        +
        + + +
        +
        +
        +
        +
        + @foreach (SSO_Drag_DesktopManageEntity desktopItem in ViewBag.DesktopList) + { +
        +
        @desktopItem.DesktopName
        +
        +
        + } +
        + @{ + var DesktopList = ViewBag.DesktopList as IEnumerable; + if (DesktopList.Count() < 5) + { +
        + +
        +
        + } + } +
        + +
        +
        +
        + @foreach (SSO_Drag_DesktopManageEntity desktopItem in ViewBag.DesktopList) + { +
        + @if (string.IsNullOrEmpty(desktopItem.CardSort)) + { + + } + else + { + if (desktopItem.CardSort.IndexOf(',') == -1) + { + switch (desktopItem.CardSort) + { + case "card1": + + break; + case "card2": + + break; + case "card3": + + break; + case "card4": + + break; + case "card5": + + break; + case "card6": + + break; + case "card7": + + break; + case "card8": + + break; + case "card9": + + break; + case "card10": + + break; + case "card11": + + break; + case "card12": + + break; + case "card13": + + break; + default: + break; + } + } + else + { + foreach (var item in desktopItem.CardSort.Split(',')) + { + switch (item) + { + case "card1": + + break; + case "card2": + + break; + case "card3": + + break; + case "card4": + + break; + case "card5": + + break; + case "card6": + + break; + case "card7": + + break; + case "card8": + + break; + case "card9": + + break; + case "card10": + + break; + case "card11": + + break; + case "card12": + + break; + case "card13": + + break; + default: + break; + } + } + } + } + +
        + + } + +
        +
        +
        +
        + + +
        +
        +
        + +
        桌面设置
        +
        共 0/3 个自建桌面
        +
        + @foreach (SSO_Drag_DesktopManageEntity item in ViewBag.DesktopList) + { +
        + +
        +
        @item.DesktopName@(item.DefaultFlag == "1" ? "(默认桌面)" : "")
        +
        + + 8/8 +
        +
        + +
        + @(item.DefaultFlag == "1" ? "确认恢复默认设置?" : "确认删除该桌面?") +
        + +
        +
        + +
        +
        +
        + } +
        + @if (DesktopList.Count() < 5) + { +
        + +
        +
        新建桌面
        +
        + + 8/8 +
        +
        +
        + 保存该桌面? +
        + +
        +
        + +
        +
        +
        + } +
        完成
        +
        +
        + + +
        +
        +
        + +
        +
        + +
        + + + + + +@**@ + + + 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 new file mode 100644 index 000000000..560890c46 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragNoLogin.cshtml @@ -0,0 +1,1177 @@ +@using Learun.Util + + + + + + + + + + 网上办事大厅拖拽版 + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        + +
          +
          • +
        +
        数字化智慧校园
        +
        + +
        +
        +
        历史
        +
        +
        关闭搜索
        +
        +
        +
        +
        办事大厅模式
        + +
        +
        + + @{ + var loginInfo = LoginUserInfo.Get(); + } + @if (loginInfo == null) + { + @*登录*@ + 登录 + } + else + { + 登录 + } + + +
        + @*
        +
        +
        王明
        +
        +
        +
        退出
        +
        +
        +
        +
        +
        +
        工号 123456
        +
        教务部 主任
        +
        *@ + +
        +
        + +
        +
        皮肤
        +
        +
        +
        + +
        蓝
        +
        选用皮肤
        +
        + + 使用中 +
        +
        +
        +
        +
        + +
        红
        +
        选用皮肤
        +
        + + 使用中 +
        +
        +
        +
        +
        + +
        绿
        +
        选用皮肤
        +
        + + 使用中 +
        +
        +
        +
        +
        +
        +
        +
        + + 飞星下载 +
        + +
        +
        +
        + + +
        + +
        +
        +
        最近使用
        + +
        +
        +
        + 服务角色 +
          +
        • 全部
          • +
        • 校领导
          • +
        • 游客
          • +
        • 教师
          • +
        • 学生
          • +
        +
        +
        + 服务角色 +
          +
        • 全部
          • +
        • 最新应用
          • +
        • 常用链接
          • +
        +
        +
        +
        + A-D (0) +
        +
        +
        +
        + E-H (0) +
        +
        +
        +
        + I-L (0) +
        +
        +
        +
        + M-P (0) +
        +
        +
        +
        + Q-T (0) +
        +
        +
        +
        + U-X (0) +
        +
        +
        +
        + Y-Z (0) +
        +
        +
        +
        +
        +
        + + +
        +
        +
        +
        + + +
        +
        我的收藏
        +
        +
        +
        + + +
        +
        可用应用
        +
        +
        +
        + + +
        +
        可用卡片
        +
        +
        +
        +
        + +
        +
        +
        + + 我的收藏 +
        +
        + + 可用应用 +
        +
        + + 可用卡片 +
        +
        +
        +
        +
        + + + + +
          + +
          +
          + + + + +
            + +
            +
            + + + + +
            +
            +
            + + 数据看板 + +
            +
            + + 办公事项 + +
            +
            + + 学校公文 + +
            +
            + + 专业总览 + +
            +
            + + 常用链接 + +
            +
            + + 常用服务 + +
            +
            + + 校园总览 + +
            +
            + + 宣传报道 + +
            +
            + + 办公邮件 + +
            +
            + + 通知公告 + +
            +
            + + 智慧教育 + +
            +
            + + 专题推荐 + +
            +
            + + 办公业务流量 + +
            +
            +
            + + +
            +
            +
            +
            + + +
            +
            +
            +
            + + +
            +
            待办任务
            +
            +
            +
            + + +
            +
            我发起的
            +
            +
            +
            + + +
            +
            未读消息
            +
            +
            +
            +
            + +
            +
            +
            + + 任务 +
            +
            + + 消息 +
            +
            +
            +
            +
            +
            +
              +
            • + 0 + 待办任务 +
              • +
            • + 0 + 我发起的 +
              • +
            • + 0 + 已办任务 +
              • +
            +
            +
            +
            +
            +
            +
            请登录查看
            +
            +
            +
            +
            +
            +
            请登录查看
            +
            +
            +
            +
            +
            +
            请登录查看
            +
            +
            +
            +
            +
            +
            +
            +
            请登录查看
            +
            +
            +
            +
            +
            + + +
            +
            +
            +
            +
            +
            +
            教师桌面
            +
            +
            +
            +
            OA办公桌面
            +
            +
            +
            +
            + +
            +
            +
            + +
            +
            +
            +
            +
            +
            +
            + 数据看板 + +
            +
            +
            +
            +
            请登录查看
            +
            +
            +
            +
            +
            +
            +
            + 办公事项 + +
            +
            +
            +
              +
            • +
              + +
              + 待办任务 + 0 +
              • +
            • +
              + +
              + 已办任务 +
              • +
            • +
              + +
              + 我发起的 +
              • +
            +
            +
            +
            +
            +
            +
            请登录查看
            +
            +
            +
            +
            +
            +
            请登录查看
            +
            +
            +
            +
            +
            +
            请登录查看
            +
            +
            +
            +
            +
            +
            +
            +
            +
            + 学校公文 + 10 + +
            +
            +
            +
            +
            请登录查看
            +
            +
            +
            +
            +
            +
            +
            + 专业总览 + +
            +
            +
            +
            +
            +
            请登录查看
            +
            +
            +
            +
            +
            +
            +
            + 常用链接 + +
            +
            +
            +
              +
            • +
              + +
              + 系统直通 + 0 +
              • +
            • +
              + +
              + 系统链接 +
              • +
            • +
              + +
              + 网站链接 +
              • +
            +
            +
            +
            +
            +
            +
            请登录查看
            +
            +
            +
            +
            +
            +
            请登录查看
            +
            +
            +
            +
            +
            +
            请登录查看
            +
            +
            +
            +
            +
            +
            +
            +
            +
            + 常用服务 + +
            +
            +
            +
              +
            • +
              + +
              + 校级服务 + 0 +
              • +
            • +
              + +
              + 人事微服务 + 0 +
              • +
            • +
              + +
              + 教育微服务 + 0 +
              • +
            • +
              + 公共微服务 + 0 +
              • +
            • +
              + 研究生微服务 + 0 +
              • +
            • +
              + 科研微服务 + 0 +
              • +
            • +
              + 教科研微服务 + 0 +
              • +
            +
            +
            +
            +
            +
            +
            请登录查看
            +
            +
            +
            +
            +
            +
            请登录查看
            +
            +
            +
            +
            +
            +
            请登录查看
            +
            +
            +
            +
            +
            +
            请登录查看
            +
            +
            +
            +
            +
            +
            请登录查看
            +
            +
            +
            +
            +
            +
            请登录查看
            +
            +
            +
            +
            +
            +
            请登录查看
            +
            +
            +
            +
            +
            +
            +
            +
            +
            + 校园总览 + +
            +
            +
            +
            +
            请登录查看
            +
            +
            +
            +
            +
            +
            +
            + 宣传报道 + +
            +
            +
            +
            +
            请登录查看
            +
            +
            +
            +
            +
            +
            +
            + 办公邮件 + +
            +
            +
            +
              +
            • +
              + +
              + 收件箱 + 0 +
              • +
            • +
              + +
              + 已发送 +
              • +
            +
            +
            +
            +
            +
            +
            请登录查看
            +
            +
            +
            +
            +
            +
            请登录查看
            +
            +
            +
            +
            +
            +
            +
            +
            +
            + 通知公告 + +
            +
            +
            +
            +
            请登录查看
            +
            +
            +
            +
            +
            +
            +
            + 智慧教育 + +
            +
            +
            +
            +
            请登录查看
            +
            +
            +
            +
            +
            +
            +
            + 专题推荐 + +
            +
            +
            +
            +
            请登录查看
            +
            +
            +
            +
            +
            +
            +
            + 办公业务流量 + +
            +
            +
            +
            +
            +
            请登录查看
            +
            +
            +
            +
            +
            +
            +
            +
            +
            +
            +
            +
            +
            从左侧选择需要的应用卡片
            +
            +
            +
            +
            +
            +
            +
            +
            +
            + + +
            +
            +
            + +
            桌面设置
            +
            共 0/3 个自建桌面
            +
            +
            + +
            +
            教师桌面(默认桌面)
            +
            + + 8/8 +
            +
            + +
            + 确认恢复默认设置? +
            + +
            +
            + +
            +
            +
            +
            + +
            +
            OA桌面(默认桌面)
            +
            + + 8/8 +
            +
            + +
            + 确认恢复默认设置? +
            + +
            +
            + +
            +
            +
            +
            +
            + +
            +
            新建桌面
            +
            + + 8/8 +
            +
            +
            + 保存该桌面? +
            + +
            +
            + +
            +
            +
            +
            完成
            +
            +
            + + +
            +
            +
            + +
            +
            + +
            + + + + + @**@ + @**@ + + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragNoWxLogin.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragNoWxLogin.cshtml new file mode 100644 index 000000000..daecc1bfc --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragNoWxLogin.cshtml @@ -0,0 +1,1184 @@ +@using Learun.Util + + + + + + + + + + 网上办事大厅拖拽版 + + + + + + + + + + + + + + + + + + + + + + + + + + + +
            + +
              +
              • +
            +
            数字化智慧校园
            +
            + +
            +
            +
            历史
            +
            +
            关闭搜索
            +
            +
            +
            +
            办事大厅模式
            + +
            +
            + + @{ + var loginInfo = LoginUserInfo.Get(); + } + @if (loginInfo == null) + { + @*登录*@ + 登录 + } + else + { + 登录 + } + + +
            + @*
            +
            +
            王明
            +
            +
            +
            退出
            +
            +
            +
            +
            +
            +
            工号 123456
            +
            教务部 主任
            +
            *@ + +
            +
            + +
            +
            皮肤
            +
            +
            +
            + +
            蓝
            +
            选用皮肤
            +
            + + 使用中 +
            +
            +
            +
            +
            + +
            红
            +
            选用皮肤
            +
            + + 使用中 +
            +
            +
            +
            +
            + +
            绿
            +
            选用皮肤
            +
            + + 使用中 +
            +
            +
            +
            +
            +
            +
            +
            + + 飞星下载 +
            + +
            +
            +
            + + +
            + +
            +
            +
            最近使用
            + +
            +
            +
            + 服务角色 +
              +
            • 全部
              • +
            • 校领导
              • +
            • 游客
              • +
            • 教师
              • +
            • 学生
              • +
            +
            +
            + 服务角色 +
              +
            • 全部
              • +
            • 最新应用
              • +
            • 常用链接
              • +
            +
            +
            +
            + A-D (0) +
            +
            +
            +
            + E-H (0) +
            +
            +
            +
            + I-L (0) +
            +
            +
            +
            + M-P (0) +
            +
            +
            +
            + Q-T (0) +
            +
            +
            +
            + U-X (0) +
            +
            +
            +
            + Y-Z (0) +
            +
            +
            +
            +
            +
            + + +
            +
            +
            +
            + + +
            +
            我的收藏
            +
            +
            +
            + + +
            +
            可用应用
            +
            +
            +
            + + +
            +
            可用卡片
            +
            +
            +
            +
            + +
            +
            +
            + + 我的收藏 +
            +
            + + 可用应用 +
            +
            + + 可用卡片 +
            +
            +
            +
            +
            + + + + +
              + +
              +
              + + + + +
                + +
                +
                + + + + +
                +
                +
                + + 数据看板 + +
                +
                + + 办公事项 + +
                +
                + + 学校公文 + +
                +
                + + 专业总览 + +
                +
                + + 常用链接 + +
                +
                + + 常用服务 + +
                +
                + + 校园总览 + +
                +
                + + 宣传报道 + +
                +
                + + 办公邮件 + +
                +
                + + 通知公告 + +
                +
                + + 智慧教育 + +
                +
                + + 专题推荐 + +
                +
                + + 办公业务流量 + +
                +
                +
                + + +
                +
                +
                +
                + + +
                +
                +
                +
                + + +
                +
                待办任务
                +
                +
                +
                + + +
                +
                我发起的
                +
                +
                +
                + + +
                +
                未读消息
                +
                +
                +
                +
                + +
                +
                +
                + + 任务 +
                +
                + + 消息 +
                +
                +
                +
                +
                +
                +
                  +
                • + 0 + 待办任务 +
                  • +
                • + 0 + 我发起的 +
                  • +
                • + 0 + 已办任务 +
                  • +
                +
                +
                +
                +
                +
                +
                请登录查看
                +
                +
                +
                +
                +
                +
                请登录查看
                +
                +
                +
                +
                +
                +
                请登录查看
                +
                +
                +
                +
                +
                +
                +
                +
                请登录查看
                +
                +
                +
                +
                +
                + + +
                +
                +
                +
                +
                +
                +
                教师桌面
                +
                +
                +
                +
                OA办公桌面
                +
                +
                +
                +
                + +
                +
                +
                + +
                +
                +
                +
                +
                +
                +
                + 数据看板 + +
                +
                +
                +
                +
                请登录查看
                +
                +
                +
                +
                +
                +
                +
                + 办公事项 + +
                +
                +
                +
                  +
                • +
                  + +
                  + 待办任务 + 0 +
                  • +
                • +
                  + +
                  + 已办任务 +
                  • +
                • +
                  + +
                  + 我发起的 +
                  • +
                +
                +
                +
                +
                +
                +
                请登录查看
                +
                +
                +
                +
                +
                +
                请登录查看
                +
                +
                +
                +
                +
                +
                请登录查看
                +
                +
                +
                +
                +
                +
                +
                +
                +
                + 学校公文 + 10 + +
                +
                +
                +
                +
                请登录查看
                +
                +
                +
                +
                +
                +
                +
                + 专业总览 + +
                +
                +
                +
                +
                +
                请登录查看
                +
                +
                +
                +
                +
                +
                +
                + 常用链接 + +
                +
                +
                +
                  +
                • +
                  + +
                  + 系统直通 + 0 +
                  • +
                • +
                  + +
                  + 系统链接 +
                  • +
                • +
                  + +
                  + 网站链接 +
                  • +
                +
                +
                +
                +
                +
                +
                请登录查看
                +
                +
                +
                +
                +
                +
                请登录查看
                +
                +
                +
                +
                +
                +
                请登录查看
                +
                +
                +
                +
                +
                +
                +
                +
                +
                + 常用服务 + +
                +
                +
                +
                  +
                • +
                  + +
                  + 校级服务 + 0 +
                  • +
                • +
                  + +
                  + 人事微服务 + 0 +
                  • +
                • +
                  + +
                  + 教育微服务 + 0 +
                  • +
                • +
                  + 公共微服务 + 0 +
                  • +
                • +
                  + 研究生微服务 + 0 +
                  • +
                • +
                  + 科研微服务 + 0 +
                  • +
                • +
                  + 教科研微服务 + 0 +
                  • +
                +
                +
                +
                +
                +
                +
                请登录查看
                +
                +
                +
                +
                +
                +
                请登录查看
                +
                +
                +
                +
                +
                +
                请登录查看
                +
                +
                +
                +
                +
                +
                请登录查看
                +
                +
                +
                +
                +
                +
                请登录查看
                +
                +
                +
                +
                +
                +
                请登录查看
                +
                +
                +
                +
                +
                +
                请登录查看
                +
                +
                +
                +
                +
                +
                +
                +
                +
                + 校园总览 + +
                +
                +
                +
                +
                请登录查看
                +
                +
                +
                +
                +
                +
                +
                + 宣传报道 + +
                +
                +
                +
                +
                请登录查看
                +
                +
                +
                +
                +
                +
                +
                + 办公邮件 + +
                +
                +
                +
                  +
                • +
                  + +
                  + 收件箱 + 0 +
                  • +
                • +
                  + +
                  + 已发送 +
                  • +
                +
                +
                +
                +
                +
                +
                请登录查看
                +
                +
                +
                +
                +
                +
                请登录查看
                +
                +
                +
                +
                +
                +
                +
                +
                +
                + 通知公告 + +
                +
                +
                +
                +
                请登录查看
                +
                +
                +
                +
                +
                +
                +
                + 智慧教育 + +
                +
                +
                +
                +
                请登录查看
                +
                +
                +
                +
                +
                +
                +
                + 专题推荐 + +
                +
                +
                +
                +
                请登录查看
                +
                +
                +
                +
                +
                +
                +
                + 办公业务流量 + +
                +
                +
                +
                +
                +
                请登录查看
                +
                +
                +
                +
                +
                +
                +
                +
                +
                +
                +
                +
                +
                从左侧选择需要的应用卡片
                +
                +
                +
                +
                +
                +
                +
                +
                +
                + + +
                +
                +
                + +
                桌面设置
                +
                共 0/3 个自建桌面
                +
                +
                + +
                +
                教师桌面(默认桌面)
                +
                + + 8/8 +
                +
                + +
                + 确认恢复默认设置? +
                + +
                +
                + +
                +
                +
                +
                + +
                +
                OA桌面(默认桌面)
                +
                + + 8/8 +
                +
                + +
                + 确认恢复默认设置? +
                + +
                +
                + +
                +
                +
                +
                +
                + +
                +
                新建桌面
                +
                + + 8/8 +
                +
                +
                + 保存该桌面? +
                + +
                +
                + +
                +
                +
                +
                完成
                +
                +
                + + +
                +
                +
                + +
                +
                + +
                + + + + + @**@ + @**@ + + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/_LayoutSSODrag.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/_LayoutSSODrag.cshtml new file mode 100644 index 000000000..539f88590 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/_LayoutSSODrag.cshtml @@ -0,0 +1,155 @@ +@using Learun.Util + + + + + + + + + + 网上办事大厅拖拽版 + + + + + + + + + + + + + + + + + + + + + + + + + + @{ + var logininfo = LoginUserInfo.Get(); + if (logininfo == null) + { + logininfo = new UserInfo(); + } + } +
                + +
                  +
                  • +
                +
                数字化智慧校园
                +
                + +
                +
                +
                历史
                +
                +
                关闭搜索
                +
                +
                +
                +
                办事大厅模式
                + +
                +
                + +
                +
                +
                +
                @logininfo.realName
                +
                +
                +
                退出
                +
                +
                +
                +
                +
                +
                工号 @logininfo.account
                +
                @logininfo.departmentName @logininfo.roleName
                +
                + +
                +
                + +
                +
                皮肤
                +
                +
                +
                + +
                蓝
                +
                选用皮肤
                +
                + + 使用中 +
                +
                +
                +
                +
                + +
                红
                +
                选用皮肤
                +
                + + 使用中 +
                +
                +
                +
                +
                + +
                绿
                +
                选用皮肤
                +
                + + 使用中 +
                +
                +
                +
                +
                +
                +
                +
                + + 飞星下载 +
                + +
                +
                +
                + @RenderBody() + @Html.AppendJsFile( + "/Views/LR_Content/script/lr-base.js", + "/Views/LR_Content/script/lr-clientdata.js", + "/Views/LR_Content/script/lr-ajax.js" + ) + + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/Module/ModuleEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/Module/ModuleEntity.cs index 9c08baaf1..28cb9e119 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/Module/ModuleEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/Module/ModuleEntity.cs @@ -1,12 +1,13 @@ using Learun.Util; using System; +using System.Collections.Generic; using System.ComponentModel.DataAnnotations.Schema; namespace Learun.Application.Base.SystemModule { /// /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 - /// Copyright (c) 2013-2018 北京泉江科技有限公司 + /// Copyright (c) 2013-2018 数字化校园 /// 创建人：陈彬彬 /// 日 期：2017.03.04 /// 描 述：功能模块 @@ -175,5 +176,23 @@ namespace Learun.Application.Base.SystemModule this.F_ModifyUserName = userInfo.realName; } #endregion + #region 扩展成员 + /// + /// 第一个汉字的拼音首字母 + /// + [NotMapped] + public string FirstLetter { get; set; } + /// + /// 父级名称 + /// + [NotMapped] + public string ParentName { get; set; } + /// + /// 子级列表 + /// + [NotMapped] + public List ChildrenList { get; set; } + + #endregion } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_Desktop/SSO_Drag_CardSortManageMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_Desktop/SSO_Drag_CardSortManageMap.cs new file mode 100644 index 000000000..5262f1f58 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_Desktop/SSO_Drag_CardSortManageMap.cs @@ -0,0 +1,29 @@ +using Learun.Application.TwoDevelopment.LR_Desktop; +using System.Data.Entity.ModelConfiguration; + +namespace Learun.Application.Mapping +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-03-18 09:54 + /// 描 述：网上办事大厅拖拽版-卡片块排序管理 + /// + public class SSO_Drag_CardSortManageMap : EntityTypeConfiguration + { + public SSO_Drag_CardSortManageMap() + { + #region 表、主键 + //表 + this.ToTable("SSO_DRAG_CARDSORTMANAGE"); + //主键 + this.HasKey(t => t.Id); + #endregion + + #region 配置关系 + #endregion + } + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_Desktop/SSO_Drag_DesktopManageMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_Desktop/SSO_Drag_DesktopManageMap.cs new file mode 100644 index 000000000..408815c36 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/LR_Desktop/SSO_Drag_DesktopManageMap.cs @@ -0,0 +1,29 @@ +using Learun.Application.TwoDevelopment.LR_Desktop; +using System.Data.Entity.ModelConfiguration; + +namespace Learun.Application.Mapping +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-03-18 09:47 + /// 描 述：网上办事大厅拖拽版-桌面管理 + /// + public class SSO_Drag_DesktopManageMap : EntityTypeConfiguration + { + public SSO_Drag_DesktopManageMap() + { + #region 表、主键 + //表 + this.ToTable("SSO_DRAG_DESKTOPMANAGE"); + //主键 + this.HasKey(t => t.Id); + #endregion + + #region 配置关系 + #endregion + } + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj index d654231fd..61c2e7fd6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj @@ -112,6 +112,8 @@ + + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoBLL.cs index 096d24999..d7cc9ca4c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoBLL.cs @@ -144,6 +144,28 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } } + /// + /// 教师年龄比例 + /// + /// + public EmpInfoEntity GetEmpInfoAgeRate() + { + try + { + return empInfoService.GetEmpInfoAgeRate(); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } #endregion #region 提交数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoEntity.cs index acdf9eba4..ed9380366 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoEntity.cs @@ -663,6 +663,26 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 获取证书日期 /// [NotMapped] public string CertificateDates { get; set; } + /// + /// 60岁以上 + /// + [NotMapped] public int age1 { get; set; } + /// + /// 50~60岁 + /// + [NotMapped] public int age2 { get; set; } + /// + /// 40~50岁 + /// + [NotMapped] public int age3 { get; set; } + /// + /// 30~40岁 + /// + [NotMapped] public int age4 { get; set; } + /// + /// 20~30岁 + /// + [NotMapped] public int age5 { get; set; } #endregion } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoIBLL.cs index 2c718d4d7..f3d04be4c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoIBLL.cs @@ -38,6 +38,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// IEnumerable GetList(string queryJson); IEnumerable GetEmpInfoEntitiesByName(string name); + + /// + /// 教师年龄比例 + /// + /// + EmpInfoEntity GetEmpInfoAgeRate(); #endregion #region 提交数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs index 9c295387a..b03e465b3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs @@ -349,7 +349,36 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } } - + /// + /// 教师年龄比例 + /// + /// + public EmpInfoEntity GetEmpInfoAgeRate() + { + try + { + var strSql = new StringBuilder(); + strSql.Append(@"select +sum(case when DATEDIFF(YYYY, t.Birthday, GETDATE()) > 60 then 1 else 0 end) as age1, +sum(case when DATEDIFF(YYYY, t.Birthday, GETDATE()) > 50 and DATEDIFF(YYYY, t.Birthday, GETDATE()) <= 60 then 1 else 0 end) as age2, +sum(case when DATEDIFF(YYYY, t.Birthday, GETDATE()) > 40 and DATEDIFF(YYYY, t.Birthday, GETDATE()) <= 50 then 1 else 0 end) as age3, +sum(case when DATEDIFF(YYYY, t.Birthday, GETDATE()) > 30 and DATEDIFF(YYYY, t.Birthday, GETDATE()) <= 40 then 1 else 0 end) as age4, +sum(case when DATEDIFF(YYYY, t.Birthday, GETDATE()) > 20 and DATEDIFF(YYYY, t.Birthday, GETDATE()) <= 30 then 1 else 0 end) as age5 + from empinfo t where t.Birthday is not null"); + return this.BaseRepository("CollegeMIS").FindEntity(strSql.ToString(), null); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } #endregion #region 提交数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoBLL.cs index 64c985466..2dd7f2d23 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoBLL.cs @@ -7,7 +7,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { /// /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 - /// Copyright (c) 2013-2018 北京泉江科技有限公司 + /// Copyright (c) 2013-2018 数字化校园 /// 创 建：超级管理员 /// 日 期：2019-01-24 17:03 /// 描 述：课程信息管理 @@ -212,6 +212,24 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } } + public IEnumerable GetAllList() + { + try + { + return lessonInfoService.GetAllList(); + } + 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/LessonInfo/LessonInfoIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoIBLL.cs index c68ca1d77..bb89e6e35 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoIBLL.cs @@ -6,7 +6,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { /// /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 - /// Copyright (c) 2013-2018 北京泉江科技有限公司 + /// Copyright (c) 2013-2018 数字化校园 /// 创 建：超级管理员 /// 日 期：2019-01-24 17:03 /// 描 述：课程信息管理 @@ -54,6 +54,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// void SaveEntity(string keyValue, LessonInfoEntity entity); IEnumerable GetAllLesson(); + IEnumerable GetAllList(); #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoService.cs index 7b4bba303..2bbbdb6c8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoService.cs @@ -11,7 +11,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { /// /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 - /// Copyright (c) 2013-2018 北京泉江科技有限公司 + /// Copyright (c) 2013-2018 数字化校园 /// 创 建：超级管理员 /// 日 期：2019-01-24 17:03 /// 描 述：课程信息管理 @@ -314,6 +314,24 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } } + public IEnumerable GetAllList() + { + try + { + return this.BaseRepository("CollegeMIS").FindList(); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SYS_SendMessage/SYS_SendMessageBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SYS_SendMessage/SYS_SendMessageBLL.cs index 09db12dc9..68e819a2b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SYS_SendMessage/SYS_SendMessageBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SYS_SendMessage/SYS_SendMessageBLL.cs @@ -7,7 +7,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { /// /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 - /// Copyright (c) 2013-2018 北京泉江科技有限公司 + /// Copyright (c) 2013-2018 数字化校园 /// 创 建：超级管理员 /// 日 期：2019-02-27 11:51 /// 描 述：内部邮件收件箱 @@ -42,6 +42,30 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + public IEnumerable GetList2(string queryJson) + { + try + { + return sYS_SendMessageService.GetList2(queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + public IEnumerable GetList() { try diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SYS_SendMessage/SYS_SendMessageIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SYS_SendMessage/SYS_SendMessageIBLL.cs index 2ad515a25..afbe6229c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SYS_SendMessage/SYS_SendMessageIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SYS_SendMessage/SYS_SendMessageIBLL.cs @@ -6,7 +6,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { /// /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 - /// Copyright (c) 2013-2018 北京泉江科技有限公司 + /// Copyright (c) 2013-2018 数字化校园 /// 创 建：超级管理员 /// 日 期：2019-02-27 11:51 /// 描 述：内部邮件收件箱 @@ -21,6 +21,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 查询参数 /// IEnumerable GetPageList(Pagination pagination, string queryJson); + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + IEnumerable GetList2(string queryJson); /// /// 获取SYS_SendMessage表实体数据 /// 主键 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SYS_SendMessage/SYS_SendMessageService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SYS_SendMessage/SYS_SendMessageService.cs index 03001fee6..61414add6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SYS_SendMessage/SYS_SendMessageService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SYS_SendMessage/SYS_SendMessageService.cs @@ -18,7 +18,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { /// /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 - /// Copyright (c) 2013-2018 北京泉江科技有限公司 + /// Copyright (c) 2013-2018 数字化校园 /// 创 建：超级管理员 /// 日 期：2019-02-27 11:51 /// 描 述：内部邮件收件箱 @@ -89,6 +89,52 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + public IEnumerable GetList2(string queryJson) + { + try + { + var strSql = new StringBuilder(); + strSql.Append("SELECT "); + strSql.Append(@" + t.MESSAGEID, + t.SENDER, + t.RECEIVERToo, + t.RECEIVERS, + t.RECEIVER, + t.TITLE, + t.URL, + t.SENDTIME,t.SendFLAG,t.SENDERID + "); + strSql.Append(" FROM SYS_SendMessage t "); + strSql.Append(" WHERE 1=1 "); + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + if (!queryParam["userId"].IsEmpty()) + { + dp.Add("userId", "" + queryParam["userId"].ToString() + "", DbType.String); + strSql.Append(" AND t.SENDERID=@userId "); + } + return this.BaseRepository().FindList(strSql.ToString(), dp); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + /// /// 获取SYS_SendMessage表实体数据 /// 主键 @@ -296,7 +342,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration string access_token = weixintokenobj.access_token; string jsondata = "{\"touser\":\"" + userinfo.OpenIdForWeixin + "\"," + "\"template_id\":\"" + weixintasktempid + "\"," + - "\"url\":\"" + weixintaskurl + "\"," + + "\"url\":\"" + weixintaskurl + "/#/?page=mail\"," + "\"data\":{" + "\"first\": {\"value\":\"您有新的未读邮件\",\"color\":\"#173177\"}," + "\"keyword1\":{\"value\":\"未读邮件\",\"color\":\"#173177\"}," + @@ -313,6 +359,30 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + /// + /// 站内消息提醒 + /// + /// + /// + public void PushMessageRemind(List needpostuserlist, SYS_SendMessageEntity model) + { + foreach (UserEntity userinfo in needpostuserlist) + { + MessageRemindEntity entity = new MessageRemindEntity(); + entity.ReceiptId = userinfo.F_UserId; + entity.ReceiptName = userinfo.F_RealName; + entity.SenderId = model.SENDERID; + entity.SenderName = model.SENDER; + entity.TheTitle = "内部邮件"; + entity.TheContent = model.TITLE + ":" + model.CONTENTS; + entity.InstanceId = model.MESSAGEID; + entity.ConnectionUrl = "/EducationalAdministration/SYS_SendMessage/FormView?keyValue="; + entity.SendTime = DateTime.Now; + entity.ReadSigns = false; + this.BaseRepository().Insert(entity); + } + } + public IEnumerable GetList() { try diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuConsumption/StuConsumptionBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuConsumption/StuConsumptionBLL.cs index 1769a4bef..66540fd74 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuConsumption/StuConsumptionBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuConsumption/StuConsumptionBLL.cs @@ -7,7 +7,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { /// /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 - /// Copyright (c) 2013-2018 北京泉江科技有限公司 + /// Copyright (c) 2013-2018 数字化校园 /// 创 建：超级管理员 /// 日 期：2020-01-17 15:31 /// 描 述：学生消费记录 @@ -91,6 +91,30 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + public IEnumerable GetListByAccount(string account) + { + try + { + return stuConsumptionService.GetListByAccount(account); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + #endregion #region 提交数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuConsumption/StuConsumptionIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuConsumption/StuConsumptionIBLL.cs index b71e6624f..e6e678bea 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuConsumption/StuConsumptionIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuConsumption/StuConsumptionIBLL.cs @@ -6,7 +6,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { /// /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 - /// Copyright (c) 2013-2018 北京泉江科技有限公司 + /// Copyright (c) 2013-2018 数字化校园 /// 创 建：超级管理员 /// 日 期：2020-01-17 15:31 /// 描 述：学生消费记录 @@ -34,6 +34,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// StuConsumptionEntity GetStuConsumptionEntity(string keyValue); + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + IEnumerable GetListByAccount(string account); #endregion #region 提交数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuConsumption/StuConsumptionService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuConsumption/StuConsumptionService.cs index 30b050362..dd11834a2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuConsumption/StuConsumptionService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuConsumption/StuConsumptionService.cs @@ -10,7 +10,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { /// /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 - /// Copyright (c) 2013-2018 北京泉江科技有限公司 + /// Copyright (c) 2013-2018 数字化校园 /// 创 建：超级管理员 /// 日 期：2020-01-17 15:31 /// 描 述：学生消费记录 @@ -96,7 +96,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("CARDSN", "%" + queryParam["CARDSN"].ToString() + "%", DbType.String); strSql.Append(" AND t.CARDSN Like @CARDSN "); } - return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp, pagination); + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); } catch (Exception ex) { @@ -172,7 +172,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("CARDSN", "%" + queryParam["CARDSN"].ToString() + "%", DbType.String); strSql.Append(" AND t.CARDSN Like @CARDSN "); } - return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp); + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp); } catch (Exception ex) { @@ -211,6 +211,30 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + public IEnumerable GetListByAccount(string account) + { + try + { + return this.BaseRepository("CollegeMIS").FindList(x => x.OUTID == account); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + #endregion #region 提交数据 @@ -224,7 +248,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { try { - this.BaseRepository("CollegeMIS").Delete(t=>t.SID == keyValue); + this.BaseRepository("CollegeMIS").Delete(t => t.SID == keyValue); } catch (Exception ex) { @@ -244,13 +268,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 主键 /// /// - public void SaveEntity( UserInfo userInfo, string keyValue, StuConsumptionEntity entity) + public void SaveEntity(UserInfo userInfo, string keyValue, StuConsumptionEntity entity) { try { if (!string.IsNullOrEmpty(keyValue)) { - entity.Modify(keyValue,userInfo); + entity.Modify(keyValue, userInfo); this.BaseRepository("CollegeMIS").Update(entity); } else diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_CardSortManage/SSO_Drag_CardSortManageBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_CardSortManage/SSO_Drag_CardSortManageBLL.cs new file mode 100644 index 000000000..4f7d734d3 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_CardSortManage/SSO_Drag_CardSortManageBLL.cs @@ -0,0 +1,169 @@ +using Learun.Util; +using System; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.LR_Desktop +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-03-18 09:54 + /// 描 述：网上办事大厅拖拽版-卡片块排序管理 + /// + public class SSO_Drag_CardSortManageBLL : SSO_Drag_CardSortManageIBLL + { + private SSO_Drag_CardSortManageService sSO_Drag_CardSortManageService = new SSO_Drag_CardSortManageService(); + + #region 获取数据 + + /// + /// 获取列表数据 + /// + /// 查询参数 + /// + public IEnumerable GetList( string queryJson ) + { + try + { + return sSO_Drag_CardSortManageService.GetList(queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 获取列表分页数据 + /// + /// 分页参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + return sSO_Drag_CardSortManageService.GetPageList(pagination, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 获取实体数据 + /// + /// 主键 + /// + public SSO_Drag_CardSortManageEntity GetEntity(string keyValue) + { + try + { + return sSO_Drag_CardSortManageService.GetEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + public void DeleteEntity(string keyValue) + { + try + { + sSO_Drag_CardSortManageService.DeleteEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + public void SaveEntity(string keyValue, SSO_Drag_CardSortManageEntity entity) + { + try + { + sSO_Drag_CardSortManageService.SaveEntity(keyValue, entity); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 保存卡片块排序 + /// + public void SaveCardSort(string userId, string modelCode, string desktopId, string cardSort) + { + try + { + sSO_Drag_CardSortManageService.SaveCardSort(userId, modelCode, desktopId, cardSort); + } + 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/SSO_Drag_CardSortManage/SSO_Drag_CardSortManageEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_CardSortManage/SSO_Drag_CardSortManageEntity.cs new file mode 100644 index 000000000..ba8a007d7 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_CardSortManage/SSO_Drag_CardSortManageEntity.cs @@ -0,0 +1,68 @@ +using Learun.Util; +using System; +using System.ComponentModel.DataAnnotations.Schema; +namespace Learun.Application.TwoDevelopment.LR_Desktop + +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-03-18 09:54 + /// 描 述：网上办事大厅拖拽版-卡片块排序管理 + /// + public class SSO_Drag_CardSortManageEntity + { + #region 实体成员 + /// + /// 主键 + /// + /// + [Column("ID")] + public string Id { get; set; } + /// + /// 用户 + /// + /// + [Column("USERID")] + public string UserId { get; set; } + /// + /// 模式编号：0办事大厅模式，1效率优先模式，2管理驾驶舱模式 + /// + /// + [Column("MODELCODE")] + public string ModelCode { get; set; } + /// + /// 桌面Id + /// + /// + [Column("DESKTOPID")] + public string DesktopId { get; set; } + /// + /// 卡片块排序 + /// + /// + [Column("CARDSORT")] + public string CardSort { get; set; } + #endregion + + #region 扩展操作 + /// + /// 新增调用 + /// + public void Create() + { + this.Id = Guid.NewGuid().ToString(); + } + /// + /// 编辑调用 + /// + /// + public void Modify(string keyValue) + { + this.Id = keyValue; + } + #endregion + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_CardSortManage/SSO_Drag_CardSortManageIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_CardSortManage/SSO_Drag_CardSortManageIBLL.cs new file mode 100644 index 000000000..f38f729f2 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_CardSortManage/SSO_Drag_CardSortManageIBLL.cs @@ -0,0 +1,60 @@ +using Learun.Util; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.LR_Desktop +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-03-18 09:54 + /// 描 述：网上办事大厅拖拽版-卡片块排序管理 + /// + public interface SSO_Drag_CardSortManageIBLL + { + #region 获取数据 + + /// + /// 获取列表数据 + /// + /// 查询参数 + /// + IEnumerable GetList(string queryJson); + /// + /// 获取列表分页数据 + /// + /// 分页参数 + /// 查询参数 + /// + IEnumerable GetPageList(Pagination pagination, string queryJson); + /// + /// 获取实体数据 + /// + /// 主键 + /// + SSO_Drag_CardSortManageEntity GetEntity(string keyValue); + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + void DeleteEntity(string keyValue); + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + void SaveEntity(string keyValue, SSO_Drag_CardSortManageEntity entity); + + /// + /// 保存卡片块排序 + /// + void SaveCardSort(string userId, string modelCode, string desktopId, string cardSort); + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_CardSortManage/SSO_Drag_CardSortManageService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_CardSortManage/SSO_Drag_CardSortManageService.cs new file mode 100644 index 000000000..89d070705 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_CardSortManage/SSO_Drag_CardSortManageService.cs @@ -0,0 +1,216 @@ +using Dapper; +using Learun.DataBase.Repository; +using Learun.Util; +using System; +using System.Collections.Generic; +using System.Data; +using System.Text; + +namespace Learun.Application.TwoDevelopment.LR_Desktop +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-03-18 09:54 + /// 描 述：网上办事大厅拖拽版-卡片块排序管理 + /// + public class SSO_Drag_CardSortManageService : RepositoryFactory + { + #region 构造函数和属性 + + private string fieldSql; + /// + /// 构造方法 + /// + public SSO_Drag_CardSortManageService() + { + fieldSql = @" + t.Id, + t.UserId, + t.ModelCode, + t.DesktopId, + t.CardSort + "; + } + #endregion + + #region 获取数据 + + /// + /// 获取列表数据 + /// + /// 条件参数 + /// + public IEnumerable GetList(string queryJson) + { + try + { + //参考写法 + //var queryParam = queryJson.ToJObject(); + // 虚拟参数 + //var dp = new DynamicParameters(new { }); + //dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime); + var strSql = new StringBuilder(); + strSql.Append("SELECT "); + strSql.Append(fieldSql); + strSql.Append(" FROM SSO_Drag_CardSortManage t "); + return this.BaseRepository().FindList(strSql.ToString()); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取列表分页数据 + /// + /// 分页参数 + /// 条件参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + var strSql = new StringBuilder(); + strSql.Append("SELECT "); + strSql.Append(fieldSql); + strSql.Append(" FROM SSO_Drag_CardSortManage t "); + return this.BaseRepository().FindList(strSql.ToString(), pagination); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取实体数据 + /// + /// 主键 + /// + public SSO_Drag_CardSortManageEntity GetEntity(string keyValue) + { + try + { + return this.BaseRepository().FindEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + public void DeleteEntity(string keyValue) + { + try + { + this.BaseRepository().Delete(t => t.Id == keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 保存实体数据（新增、修改） + /// 主键 + /// 实体 + /// + public void SaveEntity(string keyValue, SSO_Drag_CardSortManageEntity entity) + { + try + { + if (!string.IsNullOrEmpty(keyValue)) + { + entity.Modify(keyValue); + this.BaseRepository().Update(entity); + } + else + { + entity.Create(); + this.BaseRepository().Insert(entity); + } + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 保存卡片块排序 + /// + public void SaveCardSort(string userId, string modelCode, string desktopId, string cardSort) + { + try + { + var model = this.BaseRepository().FindEntity(x => x.UserId == userId && x.ModelCode == modelCode && x.DesktopId == desktopId); + if (model != null) + { + model.CardSort = cardSort; + this.BaseRepository().Update(model); + } + } + 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/SSO_Drag_DesktopManage/SSO_Drag_DesktopManageBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_DesktopManage/SSO_Drag_DesktopManageBLL.cs new file mode 100644 index 000000000..e96a4e839 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_DesktopManage/SSO_Drag_DesktopManageBLL.cs @@ -0,0 +1,261 @@ +using Learun.Util; +using System; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.LR_Desktop +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-03-18 09:47 + /// 描 述：网上办事大厅拖拽版-桌面管理 + /// + public class SSO_Drag_DesktopManageBLL : SSO_Drag_DesktopManageIBLL + { + private SSO_Drag_DesktopManageService sSO_Drag_DesktopManageService = new SSO_Drag_DesktopManageService(); + + #region 获取数据 + + /// + /// 获取列表数据 + /// + /// 查询参数 + /// + public IEnumerable GetList( string queryJson ) + { + try + { + return sSO_Drag_DesktopManageService.GetList(queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 获取列表分页数据 + /// + /// 分页参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + return sSO_Drag_DesktopManageService.GetPageList(pagination, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 获取实体数据 + /// + /// 主键 + /// + public SSO_Drag_DesktopManageEntity GetEntity(string keyValue) + { + try + { + return sSO_Drag_DesktopManageService.GetEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + /// + /// 获取列表数据 + /// + /// 条件参数 + /// + public IEnumerable GetListByModelCode(string userId, string modelCode) + { + try + { + return sSO_Drag_DesktopManageService.GetListByModelCode(userId, modelCode); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 获取实体数据 + /// + /// + public SSO_Drag_DesktopManageEntity GetEntityByDesktopCode(string userId, string modelCode, string desktopCode) + { + try + { + return sSO_Drag_DesktopManageService.GetEntityByDesktopCode(userId, modelCode, desktopCode); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + public void DeleteEntity(string keyValue) + { + try + { + sSO_Drag_DesktopManageService.DeleteEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + public void SaveEntity(string keyValue, SSO_Drag_DesktopManageEntity entity) + { + try + { + sSO_Drag_DesktopManageService.SaveEntity(keyValue, entity); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + + /// + /// 桌面管理表、卡片块排序管理表增加默认数据 + /// 用户ID + /// 模式编号 + /// + public void AddDefaultData(string userId, string modelCode) + { + try + { + sSO_Drag_DesktopManageService.AddDefaultData(userId, modelCode); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 新建桌面 + /// + public void AddDesktop(string userId, string modelCode, string desktopName, string desktopCode) + { + try + { + sSO_Drag_DesktopManageService.AddDesktop(userId, modelCode, desktopName, desktopCode); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 默认桌面恢复默认设置 + /// + public void RestoreDefaultDesktop(string desktopId) + { + try + { + sSO_Drag_DesktopManageService.RestoreDefaultDesktop(desktopId); + } + 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/SSO_Drag_DesktopManage/SSO_Drag_DesktopManageEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_DesktopManage/SSO_Drag_DesktopManageEntity.cs new file mode 100644 index 000000000..66ed51133 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_DesktopManage/SSO_Drag_DesktopManageEntity.cs @@ -0,0 +1,99 @@ +using Learun.Util; +using System; +using System.ComponentModel.DataAnnotations.Schema; +namespace Learun.Application.TwoDevelopment.LR_Desktop + +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-03-18 09:47 + /// 描 述：网上办事大厅拖拽版-桌面管理 + /// + public class SSO_Drag_DesktopManageEntity + { + #region 实体成员 + /// + /// 主键 + /// + /// + [Column("ID")] + public string Id { get; set; } + /// + /// 用户 + /// + /// + [Column("USERID")] + public string UserId { get; set; } + /// + /// 模式编号：one办事大厅模式，two效率优先模式，three管理驾驶舱模式 + /// + /// + [Column("MODELCODE")] + public string ModelCode { get; set; } + /// + /// 桌面名称 + /// + /// + [Column("DESKTOPNAME")] + public string DesktopName { get; set; } + /// + /// 桌面编号 + /// + /// + [Column("DESKTOPCODE")] + public string DesktopCode { get; set; } + /// + /// 排序号 + /// + /// + [Column("SORT")] + public string Sort { get; set; } + /// + /// 默认标识：1为默认桌面，0为自建桌面 + /// + /// + [Column("DEFAULTFLAG")] + public string DefaultFlag { get; set; } + /// + /// 默认名称 + /// + /// + [Column("DEFAULTNAME")] + public string DefaultName { get; set; } + /// + /// 创建时间 + /// + /// + [Column("CREATEDATE")] + public DateTime? CreateDate { get; set; } + #endregion + + #region 扩展操作 + /// + /// 新增调用 + /// + public void Create() + { + this.Id = Guid.NewGuid().ToString(); + } + /// + /// 编辑调用 + /// + /// + public void Modify(string keyValue) + { + this.Id = keyValue; + } + #endregion + #region 扩展数据 + /// + /// 卡片块排序 + /// + [NotMapped] + public string CardSort { get; set; } + #endregion + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_DesktopManage/SSO_Drag_DesktopManageIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_DesktopManage/SSO_Drag_DesktopManageIBLL.cs new file mode 100644 index 000000000..6945e0614 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_DesktopManage/SSO_Drag_DesktopManageIBLL.cs @@ -0,0 +1,85 @@ +using Learun.Util; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.LR_Desktop +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-03-18 09:47 + /// 描 述：网上办事大厅拖拽版-桌面管理 + /// + public interface SSO_Drag_DesktopManageIBLL + { + #region 获取数据 + + /// + /// 获取列表数据 + /// + /// 查询参数 + /// + IEnumerable GetList(string queryJson); + /// + /// 获取列表分页数据 + /// + /// 分页参数 + /// 查询参数 + /// + IEnumerable GetPageList(Pagination pagination, string queryJson); + /// + /// 获取实体数据 + /// + /// 主键 + /// + SSO_Drag_DesktopManageEntity GetEntity(string keyValue); + /// + /// 获取列表数据 + /// + /// 条件参数 + /// + IEnumerable GetListByModelCode(string userId, string modelCode); + + /// + /// 获取实体数据 + /// + /// + SSO_Drag_DesktopManageEntity GetEntityByDesktopCode(string userId, string modelCode, string desktopCode); + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + void DeleteEntity(string keyValue); + /// + /// 保存实体数据（新增、修改） + /// + /// 主键 + /// 实体 + void SaveEntity(string keyValue, SSO_Drag_DesktopManageEntity entity); + + + /// + /// 桌面管理表、卡片块排序管理表增加默认数据 + /// 用户ID + /// 模式编号 + /// + void AddDefaultData(string userId, string modelCode); + + /// + /// 新建桌面 + /// + void AddDesktop(string userId, string modelCode, string desktopName, string desktopCode); + + /// + /// 默认桌面恢复默认设置 + /// + void RestoreDefaultDesktop(string desktopId); + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_DesktopManage/SSO_Drag_DesktopManageService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_DesktopManage/SSO_Drag_DesktopManageService.cs new file mode 100644 index 000000000..ca8ae6f7b --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/SSO_Drag_DesktopManage/SSO_Drag_DesktopManageService.cs @@ -0,0 +1,426 @@ +using Dapper; +using Learun.DataBase.Repository; +using Learun.Util; +using System; +using System.Collections.Generic; +using System.Data; +using System.Text; + +namespace Learun.Application.TwoDevelopment.LR_Desktop +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-03-18 09:47 + /// 描 述：网上办事大厅拖拽版-桌面管理 + /// + public class SSO_Drag_DesktopManageService : RepositoryFactory + { + #region 构造函数和属性 + + private string fieldSql; + /// + /// 构造方法 + /// + public SSO_Drag_DesktopManageService() + { + fieldSql = @" + t.Id, + t.UserId, + t.ModelCode, + t.DesktopName, + t.DesktopCode, + t.Sort + "; + } + #endregion + + #region 获取数据 + + /// + /// 获取列表数据 + /// + /// 条件参数 + /// + public IEnumerable GetList(string queryJson) + { + try + { + //参考写法 + //var queryParam = queryJson.ToJObject(); + // 虚拟参数 + //var dp = new DynamicParameters(new { }); + //dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime); + var strSql = new StringBuilder(); + strSql.Append("SELECT t.*,c.CardSort "); + strSql.Append(" FROM SSO_Drag_DesktopManage t left join SSO_Drag_CardSortManage c on t.Id=c.DesktopId "); + return this.BaseRepository().FindList(strSql.ToString()); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取列表分页数据 + /// + /// 分页参数 + /// 条件参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + var strSql = new StringBuilder(); + strSql.Append("SELECT "); + strSql.Append(fieldSql); + strSql.Append(" FROM SSO_Drag_DesktopManage t "); + return this.BaseRepository().FindList(strSql.ToString(), pagination); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取实体数据 + /// + /// 主键 + /// + public SSO_Drag_DesktopManageEntity GetEntity(string keyValue) + { + try + { + return this.BaseRepository().FindEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + /// + /// 获取列表数据 + /// + /// 条件参数 + /// + public IEnumerable GetListByModelCode(string userId, string modelCode) + { + try + { + var strSql = new StringBuilder(); + strSql.Append("SELECT t.*,c.CardSort "); + strSql.Append(" FROM SSO_Drag_DesktopManage t left join SSO_Drag_CardSortManage c on t.Id=c.DesktopId "); + strSql.Append(" where t.UserId='" + userId + "' and t.ModelCode='" + modelCode + "' "); + return this.BaseRepository().FindList(strSql.ToString()); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取实体数据 + /// + /// + public SSO_Drag_DesktopManageEntity GetEntityByDesktopCode(string userId, string modelCode, string desktopCode) + { + try + { + return this.BaseRepository().FindEntity(x => x.UserId == userId && x.ModelCode == modelCode && x.DesktopCode == desktopCode); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// 主键 + public void DeleteEntity(string keyValue) + { + var db = this.BaseRepository().BeginTrans(); + try + { + //this.BaseRepository().Delete(t => t.Id == keyValue); + //删除卡片块排序 + db.Delete(x => x.DesktopId == keyValue); + //删除桌面 + db.Delete(x => x.Id == keyValue); + db.Commit(); + } + catch (Exception ex) + { + db.Rollback(); + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 保存实体数据（新增、修改） + /// 主键 + /// 实体 + /// + public void SaveEntity(string keyValue, SSO_Drag_DesktopManageEntity entity) + { + try + { + if (!string.IsNullOrEmpty(keyValue)) + { + entity.Modify(keyValue); + this.BaseRepository().Update(entity); + } + else + { + entity.Create(); + this.BaseRepository().Insert(entity); + } + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + + /// + /// 桌面管理表、卡片块排序管理表增加默认数据 + /// 用户ID + /// 模式编号 + /// + public void AddDefaultData(string userId, string modelCode) + { + var db = this.BaseRepository().BeginTrans(); + try + { + var now = DateTime.Now; + //判断用户是否存在默认数据：不存在则增加； + var desktopEntity = db.FindEntity(x => x.UserId == userId && x.ModelCode == modelCode && x.DesktopCode == "teacherDesktop"); + if (desktopEntity == null) + { + //默认数据为：教师桌面（模式一卡片块排序为：card1,card2,card3,card4,card5,card6,card7,card8,card9,card10,card11,card12,card13；模式二的卡片块排序为：card2,card3,card4,card5,card6,card7,card8,card9,card10,card11,card12,card13）、OA办公桌面（）、 + var cardSortInOne = "card1,card2,card3,card4,card5,card6,card7,card8,card9,card10,card11,card12,card13"; + var cardSortInTwo = "card2,card3,card4,card5,card6,card7,card8,card9,card10,card11,card12,card13"; + var desktopModel1 = new SSO_Drag_DesktopManageEntity() + { + UserId = userId, + ModelCode = modelCode, + DesktopName = "教师桌面", + DesktopCode = "teacherDesktop", + Sort = "0", + DefaultFlag = "1", + DefaultName = "教师桌面", + CreateDate = now + }; + desktopModel1.Create(); + db.Insert(desktopModel1); + var desktopModel2 = new SSO_Drag_DesktopManageEntity() + { + UserId = userId, + ModelCode = modelCode, + DesktopName = "OA办公桌面", + DesktopCode = "workDesktop", + Sort = "1", + DefaultFlag = "1", + DefaultName = "OA办公桌面", + CreateDate = now + }; + desktopModel2.Create(); + db.Insert(desktopModel2); + var cardSortModel1 = new SSO_Drag_CardSortManageEntity() + { + UserId = userId, + ModelCode = modelCode, + DesktopId = desktopModel1.Id, + CardSort = modelCode == "one" ? cardSortInOne : cardSortInTwo + }; + cardSortModel1.Create(); + db.Insert(cardSortModel1); + var cardSortModel2 = new SSO_Drag_CardSortManageEntity() + { + UserId = userId, + ModelCode = modelCode, + DesktopId = desktopModel2.Id, + CardSort = "" + }; + cardSortModel2.Create(); + db.Insert(cardSortModel2); + + } + + + db.Commit(); + } + catch (Exception ex) + { + db.Rollback(); + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + + /// + /// 新建桌面 + /// + public void AddDesktop(string userId, string modelCode, string desktopName, string desktopCode) + { + var db = this.BaseRepository().BeginTrans(); + try + { + //增加桌面数据 + var desktopModel = new SSO_Drag_DesktopManageEntity() + { + UserId = userId, + ModelCode = modelCode, + DesktopName = desktopName, + DesktopCode = desktopCode, + Sort = "2", + DefaultFlag = "0", + CreateDate = DateTime.Now + }; + desktopModel.Create(); + db.Insert(desktopModel); + //增加卡片块排序数据 + var cardModel = new SSO_Drag_CardSortManageEntity() + { + UserId = userId, + ModelCode = modelCode, + DesktopId = desktopModel.Id, + CardSort = "" + }; + cardModel.Create(); + db.Insert(cardModel); + + db.Commit(); + } + catch (Exception ex) + { + db.Rollback(); + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 默认桌面恢复默认设置 + /// + public void RestoreDefaultDesktop(string desktopId) + { + var db = this.BaseRepository().BeginTrans(); + try + { + //桌面 + var desktopEntity = db.FindEntity(x => x.Id == desktopId); + if (desktopEntity != null && desktopEntity.DefaultFlag == "1") + { + desktopEntity.DesktopName = desktopEntity.DefaultName; + db.Update(desktopEntity); + //卡片块排序 + var cardEntity = db.FindEntity(x => x.DesktopId == desktopEntity.Id); + if (cardEntity != null) + { + if (desktopEntity.DesktopCode == "teacherDesktop") + { + var cardSortInOne = "card1,card2,card3,card4,card5,card6,card7,card8,card9,card10,card11,card12,card13"; + var cardSortInTwo = "card2,card3,card4,card5,card6,card7,card8,card9,card10,card11,card12,card13"; + + cardEntity.CardSort = desktopEntity.ModelCode == "one" ? cardSortInOne : cardSortInTwo; + } + else + { + cardEntity.CardSort = ""; + } + db.Update(cardEntity); + } + } + + db.Commit(); + } + catch (Exception ex) + { + db.Rollback(); + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj index e177f9df0..3f67b7e8a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj @@ -264,6 +264,14 @@ + + + + + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Permission/Perm_Function/Perm_FunctionEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Permission/Perm_Function/Perm_FunctionEntity.cs index 604923806..e65f43c53 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Permission/Perm_Function/Perm_FunctionEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Permission/Perm_Function/Perm_FunctionEntity.cs @@ -1,5 +1,6 @@ using Learun.Util; using System; +using System.Collections.Generic; using System.ComponentModel.DataAnnotations.Schema; namespace Learun.Application.TwoDevelopment.Permission @@ -99,6 +100,11 @@ namespace Learun.Application.TwoDevelopment.Permission [NotMapped] public string UPId { get; set; } + /// + /// 子项列表 + /// + [NotMapped] + public List PFunctionList { get; set; } #endregion } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/StuSaverecord/StuSaverecordBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/StuSaverecord/StuSaverecordBLL.cs index 8c5caa85b..60fb467f2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/StuSaverecord/StuSaverecordBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/StuSaverecord/StuSaverecordBLL.cs @@ -7,7 +7,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement { /// /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 - /// Copyright (c) 2013-2018 北京泉江科技有限公司 + /// Copyright (c) 2013-2018 数字化校园 /// 创 建：超级管理员 /// 日 期：2020-05-08 15:48 /// 描 述：学生充值记录 @@ -66,6 +66,31 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement } } + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + public IEnumerable GetListByAccount(string account) + { + try + { + return stuSaverecordService.GetListByAccount(account); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + #endregion #region 提交数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/StuSaverecord/StuSaverecordIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/StuSaverecord/StuSaverecordIBLL.cs index 1b63d65a7..c808665f4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/StuSaverecord/StuSaverecordIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/StuSaverecord/StuSaverecordIBLL.cs @@ -6,7 +6,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement { /// /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 - /// Copyright (c) 2013-2018 北京泉江科技有限公司 + /// Copyright (c) 2013-2018 数字化校园 /// 创 建：超级管理员 /// 日 期：2020-05-08 15:48 /// 描 述：学生充值记录 @@ -27,6 +27,13 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement /// /// StuSaveRecordEntity GetStuSaveRecordEntity(string keyValue); + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + IEnumerable GetListByAccount(string account); #endregion #region 提交数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/StuSaverecord/StuSaverecordService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/StuSaverecord/StuSaverecordService.cs index f04947c48..15002448a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/StuSaverecord/StuSaverecordService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/StuSaverecord/StuSaverecordService.cs @@ -10,7 +10,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement { /// /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 - /// Copyright (c) 2013-2018 北京泉江科技有限公司 + /// Copyright (c) 2013-2018 数字化校园 /// 创 建：超级管理员 /// 日 期：2020-05-08 15:48 /// 描 述：学生充值记录 @@ -132,6 +132,30 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement } } + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + public IEnumerable GetListByAccount(string account) + { + try + { + return this.BaseRepository("CollegeMIS").FindList(x => x.OUTID == account); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + #endregion #region 提交数据 From 68fec24e5655b7fdc3727a8a4ac3b111ebed9df2 Mon Sep 17 00:00:00 2001 From: liangkun Date: Fri, 20 Aug 2021 18:20:40 +0800 Subject: [PATCH 04/16] =?UTF-8?q?h5=E5=AE=8C=E5=96=84=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=90=8E=E8=B7=B3=E8=BD=AC=E5=88=B0=E6=8A=A5=E9=81=93=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../www/pages/welcome/welcome.html | 12 ++++++------ .../www/pages/welcome/welcome.js | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.html index 7f851cd28..3d4ca9fe2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.html +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.html @@ -80,9 +80,9 @@
                3 . 文件大小165320KB以下
                -
                +
                @@ -133,9 +133,9 @@
                添加紧急联系人
                -
                +
                @@ -155,9 +155,9 @@
                -
                +
                diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.js index 202bae52e..a54a660ff 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.js @@ -266,6 +266,8 @@ learun.layer.loading(false); if (data) { learun.layer.toast('保存成功'); + learun.nav.closeCurrent(); + learun.nav.go({ path: 'notice2', title: '新生入校流程', type: 'right' }); } }); From 9218faa6ef45f337ea29b76c10833ac0fbd002c9 Mon Sep 17 00:00:00 2001 From: liangkun Date: Tue, 24 Aug 2021 18:15:32 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E6=8B=9B=E7=94=9F=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RegisterQRCode/RegisterQRCode.html | 6 ++++-- .../StuInfoFresh/RegisterQRCode/RegisterQRCode.js | 6 ++++-- .../StuInfoFresh/StudentLoan/StudentLoan.html | 8 +++++++- .../StuInfoFresh/StudentLoan/StudentLoan.js | 14 +++++++++++--- .../www/pages/notice2/notice2.html | 6 +++--- .../www/pages/notice2/notice2.js | 10 +++++----- .../www/pages/welcome/welcome.html | 2 +- .../Views/StuInfoFresh/PayFeeIndex.js | 11 +++++++++++ .../Modules/StuInfoFreshApi.cs | 6 +++++- .../StuInfoFresh/StuInfoFreshEntity.cs | 6 ++++++ 10 files changed, 57 insertions(+), 18 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.html index b46fee571..e3d11fd70 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.html +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.html @@ -17,11 +17,13 @@
                专业
                班级
                教室
                +
                学号
                +
                寝室号
                -
                +
                辅导员姓名
                辅导员电话
                diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.js index 555a73aad..482532ff9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.js @@ -42,9 +42,11 @@ $('.sQrList strong').eq(2).html(data.StuInfoFreshEntity.MajorNo); $('.sQrList strong').eq(3).html(data.StuInfoFreshEntity.ClassNo); $('.sQrList strong').eq(4).html(data.StuInfoFreshEntity.DefaultClassRoomName); + $('.sQrList strong').eq(5).html(data.StuInfoFreshEntity.StuNo); + $('.sQrList strong').eq(6).html(data.StuInfoFreshEntity.DormitoryName); //班主任 - $('.sQrText span').eq(0).html(data.StuInfoFreshEntity.ClassDiredctorName != null ? data.StuInfoFreshEntity.ClassDiredctorName.slice(0, 1) + "老师" : ""); - $('.sQrText span').eq(1).html(data.StuInfoFreshEntity.ClassDiredctorMobile); + // $('.sQrText span').eq(0).html(data.StuInfoFreshEntity.ClassDiredctorName != null ? data.StuInfoFreshEntity.ClassDiredctorName.slice(0, 1) + "老师" : ""); + // $('.sQrText span').eq(1).html(data.StuInfoFreshEntity.ClassDiredctorMobile); //辅导员 $('.sQrText span').eq(2).html(data.StuInfoFreshEntity.ClassTutorName != null ? data.StuInfoFreshEntity.ClassTutorName.slice(0, 1) + "老师" : ""); $('.sQrText span').eq(3).html(data.StuInfoFreshEntity.ClassTutorMobile); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.html index 48b742e7c..1bc1d21c8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.html +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.html @@ -1,11 +1,17 @@ -
                +
                贷款回执码 + 办理贷款状态 +
                +
                + 办理贷款状态 +
                +
                diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.js index a07fb1e1d..2a79d2269 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.js @@ -1,4 +1,4 @@ -(function () { +(function () { var page = { isScroll: false, init: function ($page) { @@ -29,11 +29,15 @@ var postdata = { ID: $('#ID').val(), StudentLoan: $('#StudentLoan').val(), - StudentLoanStatus: "0" + StudentLoanStatus: "0", + StudentLoanBLStatus:$("#StudentLoanBLStatus").lrselectGet(); }; if ($('#StudentLoan').val().trim() != null && $('#StudentLoan').val().trim() != "" && $('#StudentLoan').val().trim() != undefined) { postdata.StudentLoanStatus = "1"; } + if ($('#StudentLoanBLStatus').lrselectGet().trim() != null && $('#StudentLoanBLStatus').lrselectGet().trim() != "" && $('#StudentLoanBLStatus').lrselectGet().trim() != undefined) { + postdata.StudentLoanBLStatus = "2"; + } learun.httpget(config.webapi + "StuInfoFresh/saveLoan", postdata, (data) => { if (data) { learun.layer.toast('保存成功'); @@ -47,7 +51,11 @@ }, bind: function ($page) { - + $page.find('#StudentLoanBLStatus').lrselect({ + type: 'StudentLoanBLStatus', + needPre:false + }); + } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.html index c46ad1698..38d75aa25 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.html +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.html @@ -24,7 +24,7 @@
                线上缴费 - ( 已缴费、未缴费 ) + (地址：http://onlinepay.xcmzyz.com/)
                未完成
                @@ -36,14 +36,14 @@
                未完成
                -
                +
                diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.js index ec11bc7c0..d89cc5377 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.js @@ -29,11 +29,11 @@ } else { notCompleteStyle("#StudentLoan", "images/enter2-3.png"); } - if (data["StuInfoFreshEntity"].OnsitePayFeeStatus == "1") { - completeStyle("#OnsitePayFeeStatus", "images/enter1-4.png"); - } else { - notCompleteStyle("#OnsitePayFeeStatus", "images/enter2-4.png"); - } + // if (data["StuInfoFreshEntity"].OnsitePayFeeStatus == "1") { + // completeStyle("#OnsitePayFeeStatus", "images/enter1-4.png"); + // } else { + // notCompleteStyle("#OnsitePayFeeStatus", "images/enter2-4.png"); + // } if (data["StuInfoFreshEntity"].RegisterStatus == "1") { completeStyle("#RegisterStatus", "images/enter1-5.png"); } else { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.html index 3d4ca9fe2..ae54c78b8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.html +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.html @@ -102,7 +102,7 @@
                联系电话 - +
                紧急联系人
                diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js index c77612a65..d4fc9c4a8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js @@ -220,6 +220,17 @@ var bootstrap = function ($, learun) { } }, { label: '线上缴费时间', name: 'PayFeeDate', width: 130, align: "left" }, + { + label: '办理贷款状态', name: 'StudentLoanBLStatus', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'StudentLoanBLStatus', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, { label: '贷款回执码', name: 'StudentLoan', width: 130, align: "left" }, { label: '助学贷款状态', name: 'StudentLoanStatus', width: 100, align: "left", formatter: function (value) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuInfoFreshApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuInfoFreshApi.cs index 37e2fb22e..40e75f9a5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuInfoFreshApi.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuInfoFreshApi.cs @@ -382,7 +382,11 @@ namespace Learun.Application.WebApi.Modules /// /// 贷款回执码状态 /// - public string StudentLoanStatus { get; set; } + public string StudentLoanStatus { get; set; } + /// + /// 办理贷款状态 + /// + public string StudentLoanBLStatus { get; set; } /// /// 家庭成员 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshEntity.cs index 9353504ca..01055cb7a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshEntity.cs @@ -507,6 +507,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration [Column("STUDENTLOAN")] public string StudentLoan { get; set; } /// + /// 助学贷款：办理贷款状态 + /// + /// + [Column("STUDENTLOANBLSTATUS")] + public string StudentLoanBLStatus { get; set; } + /// /// 助学贷款状态：1已审核0未审核 /// /// From 380a686844b03ea420c87fd1f60c51e38ac111d3 Mon Sep 17 00:00:00 2001 From: liangkun Date: Wed, 25 Aug 2021 18:12:23 +0800 Subject: [PATCH 06/16] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=BF=8E=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StuInfoFresh/StudentLoan/StudentLoan.html | 4 +- .../StuInfoFresh/StudentLoan/StudentLoan.js | 10 ++-- .../my/modifypassword/modifypassword.html | 2 +- .../modifypasswordandnotice.html | 2 +- .../www/pages/welcome/welcome.css | 42 ++++++++++++---- .../www/pages/welcome/welcome.html | 29 +++++++---- .../www/pages/welcome/welcome.js | 48 ++++++++++++++++--- 7 files changed, 104 insertions(+), 33 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.html index 1bc1d21c8..8f396bdf1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.html +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.html @@ -1,12 +1,10 @@
                -
                +
                贷款回执码 - 办理贷款状态 -
                办理贷款状态 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.js index 2a79d2269..1e65f3625 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.js @@ -5,6 +5,7 @@ //数据绑定 learun.layer.loading(true, '获取数据中'); learun.httpget(config.webapi + "StuInfoFresh/stuInfoFresh", {}, (data) => { + console.log(data); if (data) { for (var id in data) { if (id == "StuInfoFreshEntity") { @@ -30,7 +31,7 @@ ID: $('#ID').val(), StudentLoan: $('#StudentLoan').val(), StudentLoanStatus: "0", - StudentLoanBLStatus:$("#StudentLoanBLStatus").lrselectGet(); + StudentLoanBLStatus:$("#StudentLoanBLStatus").lrselectGet() }; if ($('#StudentLoan').val().trim() != null && $('#StudentLoan').val().trim() != "" && $('#StudentLoan').val().trim() != undefined) { postdata.StudentLoanStatus = "1"; @@ -51,9 +52,10 @@ }, bind: function ($page) { - $page.find('#StudentLoanBLStatus').lrselect({ - type: 'StudentLoanBLStatus', - needPre:false + console.log($page.find('#StudentLoanBLStatus')); + $page.find('#StudentLoanBLStatus').lrpickerex({ + code: 'StudentLoanBLStatus', + type:'dataItem' }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/my/modifypassword/modifypassword.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/my/modifypassword/modifypassword.html index 8d46e259d..2f2b38a1a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/my/modifypassword/modifypassword.html +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/my/modifypassword/modifypassword.html @@ -1,4 +1,4 @@ -<
                +
                diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/my/modifypasswordandnotice/modifypasswordandnotice.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/my/modifypasswordandnotice/modifypasswordandnotice.html index a111c93c9..8a55e45b5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/my/modifypasswordandnotice/modifypasswordandnotice.html +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/my/modifypasswordandnotice/modifypasswordandnotice.html @@ -1,4 +1,4 @@ -<
                +
                diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.css b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.css index 821273699..ce30c3eb5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.css +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.css @@ -1,3 +1,9 @@ + + + .red{ + color: red; + } + .welcome { height: 100%; overflow: auto; @@ -47,8 +53,10 @@ /* padding: 0px 12px 20px; */ } .welbox2{ - padding: 0px 12px 0px; + padding: 0px 20px 0px; background-color: #fff; + position: relative; + } .welBox.active { display: block; @@ -60,14 +68,19 @@ font-size: 16px; line-height: 26px; } - +.welT span{ + font-weight: 400; + font-size: 12px; + line-height: 26px; +} .welT2 { height: 46px; line-height: 46px; font-size: 16px; margin: 0 -12px; padding: 0 12px; - background-color: #EFF2F3; + font-weight: 800; + } .welT i { @@ -92,6 +105,8 @@ font-size: 14px; margin-top: 8px; line-height: 0; + border-bottom: 1px solid #EFF2F3; + padding-bottom: 5px; } .welText div { @@ -162,18 +177,22 @@ .welInput .lr-picker { line-height: 30px; } +.welUrgent{ + position: relative; +} .welCon { margin-top: 18px; - position: relative; + margin: 0 -12px; } .welDel { - background: #EFF2F3; + text-align: right; padding: 5px 12px 10px; - text-align: right; + } + .welDel i,.welAdd i { text-align: center; width: 26px; @@ -183,12 +202,13 @@ border-radius: 3px; background: #ffff; color: #0C86D8; + margin-right:10px; } .welAdd{ - background: #EFF2F3; - margin: 0 -12px; - padding: 5px 12px; + + position: absolute; + bottom: 12px; font-size: 14px; color: #0C86D8; } @@ -215,7 +235,8 @@ } .welImgAdd { - width: 225px; + + height:300px; margin: 60px auto; border: 1px solid #0C86D8; border-radius: 6px; @@ -225,6 +246,7 @@ .welImgAdd img { width: 100%; + height: 100%; } /* #PhotoImg { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.html index ae54c78b8..705ab3014 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.html +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.html @@ -10,8 +10,8 @@
                -
                基本信息
                -
                下次请使用学号和密码登录
                +
                基本信息（下次请使用学号和密码登录）
                +
                学号
                @@ -102,7 +102,8 @@
                联系电话 - +
                紧急联系人
                @@ -118,7 +119,9 @@
                手机号码 - +
                座机号码 @@ -128,10 +131,20 @@ 联系地址
                -
                +
                + 联系地址 + +
                + + +
                +
                -
                添加紧急联系人
                +
                办理贷款状态 +
                diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.js index 1e65f3625..f5690ea47 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.js @@ -5,12 +5,12 @@ //数据绑定 learun.layer.loading(true, '获取数据中'); learun.httpget(config.webapi + "StuInfoFresh/stuInfoFresh", {}, (data) => { - console.log(data); if (data) { for (var id in data) { if (id == "StuInfoFreshEntity") { $page.find("#ID").val(data[id].ID); - $page.find("#StudentLoan").val(data[id].StudentLoan); + $page.find("#StudentLoanBLStatus").lrpickerSet(data[id].StudentLoanBLStatus); + //$page.find("#StudentLoan").val(data[id].StudentLoan); if (data[id].StudentLoanStatus == "1") { learun.layer.loading(false); learun.layer.confirm('新生助学贷款已审核！', function (_index) { @@ -29,14 +29,15 @@ $page.find('#saveBtn').on('tap', function () { var postdata = { ID: $('#ID').val(), - StudentLoan: $('#StudentLoan').val(), + // StudentLoan: $('#StudentLoan').val(), + StudentLoan: '', StudentLoanStatus: "0", - StudentLoanBLStatus:$("#StudentLoanBLStatus").lrselectGet() + StudentLoanBLStatus:$("#StudentLoanBLStatus").lrpickerGet() }; - if ($('#StudentLoan').val().trim() != null && $('#StudentLoan').val().trim() != "" && $('#StudentLoan').val().trim() != undefined) { - postdata.StudentLoanStatus = "1"; - } - if ($('#StudentLoanBLStatus').lrselectGet().trim() != null && $('#StudentLoanBLStatus').lrselectGet().trim() != "" && $('#StudentLoanBLStatus').lrselectGet().trim() != undefined) { + // if ($('#StudentLoan').val().trim() != null && $('#StudentLoan').val().trim() != "" && $('#StudentLoan').val().trim() != undefined) { + // postdata.StudentLoanStatus = "1"; + // } + if ($('#StudentLoanBLStatus').lrpickerGet().trim() != null && $('#StudentLoanBLStatus').lrpickerGet().trim() != "" && $('#StudentLoanBLStatus').lrpickerGet().trim() != undefined) { postdata.StudentLoanBLStatus = "2"; } learun.httpget(config.webapi + "StuInfoFresh/saveLoan", postdata, (data) => { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.html index 38d75aa25..927576b07 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.html +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.html @@ -3,7 +3,7 @@
                -
                2020
                +
                2021
                新生入校流程
                @@ -32,7 +32,7 @@
                助学贷款 - ( 填写贷款回执码 ) + ( 选择办理贷款状态 )
                未完成
                diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.js index d89cc5377..b0e8a2b96 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.js @@ -24,7 +24,7 @@ } else { notCompleteStyle("#PayFeeStatus", "images/enter2-2.png"); } - if (data["StuInfoFreshEntity"].StudentLoanStatus == "1") { + if (data["StuInfoFreshEntity"].StudentLoanBLStatus) { completeStyle("#StudentLoan", "images/enter1-3.png"); } else { notCompleteStyle("#StudentLoan", "images/enter2-3.png"); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.cshtml index c0c4fb108..d5b69f515 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.cshtml @@ -25,9 +25,11 @@ @* 缴费*@  线上缴费  取消线上缴费 -  填写贷款回执码 -  审核助学贷款 -  去审核助学贷款 + @* 填写贷款回执码*@ + @* 审核助学贷款 +  去审核助学贷款*@ +  已办理贷款 +  正在办理贷款  现场缴费  其他费用缴费  取消其他费用缴费 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js index d4fc9c4a8..38fd0164e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js @@ -115,16 +115,23 @@ var bootstrap = function ($, learun) { var keyValue = $('#gridtable').jfGridValue('ID'); selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { - if (selectedRow.StudentLoanStatus == "1") { - learun.alert.warning("当前新生助学贷款已审核！"); - return; - } - if (selectedRow.StudentLoan == null || selectedRow.StudentLoan == "" || selectedRow.StudentLoan == undefined) { - learun.alert.warning("贷款回执码为空！"); - return; - } + //if (selectedRow.StudentLoanStatus == "1") { + // learun.alert.warning("当前新生助学贷款已审核！"); + // return; + //} + //if (selectedRow.StudentLoan == null || selectedRow.StudentLoan == "" || selectedRow.StudentLoan == undefined) { + // learun.alert.warning("贷款回执码为空！"); + // return; + //} - learun.layerConfirm('是否确认审核助学贷款！', function (res) { + //learun.layerConfirm('是否确认审核助学贷款！', function (res) { + // if (res) { + // learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/DoCheckLoan', { keyValue: keyValue, status: 1 }, function () { + // refreshGirdData(); + // }); + // } + //}); + learun.layerConfirm('是否确认已办理贷款！', function (res) { if (res) { learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/DoCheckLoan', { keyValue: keyValue, status: 1 }, function () { refreshGirdData(); @@ -138,13 +145,20 @@ var bootstrap = function ($, learun) { var keyValue = $('#gridtable').jfGridValue('ID'); selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { - if (selectedRow.StudentLoanStatus != "1") { - learun.alert.warning("当前新生助学贷款未审核！"); - return; - } - learun.layerConfirm('是否确认去审核助学贷款！', function (res) { + //if (selectedRow.StudentLoanStatus != "1") { + // learun.alert.warning("当前新生助学贷款未审核！"); + // return; + //} + //learun.layerConfirm('是否确认去审核助学贷款！', function (res) { + // if (res) { + // learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/DoCheckLoan', { keyValue: keyValue, status: 0 }, function () { + // refreshGirdData(); + // }); + // } + //}); + learun.layerConfirm('是否确认正在办理贷款！', function (res) { if (res) { - learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/DoCheckLoan', { keyValue: keyValue, status: 0 }, function () { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/DoCheckLoan', { keyValue: keyValue, status: 2 }, function () { refreshGirdData(); }); } @@ -231,12 +245,12 @@ var bootstrap = function ($, learun) { }); } }, - { label: '贷款回执码', name: 'StudentLoan', width: 130, align: "left" }, - { - label: '助学贷款状态', name: 'StudentLoanStatus', width: 100, align: "left", formatter: function (value) { - return value == 1 ? "已审核" : "未审核"; - } - }, + //{ label: '贷款回执码', name: 'StudentLoan', width: 130, align: "left" }, + //{ + // label: '助学贷款状态', name: 'StudentLoanStatus', width: 100, align: "left", formatter: function (value) { + // return value == 1 ? "已审核" : "未审核"; + // } + //}, { label: '现场缴费状态', name: 'OnsitePayFeeStatus', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('dataItem', { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuInfoFreshApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuInfoFreshApi.cs index 40e75f9a5..9da19806b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuInfoFreshApi.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuInfoFreshApi.cs @@ -202,7 +202,7 @@ namespace Learun.Application.WebApi.Modules var entity = stuInfoFreshIBLL.GetStuInfoFreshEntity(model.ID); entity.StudentLoan = model.StudentLoan; entity.StudentLoanStatus = model.StudentLoanStatus; - + entity.StudentLoanBLStatus = model.StudentLoanBLStatus; stuInfoFreshIBLL.SaveEntity(entity.ID, entity); return Success("保存成功"); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs index 6109d2d1d..0ea7d038e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs @@ -1148,13 +1148,21 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { try { - if (status == "1")//通过 + //if (status == "1")//通过 + //{ + // this.BaseRepository("CollegeMIS").ExecuteBySql("update StuInfoFresh set StudentLoanStatus='1' where ID='" + keyValue + "' "); + //} + //else + //{ + // this.BaseRepository("CollegeMIS").ExecuteBySql("update StuInfoFresh set StudentLoanStatus='0' where ID='" + keyValue + "' "); + //} + if (status == "1")//已办理 { - this.BaseRepository("CollegeMIS").ExecuteBySql("update StuInfoFresh set StudentLoanStatus='1' where ID='" + keyValue + "' "); + this.BaseRepository("CollegeMIS").ExecuteBySql("update StuInfoFresh set StudentLoanBLStatus='1' where ID='" + keyValue + "' "); } else { - this.BaseRepository("CollegeMIS").ExecuteBySql("update StuInfoFresh set StudentLoanStatus='0' where ID='" + keyValue + "' "); + this.BaseRepository("CollegeMIS").ExecuteBySql("update StuInfoFresh set StudentLoanBLStatus='2' where ID='" + keyValue + "' "); } } catch (Exception ex) From dc0e700130e1a978588101035a0b839635e0d656 Mon Sep 17 00:00:00 2001 From: liangkun Date: Thu, 26 Aug 2021 17:28:15 +0800 Subject: [PATCH 08/16] =?UTF-8?q?H5=E7=AB=AF=E8=87=AA=E5=8A=A8=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E4=BA=8C=E7=BB=B4=E7=A0=81=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StuInfoFresh/RegisterQRCode/RegisterQRCode.js | 13 ++++++++----- .../StuInfoFresh/StudentLoan/StudentLoan.js | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.js index 482532ff9..e3f6fd188 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.js @@ -29,11 +29,14 @@ return false; } if (entity.PayFeeStatus != "1" && entity.StudentLoanStatus != "1" && entity.OnsitePayFeeStatus != "1") { - learun.layer.loading(false); - learun.layer.confirm('新生未缴费，无法报到！', function (_index) { - learun.nav.closeCurrent(); - }, '智慧校园提示', ['确定']); - return false; + if(!entity.StudentLoanBLStatus) + { + learun.layer.loading(false); + learun.layer.confirm('新生未缴费且未设置贷款状态，无法报到！', function (_index) { + learun.nav.closeCurrent(); + }, '智慧校园提示', ['确定']); + return false; + } } //学生 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.js index f5690ea47..1e4ad60e8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.js @@ -45,6 +45,7 @@ learun.layer.toast('保存成功'); setTimeout(function () { learun.nav.closeCurrent(); + learun.nav.go({ path: '/EducationalAdministration/StuInfoFresh/RegisterQRCode', title: '生成报到二维码', isBack: true, isHead: true, param: {}, type: 'right' }); }, 2000); } }); @@ -53,7 +54,6 @@ }, bind: function ($page) { - console.log($page.find('#StudentLoanBLStatus')); $page.find('#StudentLoanBLStatus').lrpickerex({ code: 'StudentLoanBLStatus', type:'dataItem' From 7edc0d1573f930d1a4260e41547536e20eafe5f0 Mon Sep 17 00:00:00 2001 From: liangkun Date: Tue, 31 Aug 2021 18:07:12 +0800 Subject: [PATCH 09/16] =?UTF-8?q?=E5=AD=A6=E7=B1=8D=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=90=8C=E6=AD=A5=E7=B3=BB=E4=B8=93=E4=B8=9A?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/StuInfoBasicController.cs | 15 ++++++ .../Views/StuInfoBasic/Index.cshtml | 2 + .../Views/StuInfoBasic/Index.js | 12 +++++ .../StuInfoBasic/StuInfoBasicBLL.cs | 38 ++++++++++++++ .../StuInfoBasic/StuInfoBasicIBLL.cs | 2 + .../StuInfoBasic/StuInfoBasicService.cs | 52 +++++++++++++++++++ 6 files changed, 121 insertions(+) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasicController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasicController.cs index f21e8e63c..5a8050e97 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasicController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasicController.cs @@ -522,6 +522,21 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers stuInfoBasicIBLL.SynPhoto(); return Success("同步成功！"); } + + [HttpPost] + [AjaxOnly] + public ActionResult SyncDept() + { + stuInfoBasicIBLL.SyncDept(); + return Success("同步成功"); + } + [HttpPost] + [AjaxOnly] + public ActionResult SyncMajor() + { + stuInfoBasicIBLL.SyncMajor(); + return Success("同步成功"); + } #endregion } } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.cshtml index 85e50b95a..3c338ac37 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.cshtml @@ -53,6 +53,8 @@  查看异动  拍照  学生简历表 +   同步系部 +   同步专业
                diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js index 034ffda3b..eae134310 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js @@ -216,6 +216,18 @@ var bootstrap = function ($, learun) { }); } }); + // 同步系部 + $('#lr_syn').on('click', function () { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/SyncDept', function () { + refreshGirdData(); + }); + }); + // 同步专业 + $('#lr_synmajor').on('click', function () { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/SyncMajor', function () { + refreshGirdData(); + }); + }); }, // 初始化列表 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicBLL.cs index a52ae99af..1235a1458 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicBLL.cs @@ -315,6 +315,44 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + public void SyncDept() + { + try + { + stuInfoBasicService.SyncDept(); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + public void SyncMajor() + { + try + { + stuInfoBasicService.SyncMajor(); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + public void UpdateAccount() { try diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicIBLL.cs index 738ce5d45..fafb58369 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicIBLL.cs @@ -76,5 +76,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration bool GetAny(); IEnumerable GetAllList(); IEnumerable GetStuInfoByClassNo(string classNo); + void SyncDept(); + void SyncMajor(); } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs index a1dc54122..f68f07af5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs @@ -868,5 +868,57 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } } + public void SyncDept() + { + try + { + var data = this.BaseRepository("CollegeMIS").FindList().ToList(); + var majorList = this.BaseRepository("CollegeMIS").FindList().ToList(); + foreach (var item in data) + { + var deptNo = majorList.FirstOrDefault(a => a.MajorNo == item.MajorNo)?.DeptNo; + item.DeptNo = deptNo; + this.BaseRepository("CollegeMIS").Update(item); + + } + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + public void SyncMajor() + { + try + { + var data = this.BaseRepository("CollegeMIS").FindList().ToList(); + var classList = this.BaseRepository("CollegeMIS").FindList().ToList(); + foreach (var item in data) + { + var majorNo = classList.FirstOrDefault(a => a.ClassNo == item.ClassNo)?.MajorNo; + item.MajorNo = majorNo; + this.BaseRepository("CollegeMIS").Update(item); + + } + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } } } From cbdf1fc5190de7b7a39b22326a03aca5d94f8714 Mon Sep 17 00:00:00 2001 From: liangkun Date: Tue, 7 Sep 2021 17:25:24 +0800 Subject: [PATCH 10/16] =?UTF-8?q?h5=E5=AE=8C=E5=96=84=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=88=90=E5=91=98=E5=85=B3=E7=B3=BB?= =?UTF-8?q?=E8=B5=8B=E5=80=BC=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Learun.Application.Mobile/www/pages/welcome/welcome.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.js index 3cd743976..d1c2c0959 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.js @@ -372,6 +372,7 @@ var reg = new RegExp("^[0-9]*$") var list = new Array(); $.each($('#StuInfoFreshEmergePeople').children('.welCon'), function (i, item) { var o = $(item).children(".welConForm").serializeObject(); + o.Relation = $(item).find('[name="Relation"]').lrpickerGet(); list.push(o); }); return list; From d5bc1ccc3ba077c112889aaa43b3eca932685528 Mon Sep 17 00:00:00 2001 From: edy Date: Wed, 8 Sep 2021 14:09:14 +0800 Subject: [PATCH 11/16] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E7=BC=B4=E8=B4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RegisterQRCode/RegisterQRCode.js | 8 ++-- .../www/pages/notice/notice.html | 4 +- .../www/pages/notice/notice.js | 4 +- .../Controllers/StuInfoFreshController.cs | 9 +++- .../Views/StuInfoFresh/PayFeeIndex.cshtml | 4 +- .../Views/StuInfoFresh/PayFeeIndex.js | 15 +++++- .../XmlConfig/database.config | 2 + .../StuInfoFresh/StuInfoFreshBLL.cs | 25 ++++++++++ .../StuInfoFresh/StuInfoFreshIBLL.cs | 7 +++ .../StuInfoFresh/StuInfoFreshService.cs | 46 ++++++++++++++++++- 10 files changed, 112 insertions(+), 12 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.js index e3f6fd188..9f396dc54 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.js @@ -12,6 +12,10 @@ learun.layer.loading(true, '获取数据中'); learun.httpget(config.webapi + "StuInfoFresh/stuInfoFreshEntity", userinfo.baseinfo.account, (data) => { if (data) { + //辅导员 + $('.sQrText span').eq(2).html(data.StuInfoFreshEntity.ClassDiredctorName != null ? data.StuInfoFreshEntity.ClassDiredctorName.slice(0, 1) + "老师" : ""); + $('.sQrText span').eq(3).html(data.StuInfoFreshEntity.ClassDiredctorMobile); + //判断是否显示报到二维码：未确认报到，且已完善信息，且缴费三有一； var entity = data["StuInfoFreshEntity"]; if (entity.RegisterStatus == "1") { @@ -50,9 +54,7 @@ //班主任 // $('.sQrText span').eq(0).html(data.StuInfoFreshEntity.ClassDiredctorName != null ? data.StuInfoFreshEntity.ClassDiredctorName.slice(0, 1) + "老师" : ""); // $('.sQrText span').eq(1).html(data.StuInfoFreshEntity.ClassDiredctorMobile); - //辅导员 - $('.sQrText span').eq(2).html(data.StuInfoFreshEntity.ClassTutorName != null ? data.StuInfoFreshEntity.ClassTutorName.slice(0, 1) + "老师" : ""); - $('.sQrText span').eq(3).html(data.StuInfoFreshEntity.ClassTutorMobile); + //二维码 learun.code.encode({ id: 'lr_mycode_qrcode', text: data.StuInfoFreshEntity.StuNo }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice/notice.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice/notice.html index 0299d65aa..02ef97191 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice/notice.html +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice/notice.html @@ -21,10 +21,10 @@ 班级：
                - 辅导员： + 辅导员：
                - 电话： + 电话：
                宿舍： diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice/notice.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice/notice.js index c989d93cd..9574e05a9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice/notice.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice/notice.js @@ -16,8 +16,8 @@ $('#DeptNo').html(entity.DeptNo); $('#MajorNo').html(entity.MajorNo); $('#ClassNo').html(entity.ClassNo); - $('#ClassTutorName').html(entity.ClassTutorName); - $('#ClassTutorMobile').html(entity.ClassTutorMobile); + $('#ClassDiredctorName').html(entity.ClassDiredctorName); + $('#ClassDiredctorMobile').html(entity.ClassDiredctorMobile); $('#PayFeeStatus').html(entity.PayFeeStatus == "1" ? "已缴费" : "未缴费"); $('#CollectFileStatus').html(entity.CollectFileStatus == "1" ? "已提交" : "未提交"); $('#GetKeyStatus').html(entity.GetKeyStatus == "1" ? "已领取" : "未领取"); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs index c1f64a959..593a5d8b6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs @@ -55,7 +55,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View("Index"); } - + [HttpGet] public ActionResult IndexDC() { @@ -286,6 +286,13 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers #region 获取数据 + [HttpPost] + [AjaxOnly] + public void SynchronousList() + { + stuInfoFreshIBLL.SynchronousList(); + } + /// /// 获取列表数据 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.cshtml index d5b69f515..54c4b777e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.cshtml @@ -11,6 +11,7 @@
                +
                 查询 @@ -21,13 +22,14 @@
                +  同步  查看 @* 缴费*@  线上缴费  取消线上缴费 @* 填写贷款回执码*@ @* 审核助学贷款 -  去审核助学贷款*@ +  去审核助学贷款*@  已办理贷款  正在办理贷款  现场缴费 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js index 38fd0164e..7b12b1be7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js @@ -17,7 +17,8 @@ var bootstrap = function ($, learun) { // 查询 $('#btn_Search').on('click', function () { var keyword = $('#txt_Keyword').val(); - page.search({ keyword: keyword }); + var Grade = $('#Grade').val(); + page.search({ keyword: keyword, Grade: Grade }); }); // 刷新 $('#lr_refresh').on('click', function () { @@ -200,6 +201,18 @@ var bootstrap = function ($, learun) { }); } }); + //同步数据 + $('#lr_synchronous').on('click', + function () { + learun.layerConfirm('是否要同步缴费数据！',function (res) { + if (res) { + learun.postForm( + top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/SynchronousList', {}, function () { + refreshGirdData(); + }); + } + }); + }); // 取消其他费用缴费 $('#lr_cancelOtherPay').on('click', function () { var keyValue = $('#gridtable').jfGridValue('ID'); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config index 489b3b61f..ca0d018a1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config @@ -19,6 +19,8 @@ + +