【修改】办事大厅模式：定义部分卡片块；

Learun.Framework.Ultimate V7/Learun.Application.Web/Content/js/DragSSO/indexData.js

@@ -9,7 +9,7 @@ var noCard = '<div class="inSec3Col3" id="noHtml">'+
 					'<div class="inSecT"></div>'+
 					'<div class="inSec3Con">'+
 						'<div class="noCard">'+
-							'<div class="noCardImg"><img src="images/right2.png" alt=""></div>'+
+							'<div class="noCardImg"><img src="../../Content/images/DragSSO/right2.png" alt=""></div>'+
 							'<div class="noCardTxt">从左侧选择需要的应用卡片</div>'+
 						'</div>'+
 					'</div>'+
@@ -17,7 +17,7 @@ var noCard = '<div class="inSec3Col3" id="noHtml">'+
 			'</div>';
 //没有数据
 var noHtml = '<div class="noLogin">'+
-					'<div class="noLoginImg"><img src="images/noLogin.png" alt=""></div>'+
+					'<div class="noLoginImg"><img src="../../Content/images/DragSSO/noLogin.png" alt=""></div>'+
 					'<div class="noLoginTxt">暂时没有数据</div>'+
 				'</div>';
 //

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
         /// <summary>
@@ -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<NewsEntity> outnewslist = new List<NewsEntity>();
+            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
+
 
 
 

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";
 }
+
+<script src="/Content/js/DragSSO/indexData.js"></script>
 <script>
-    //测试数据
+    //测试登录后获取的数据
     var aa = "@ViewBag.DesktopListStr";
     var aaa = aa.replace(/&quot;/g, "\"");
     var aaaa = JSON.parse(aaa);
-    console.log(aaaa);
+    //console.log(aaaa);
+
 
     //定义卡片块
+    //办公事项
+    var card2Fun = function () {
+        //todo：
+
+        var html = '';
+        return html;
+    };
+    //学校公文
+    var card3Fun = function () {
+        var listStr = "@ViewBag.ReceiveFileListStr";
+        var list = JSON.parse(listStr.replace(/&quot;/g, "\""));
+        var html = '<div class="inSec3Col3" id="' + $('.inSec3Row.active').attr('ind') + '_card3">'
+            + '<div class="inSec3Box">'
+            + '<div class="inSecT">'
+            + '<span>学校公文</span>'
+            + '<i class="inSecTMore">' + list.length + '</i>'
+            + '<a href="/Home/Index?autoopen=19637c39-624d-4be6-b680-04250f8df71f" class="more" target="_blank"><span></span><span></span><span></span></a>'
+            + '</div>'
+            + '<div class="inSec3Con">';
+        if (list.length > 0) {
+            html += '<ul class="inSec2List">';
+            for (var i = 0; i < list.length; i++) {
+                html += '<li>'
+                    + '<a href="/Home/Index?autoopen=19637c39-624d-4be6-b680-04250f8df71f&keyValue=' + list[i].RFileId +'" target="_blank">'
+                    + '<span class="inSec2Time">'+list[i].SendTime.replace("T"," ").slice(0,10)+'</span>'
+                    + '<span class="inSec2T"><img src="../../Content/images/DragSSO/inSec2-18.png" alt="">' + list[i].Title+'</span>'
+                    + '</a>'
+                    + '</li>';
+            }
+            html+= '</ul>';
+        } else {
+            html += noHtml;
+        }
+            html+= '</div>'
+            + '</div>'
+            + '</div>'
+            ;
+        return html;
+    };
+    //办公邮件
+    var card9Fun = function () {
+        var listStr = "@ViewBag.LanMailStr";
+        var list = JSON.parse(listStr.replace(/&quot;/g, "\""));
+        var listStr2 = "@ViewBag.LanMailSendStr";
+        var list2 = JSON.parse(listStr2.replace(/&quot;/g, "\""));
+        var html = '<div class="inSec3Col3" id="' + $('.inSec3Row.active').attr('ind') + '_card9">'
+            + '<div class="inSec3Box" >'
+            + '<div class="inSecT">'
+            + '<span>办公邮件</span>'
+            + '<a href="/Home/Index?autoopen=252878d7-d807-497f-b01e-839bb1b869c6" class="more" target="_blank"><span></span><span></span><span></span></a>'
+            + '</div>'
+            + '<div class="inSec3Con">'
+            + '<div class="inSec3L">'
+            + '<ul class="workList workListTips">'
+            + '<li class="active">'
+            + '<div class="workListImg"><img src = "../../Content/images/DragSSO/indexSec3-12.png" alt = "" >'
+            + '</div> '
+            + '<span>收件箱</span>'
+            + '<i class="inSecTMore">@ViewBag.LanMailUnReadCount</i>'
+            + '</li>'
+            + '<li>'
+            + '<div class="workListImg"><img src = "../../Content/images/DragSSO/indexSec3-10.png" alt = "" >'
+            + '</div> '
+            + '<span>已发送</span>'
+            + '</li>'
+            + '</ul>'
+            + '</div>'
+            + '<div class="inSec3R">'
+            + '<div class="inSec3WorkBox">';
+        if (list.length > 0) {
+            html += '<ul class="inSec2List">';
+            for (var i = 0; i < list.length; i++) {
+                html += '<li>'
+                    + '<a href="/Home/Index?autoopen=252878d7-d807-497f-b01e-839bb1b869c6&keyValue=' + list[i].MESSAGEID+'" target="_blank">'
+                    + '<span class="inSec2Time">' + list[i].SENDTIME.replace("T", " ").slice(0, 10) +'</span>'
+                    + '<span class="inSec2T">' + list[i].TITLE+'</span>'
+                    + '</a>'
+                    + '</li>';
+            }
+            html+= '</ul>';
+        } else {
+            html += noHtml;
+        }
+        html += '</div>'
+            + '<div class="inSec3WorkBox">';
+        if (list2.length > 0) {
+            html += '<ul class="inSec2List">';
+            for (var i = 0; i < list2.length; i++) {
+                html += '<li>'
+                    + '<a href="/Home/Index?autoopen=252878d7-d807-497f-b01e-839bb1b869c6&keyValue=' + list2[i].MESSAGEID + '" target="_blank">'
+                    + '<span class="inSec2Time">' + list2[i].SENDTIME.replace("T", " ").slice(0, 10) + '</span>'
+                    + '<span class="inSec2T">' + list2[i].TITLE + '</span>'
+                    + '</a>'
+                    + '</li>';
+            }
+            html += '</ul>';
+        } else {
+            html += noHtml;
+        }
+            html+='</div>'
+            +'</div>'
+            +'</div>'
+            +'</div>'
+            +'</div>'
+        ;
+        return html;
+    };
+    //通知公告
+    var card10Fun = function () {
+        var listStr = "@ViewBag.NewsListStr";
+        var list = JSON.parse(listStr.replace(/&quot;/g, "\""));
+        var html = '<div class="inSec3Col3" id="' + $('.inSec3Row.active').attr('ind') + '_card10">'
+            + '<div class="inSec3Box">'
+            + '<div class="inSecT">'
+            + '<span>通知公告</span>'
+            + '<a href="/Home/Index?autoopen=433d5658-40b0-4e2d-b736-c4e8561d017e" class="more" target="_blank"><span></span><span></span><span></span></a>'
+            + '</div>'
+            + '<div class="inSec3Con">';
+        if (list.length > 0) {
+            html += '<ul class="inSec2List">';
+            for (var i = 0; i < list.length; i++) {
+                html += '<li>'
+                    + '<a href="/Home/Index?autoopen=433d5658-40b0-4e2d-b736-c4e8561d017e&keyValue=' + list[i].F_NewsId +'" target="_blank">'
+                    + '<span class="inSec2Time">' + list[i].F_CreateDate.replace("T"," ").slice(0,10)+'</span>'
+                    + '<span class="inSec2T"><img src="../../Content/images/DragSSO/inSec2-16.png" alt="">' + list[i].F_FullHead+'</span>'
+                    + '</a>'
+                    + '</li>';
+            }
+            html+= '</ul>';
+        } else {
+            html += noHtml;
+        }
+            html+= '</div>'
+            + '</div>'
+            + '</div>'
+            ;
+        return html;
+    };
+    //智慧教育
     var card11Fun = function () {
         var html = '<div class="inSec3Col3" id="' + $('.inSec3Row.active').attr('ind') + '_card11">'
             + '<div class="inSec3Box">'
@@ -34,10 +178,9 @@
         return html;
 
     };
-    console.log(card11Fun());
+    //console.log(card11Fun());
 
 </script>
-<script src="/Content/js/DragSSO/indexData.js"></script>
 
 <!--  / warpper  -->
 <div class="warpper">
@@ -729,14 +872,26 @@
             <div class="indexSec3Box">
                 <div class="inSec3Head">
                     <div class="inSec3HeadTabBox">
-                        <div class="inSec3HeadTab active" ind="teacherDesktop">
-                            <div class="inSec3HeadTabTxt">教师桌面</div>
-                        </div>
-                        <div class="inSec3HeadLine"></div>
-                        <div class="inSec3HeadTab" ind="workDesktop">
-                            <div class="inSec3HeadTabTxt">OA办公桌面</div>
-                        </div>
-                        <div class="inSec3HeadLine"></div>
+                        @*<div class="inSec3HeadTab active" ind="teacherDesktop">
+                                    <div class="inSec3HeadTabTxt">教师桌面</div>
+                                </div>
+                                <div class="inSec3HeadLine"></div>
+                                <div class="inSec3HeadTab" ind="workDesktop">
+                                    <div class="inSec3HeadTabTxt">OA办公桌面</div>
+                                </div>
+                            <div class="inSec3HeadLine"></div>*@
+                        @foreach (SSO_Drag_DesktopManageEntity desktopItem in ViewBag.DesktopList)
+                        {
+                            var classTemp = "";
+                            if (desktopItem.DesktopCode == "teacherDesktop")
+                            {
+                                classTemp = "active";
+                            }
+                            <div class="inSec3HeadTab @classTemp" ind="@desktopItem.DesktopCode" attr-Id="@desktopItem.Id">
+                                <div class="inSec3HeadTabTxt">@desktopItem.DesktopName</div>
+                            </div>
+                            <div class="inSec3HeadLine"></div>
+                        }
                     </div>
                     <div class="inSec3HeadAdd">
                         <img src="~/Content/images/DragSSO/indSec3-5.png" alt="">
@@ -747,6 +902,72 @@
                     </div>
                 </div>
                 <div class="inSec3RowBox">
+                    @foreach (SSO_Drag_DesktopManageEntity desktopItem in ViewBag.DesktopList)
+                    {
+                        var classTemp = "";
+                        if (desktopItem.DesktopCode == "teacherDesktop")
+                        {
+                            classTemp = "active";
+                        }
+                    <div class="inSec3Row clearfix @classTemp" ind="@desktopItem.DesktopCode">
+                        @if (string.IsNullOrEmpty(desktopItem.CardSort))
+                        {
+                            <script>
+                                    $('.inSec3RowBox').find('.inSec3Row[ind="@desktopItem.DesktopCode"]').append(noCard);
+                            </script>
+                        }
+                        else
+                        {
+                            if (desktopItem.CardSort.IndexOf(',') == -1)
+                            {
+
+                            }
+                            else
+                            {
+                                foreach (var item in desktopItem.CardSort.Split(','))
+                                {
+                                    switch (item)
+                                    {
+                                        case "card1":
+                                            <script>
+                                    $('.inSec3RowBox').find('.inSec3Row[ind="@desktopItem.DesktopCode"]').append(card11Fun());
+                                            </script>
+                                            break;
+                                        case "card3":
+                                            <script>
+                                    $('.inSec3RowBox').find('.inSec3Row[ind="@desktopItem.DesktopCode"]').append(card3Fun());
+                                            </script>
+                                            break;
+                                        case "card9":
+                                            <script>
+                                    $('.inSec3RowBox').find('.inSec3Row[ind="@desktopItem.DesktopCode"]').append(card9Fun());
+                                            </script>
+                                            break;
+                                        case "card10":
+                                            <script>
+                                    $('.inSec3RowBox').find('.inSec3Row[ind="@desktopItem.DesktopCode"]').append(card10Fun());
+                                            </script>
+                                            break;
+                                        case "card11":
+                                            <script>
+                                    $('.inSec3RowBox').find('.inSec3Row[ind="@desktopItem.DesktopCode"]').append(card11Fun());
+                                            </script>
+                                            break;
+                                        default:
+                                            break;
+                                    }
+                                }
+                            }
+                        }
+
+                    </div>
+                        @*<script>
+                                // 拖拽 排序
+                                sortableInit()
+                            </script>*@
+                    }
+
+
                     <div class="inSec3Row clearfix active" ind="teacherDesktop">
                         <div class="inSec3Col6" id="teacherDesktop_card1">
                             <div class="inSec3Box">
@@ -925,15 +1146,6 @@
                                                 </span>
                                             </a>
                                         </li>
-                                        <li>
-                                            <a href="#">
-                                                <span class="inSec2Time">2019-10-22</span>
-                                                <span class="inSec2T">
-                                                    <img src="~/Content/images/DragSSO/inSec2-18.png" alt="">关于大力推进学院网络服务的通
-                                                    jkhfakjshdfkjh
-                                                </span>
-                                            </a>
-                                        </li>
                                     </ul>
                                 </div>
                             </div>
@@ -1279,14 +1491,6 @@
                                                         </span>
                                                     </a>
                                                 </li>
-                                                <li>
-                                                    <a href="#">
-                                                        <span class="inSec2Time">2019-10-22</span>
-                                                        <span class="inSec2T">
-                                                            关于大力推进学院网络服务的通 jkhfakjshdfkjh
-                                                        </span>
-                                                    </a>
-                                                </li>
                                             </ul>
                                         </div>
                                         <div class="inSec3WorkBox">
@@ -1299,14 +1503,6 @@
                                                         </span>
                                                     </a>
                                                 </li>
-                                                <li>
-                                                    <a href="#">
-                                                        <span class="inSec2Time">2019-10-22</span>
-                                                        <span class="inSec2T">
-                                                            关于大力推进学院网络服务的通 jkhfakjshdfkjh
-                                                        </span>
-                                                    </a>
-                                                </li>
                                             </ul>
                                         </div>
                                     </div>
@@ -1330,15 +1526,6 @@
                                                 </span>
                                             </a>
                                         </li>
-                                        <li>
-                                            <a href="#">
-                                                <span class="inSec2Time">2019-10-22</span>
-                                                <span class="inSec2T">
-                                                    <img src="~/Content/images/DragSSO/inSec2-16.png" alt="">关于大力推进学院网络服务的通
-                                                    jkhfakjshdfkjh
-                                                </span>
-                                            </a>
-                                        </li>
                                     </ul>
                                 </div>
                             </div>
@@ -1355,20 +1542,6 @@
                                 </div>
                             </div>
                         </div>
-
-                        @{
-                            if (1 == 1)
-                            {
-                                <script>
-                                    $('.inSec3Row[ind="teacherDesktop"]').append(card11Fun());
-                                    console.log(noCard);
-                                </script>
-                            }
-                        }
-                        <script>
-                            console.log(card11Fun());
-                        </script>
-
                         <div class="inSec3Col3" id="teacherDesktop_card12">
                             <div class="inSec3Box">
                                 <div class="inSecT">
@@ -1437,6 +1610,7 @@
                             </div>
                         </div>
                     </div>
+
                 </div>
             </div>
         </form>
@@ -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');

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<SYS_ReceiveMessageEntity>(strSql.ToString(), dp);
             }
             catch (Exception ex)

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
             }
         }
 
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<SYS_SendMessageEntity> GetList2(string queryJson)
+        {
+            try
+            {
+                return sYS_SendMessageService.GetList2(queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
         public IEnumerable<SYS_SendMessageEntity> GetList()
         {
             try

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
         /// <param name="queryJson">查询参数</param>
         /// <returns></returns>
         IEnumerable<SYS_SendMessageEntity> GetPageList(Pagination pagination, string queryJson);
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<SYS_SendMessageEntity> GetList2(string queryJson);
         /// <summary>
         /// 获取SYS_SendMessage表实体数据
         /// <param name="keyValue">主键</param>

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
             }
         }
 
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<SYS_SendMessageEntity> 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<SYS_SendMessageEntity>(strSql.ToString(), dp);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         /// <summary>
         /// 获取SYS_SendMessage表实体数据
         /// <param name="keyValue">主键</param>

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<NWFTaskEntity>(x => x.F_ProcessId == item.F_Id)?.F_Id;
+                    item.F_TaskType = this.BaseRepository().FindEntity<NWFTaskEntity>(x => x.F_ProcessId == item.F_Id)?.F_Type;
+                    item.F_TaskName = this.BaseRepository().FindEntity<NWFTaskEntity>(x => x.F_ProcessId == item.F_Id)?.F_NodeName;
 
                     //合同流程审批专用  如果第一步校长审批同意的话 可以打印授权委托书
                     if (item.F_SchemeCode == "LC_Contract_")