From 476418f59fa9cce5e857753bed3c01da5279c070 Mon Sep 17 00:00:00 2001
From: zhangli <1109134334@qq.com>
Date: Mon, 10 May 2021 16:47:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=85=E9=83=A8=E9=82=AE=E4=BB=B6=E3=80=81?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E9=80=9A=E7=9F=A5=E7=9A=84=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E6=8F=90=E9=86=92=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/MessageRind/UnreadIndex.cshtml      | 65 +++++++++++--------
 .../Views/Home/AdminDesktop/Index.js          |  1 -
 .../LR_StrategyInfo/LR_StrategyInfoBLL.cs     |  8 ++-
 .../SYS_SendMessage/SYS_SendMessageService.cs | 24 +++++++
 .../MessageRind/MessageRindService.cs         |  4 +-
 5 files changed, 72 insertions(+), 30 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/MessageRind/UnreadIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/MessageRind/UnreadIndex.cshtml
index 5012d734d..379c39636 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/MessageRind/UnreadIndex.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/MessageRind/UnreadIndex.cshtml	
@@ -50,6 +50,7 @@
                     dataType: "json",
                     async: false,
                     success: function (data) {
+                        //console.log(data);
                         var content = "";
                         if (data.length > 0) {
                             content += "<ul id='uldata'>";
@@ -92,21 +93,33 @@
                         dataType: "json",
                         async: false,
                         success: function (data) {
+                            console.log(data);
                             //弹窗查看详情
                             var keyValue = params[1];
                             var ConnectionUrl = params[3];
                             var title = params[0];
-                            if (top.learun.checkrow(keyValue)) {
-                                top.learun.layerForm({
-                                    id: 'formview',
-                                    title: title,
-                                    url: top.$.rootUrl + ConnectionUrl + keyValue,
-                                    width: 1000,
-                                    height: 650,
-                                    maxmin: true,
-                                    btn: null,
+                            if (title == "流程通知") {
+                                top.learun.frameTab.open({
+                                    F_ModuleId: keyValue + "_homeopen",
+                                    F_Icon: 'fa magic',
+                                    F_FullName: '审核流程',
+                                    F_UrlAddress: '/LR_NewWorkFlow/NWFProcess/Index'
+                                    //F_UrlAddress: '/LR_WorkFlowModule/WfMyTask/CustmerWorkFlowForm?tabIframeId=' + p.f_id + '&type=' + p.f_tasktype + '' + "&processId=" + p.f_processid + "&taskId=" + p.f_id
                                 });
 
+                            } else {
+                                if (top.learun.checkrow(keyValue)) {
+                                    top.learun.layerForm({
+                                        id: 'formview',
+                                        title: title,
+                                        url: top.$.rootUrl + ConnectionUrl + keyValue,
+                                        width: 1000,
+                                        height: 650,
+                                        maxmin: true,
+                                        btn: null,
+                                    });
+
+                                }
                             }
                         }
                     })
@@ -116,23 +129,23 @@
             });
         });
 
-                                    //function funLook(param) {
-
-                                    //    var id = "433d5658-40b0-4e2d-b736-c4e8561d017e";//$obj.attr('id');
-                                    //    var _module = top.learun.clientdata.get(['modulesMap', id]);
-                                    //    switch (_module.F_Target) {
-                                    //        case 'iframe':// 窗口
-                                    //            if (top.learun.validator.isNotNull(_module.F_UrlAddress).code) {
-                                    //                top.learun.frameTab.open(_module);
-                                    //            }
-                                    //            break;
-                                    //        case 'open':// 窗口
-                                    //            var newWin = window.open(_module.F_UrlAddress);
-                                    //            newWin.location.replace(_module.F_UrlAddress);
-                                    //            break;
-                                    //    }
-
-                                    //}
+                                        //function funLook(param) {
+
+                                        //    var id = "433d5658-40b0-4e2d-b736-c4e8561d017e";//$obj.attr('id');
+                                        //    var _module = top.learun.clientdata.get(['modulesMap', id]);
+                                        //    switch (_module.F_Target) {
+                                        //        case 'iframe':// 窗口
+                                        //            if (top.learun.validator.isNotNull(_module.F_UrlAddress).code) {
+                                        //                top.learun.frameTab.open(_module);
+                                        //            }
+                                        //            break;
+                                        //        case 'open':// 窗口
+                                        //            var newWin = window.open(_module.F_UrlAddress);
+                                        //            newWin.location.replace(_module.F_UrlAddress);
+                                        //            break;
+                                        //    }
+
+                                        //}
 
     </script>
 </body>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDesktop/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDesktop/Index.js
index 141c4a090..0b5557973 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDesktop/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDesktop/Index.js	
@@ -282,7 +282,6 @@
             dataType: "json",
             async: false,
             success: function (data) {
-                console.log(data);
                 if (data.data> 0) {
                     document.getElementById("sound").src = '/Resource/wav/收到新消息.wav';
                     top.learun.layeropen({
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Message/LR_StrategyInfo/LR_StrategyInfoBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Message/LR_StrategyInfo/LR_StrategyInfoBLL.cs
index 14ec3c719..20fef902c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Message/LR_StrategyInfo/LR_StrategyInfoBLL.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Message/LR_StrategyInfo/LR_StrategyInfoBLL.cs	
@@ -32,6 +32,7 @@ namespace Learun.Application.Message
         private WeChatTempletIBLL weChatTempletIbll = new WeChatTempletBLL();
         private IMSysUserIBLL iMSysUserIBLL = new IMSysUserBLL();
         private Sys_InformationPushIBLL sys_InformationPushIBLL = new Sys_InformationPushBLL();
+        private MessageRindIBLL messageRindIBLL = new MessageRindBLL();
 
         #region 获取数据
 
@@ -322,6 +323,9 @@ namespace Learun.Application.Message
                                                 PushFeixin(list, content, taskMsgEntity);
                                             }
                                             break;
+                                        case "6": //站内消息，消息提醒
+                                            PushMessageRemind(list,content, taskMsgEntity);
+                                            break;
                                         default:
                                             break;
                                     }
@@ -490,10 +494,10 @@ namespace Learun.Application.Message
                 entity.TheTitle = "流程通知";
                 entity.TheContent = model.F_Title + ":" + content;
                 entity.InstanceId = model.F_Id;
-                entity.ConnectionUrl = "/LR_NewWorkFlow/NWFProcess/NWFContainerForm?tabIframeId=";
+                entity.ConnectionUrl = "/LR_NewWorkFlow/NWFProcess/Index";
                 entity.SendTime = DateTime.Now;
                 entity.ReadSigns = false;
-                //messageRindIBLL.SaveEntity("", entity);
+                messageRindIBLL.SaveEntity("", entity);
             }
 
         }
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 f544fdd5f..bd6faac10 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	
@@ -359,6 +359,30 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        /// <summary>
+        /// 站内消息提醒
+        /// </summary>
+        /// <param name="needpostuserlist"></param>
+        /// <param name="title"></param>
+        public void PushMessageRemind(List<UserEntity> 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<SYS_SendMessageEntity> GetList()
         {
             try
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/MessageRind/MessageRindService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/MessageRind/MessageRindService.cs
index 616697343..715365de6 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/MessageRind/MessageRindService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/MessageRind/MessageRindService.cs	
@@ -99,7 +99,9 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop
         {
             try
             {
-                string sql = "select count(1) from MessageRemind where ReadSigns=0";
+                var userInfo = LoginUserInfo.Get();
+                string sql = "select count(1) from MessageRemind where ReadSigns=0 ";
+                sql += $"  and ReceiptId='{userInfo.userId}'";
                 var obj = this.BaseRepository().FindObject(sql);
                 if (obj == null)
                     return 0;