From 47b1f00d163ecea8e9b75958860f6b92589fc57a Mon Sep 17 00:00:00 2001 From: dyy <18335927079@163.com> Date: Fri, 19 Mar 2021 18:09:26 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E5=8A=9E?= =?UTF-8?q?=E4=BA=8B=E5=A4=A7=E5=8E=85=E6=A8=A1=E5=BC=8F=EF=BC=9A=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E9=83=A8=E5=88=86=E5=8D=A1=E7=89=87=E5=9D=97=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Content/js/DragSSO/indexData.js | 4 +- .../Controllers/SSOSystemController.cs | 87 +++++ .../Views/SSOSystem/DragModelOne.cshtml | 298 ++++++++++++++---- .../SYS_ReceiveMessageService.cs | 5 + .../SYS_SendMessage/SYS_SendMessageBLL.cs | 24 ++ .../SYS_SendMessage/SYS_SendMessageIBLL.cs | 7 + .../SYS_SendMessage/SYS_SendMessageService.cs | 46 +++ .../Process/NWFProcessSerivce.cs | 2 + 8 files changed, 409 insertions(+), 64 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/indexData.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/indexData.js index 4aa2eae79..c4cef5749 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/indexData.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/indexData.js @@ -9,7 +9,7 @@ var noCard = '
'+ '
'+ '
'+ '
'+ - '
'+ + '
'+ '
从左侧选择需要的应用卡片
'+ '
'+ '
'+ @@ -17,7 +17,7 @@ var noCard = '
'+ '
'; //没有数据 var noHtml = '
'+ - '
'+ + '
'+ '
暂时没有数据
'+ '
'; // 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 b7d10f7cd..de97bef79 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs @@ -39,6 +39,7 @@ namespace Learun.Application.Web.Controllers 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(); #region 统一身份认证2.0 /// @@ -874,6 +875,92 @@ namespace Learun.Application.Web.Controllers //获取桌面、卡片块排序列表 ViewBag.DesktopList = sSO_Drag_DesktopManageIBLL.GetListByModelCode(userInfo.userId, "one").OrderBy(x => x.Sort); 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); + //办公事项-待办任务 + 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(); + //办公事项-我发起的 + ViewBag.MyList = nWFProcessIBLL.GetMyPageList(userInfo.userId, paginationobj, "{}"); + ViewBag.MyListStr = JsonConvert.SerializeObject(ViewBag.MyList); + + //todo: + //常用服务 + //常用链接-系统直通 === 统一登录-GoTo + 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 index 3b3a03915..56d9542b6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelOne.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelOne.cshtml @@ -4,19 +4,163 @@ @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"; } + + -
@@ -729,14 +872,26 @@
-
-
教师桌面
-
-
-
-
OA办公桌面
-
-
+ @*
+
教师桌面
+
+
+
+
OA办公桌面
+
+
*@ + @foreach (SSO_Drag_DesktopManageEntity desktopItem in ViewBag.DesktopList) + { + var classTemp = ""; + if (desktopItem.DesktopCode == "teacherDesktop") + { + classTemp = "active"; + } +
+
@desktopItem.DesktopName
+
+
+ }
@@ -747,6 +902,72 @@
+ @foreach (SSO_Drag_DesktopManageEntity desktopItem in ViewBag.DesktopList) + { + var classTemp = ""; + if (desktopItem.DesktopCode == "teacherDesktop") + { + classTemp = "active"; + } +
+ @if (string.IsNullOrEmpty(desktopItem.CardSort)) + { + + } + else + { + if (desktopItem.CardSort.IndexOf(',') == -1) + { + + } + else + { + foreach (var item in desktopItem.CardSort.Split(',')) + { + switch (item) + { + case "card1": + + break; + case "card3": + + break; + case "card9": + + break; + case "card10": + + break; + case "card11": + + break; + default: + break; + } + } + } + } + +
+ @**@ + } + +
@@ -1279,14 +1491,6 @@ -
  • - - 2019-10-22 - - 关于大力推进学院网络服务的通 jkhfakjshdfkjh - - -
    • @@ -1299,14 +1503,6 @@ -
  • - - 2019-10-22 - - 关于大力推进学院网络服务的通 jkhfakjshdfkjh - - -
    • @@ -1330,15 +1526,6 @@ -
  • - - 2019-10-22 - - 关于大力推进学院网络服务的通 - jkhfakjshdfkjh - - -
    • @@ -1355,20 +1542,6 @@
    - - @{ - if (1 == 1) - { - - } - } - -
    @@ -1437,6 +1610,7 @@
    + @@ -1596,13 +1770,13 @@ $('.inSec3Row.active').find(id).remove(); layer.msg('删除成功！'); if ($('.inSec3Row.active > div').length == 0) { - $('.inSec3Row.active').html(noCard) + $('.inSec3Row.active').html(noCard); } serializes() }).on('click', '.fa-plus', function () { var noHtmls = $('.inSec3Row.active #noHtml'); if (noHtmls.length) { - noHtmls.remove() + noHtmls.remove(); } //添加 $(this).removeClass('fa-plus').addClass('fa-minus'); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SYS_ReceiveMessage/SYS_ReceiveMessageService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SYS_ReceiveMessage/SYS_ReceiveMessageService.cs index 20bb46936..345539302 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SYS_ReceiveMessage/SYS_ReceiveMessageService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SYS_ReceiveMessage/SYS_ReceiveMessageService.cs @@ -111,6 +111,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("TITLE", "%" + queryParam["TITLE"].ToString() + "%", DbType.String); strSql.Append(" AND t.TITLE Like @TITLE "); } + if (!queryParam["userId"].IsEmpty()) + { + dp.Add("userId", "" + queryParam["userId"].ToString() + "", DbType.String); + strSql.Append(" AND t.RECEIVERID=@userId "); + } return this.BaseRepository().FindList(strSql.ToString(), dp); } catch (Exception ex) 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..1c20b8460 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 @@ -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..3cee00d2b 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 @@ -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 256d17473..f544fdd5f 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 @@ -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表实体数据 /// 主键 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessSerivce.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessSerivce.cs index b37a2add6..ecbd008db 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessSerivce.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Process/NWFProcessSerivce.cs @@ -237,6 +237,8 @@ namespace Learun.Application.WorkFlow foreach (var item in aa) { item.F_TaskId = this.BaseRepository().FindEntity(x => x.F_ProcessId == item.F_Id)?.F_Id; + item.F_TaskType = this.BaseRepository().FindEntity(x => x.F_ProcessId == item.F_Id)?.F_Type; + item.F_TaskName = this.BaseRepository().FindEntity(x => x.F_ProcessId == item.F_Id)?.F_NodeName; //合同流程审批专用 如果第一步校长审批同意的话 可以打印授权委托书 if (item.F_SchemeCode == "LC_Contract_")