调整业务单据推送

Edu.Module.EduTask/EducationReceiptModule.cs

@@ -699,8 +699,8 @@ namespace Edu.Module.EduTask
                     notifyUsers.ForEach(x=> {
                         if (!string.IsNullOrEmpty(x.WorkUserId)) 
                         {
-                            var recipientPath = HttpUtility.UrlEncode($"/teacher/change-class-manager?tab=3&id={receipt.Id}");
-                            var content = $"<font color='info'>抄送通知</font> 你收到了一张{EnumHelper.ToName(receipt.ReceiptType)}单据抄送\n>**概要信息** \n>抄  送  人：<font color='comment'>{user.AccountName}</font>\n>单据编号：<font color='comment'>{receipt.Id}</font>\n>创  建  人：<font color='comment'>{UserReidsCache.GetUserLoginInfo(receipt.CreateBy).AccountName}</font>\n>申请时间：<font color='comment'>{receipt.CreateTime.ToString("MM-dd HH:mm")}</font>\n>请点击：[查看详情]({Config.ErpUrl}/autologin?loginId={x.Id}&target={recipientPath}";
+                            var recipientPath = HttpUtility.UrlEncode($"/teacher/change-class-manager?tab=4&id={receipt.Id}");
+                            var content = $"<font color='info'>抄送通知</font> 你收到了一张{EnumHelper.ToName(receipt.ReceiptType)}单据抄送\n>**概要信息** \n>抄  送  人：<font color='comment'>{user.AccountName}</font>\n>单据编号：<font color='comment'>{receipt.Id}</font>\n>创  建  人：<font color='comment'>{UserReidsCache.GetUserLoginInfo(receipt.CreateBy).AccountName}</font>\n>申请时间：<font color='comment'>{receipt.CreateTime.ToString("MM-dd HH:mm")}</font>\n>请点击：[查看详情]({Config.ErpUrl}/autologin?loginId={x.Id}&target={recipientPath})";
                             PushWorkChatHelper.PushToWorkChat(content,x.WorkUserId,"抄送通知");
                         }
                     });
@@ -760,11 +760,11 @@ namespace Edu.Module.EduTask
 
                     if (flag) {
                         #region 驳回通知
-                        var notifyUsers = accountRepository.GetWorkUserIdRepository(receipt.Id);
+                        var notifyUsers = accountRepository.GetWorkUserIdRepository(receipt.CreateBy);
                         if (!string.IsNullOrEmpty(notifyUsers))
                         {
-                            var recipientPath = HttpUtility.UrlEncode($"/teacher/change-class-manager?tab=0&id={receipt.Id}");
-                            var content = $"`业务单据驳回` 你有一张业务单据被驳回\n>**概要信息** \n>审  批  人：<font color='warning'>{user.AccountName}</font>\n>单据信息：<font color='comment'>{EnumHelper.ToName(receipt.ReceiptType)}单据 ({receipt.Id})</font>\n>驳回时间：<font color='comment'>{DateTime.Now.ToString("MM-dd HH-mm")}</font>\n>驳回理由：<font color='comment'>{auditModel.Description}</font>\n>请点击：[查看详情]({Config.ErpUrl}/autologin?loginId={receipt.CreateBy}&target={recipientPath}";
+                            var recipientPath = HttpUtility.UrlEncode($"/teacher/change-class-manager?tab=1&id={receipt.Id}");
+                            var content = $"`业务单据驳回` 你有一张业务单据被驳回\n>**概要信息** \n>审  批  人：<font color='warning'>{user.AccountName}</font>\n>单据信息：<font color='comment'>{EnumHelper.ToName(receipt.ReceiptType)}单据 ({receipt.Id})</font>\n>驳回时间：<font color='comment'>{DateTime.Now.ToString("MM-dd HH-mm")}</font>\n>驳回理由：<font color='comment'>{auditModel.Description}</font>\n>请点击：[查看详情]({Config.ErpUrl}/autologin?loginId={receipt.CreateBy}&target={recipientPath})";
                             PushWorkChatHelper.PushToWorkChat(content, notifyUsers, "业务单据驳回通知");
                         }
                         #endregion
@@ -952,11 +952,11 @@ namespace Edu.Module.EduTask
                     };
                     flag = education_ReceiptRepository.Update(fileds, new WhereHelper(nameof(RB_Education_Receipt_ViewModel.Id), receipt.Id));
                     #region 完成通知
-                    var notifyUsers = accountRepository.GetWorkUserIdRepository(receipt.Id);
+                    var notifyUsers = accountRepository.GetWorkUserIdRepository(receipt.CreateBy);
                     if (!string.IsNullOrEmpty(notifyUsers))
                     {
-                        var recipientPath = HttpUtility.UrlEncode($"/teacher/change-class-manager?tab=0&id={receipt.Id}");
-                        var content = $"<font color='info'>审核完成通知</font> 你有一张业务单据已审核完成\n>**概要信息** \n>审  批  人：<font color='warning'>{user.AccountName}</font>\n>单据信息：<font color='comment'>{EnumHelper.ToName(receipt.ReceiptType)}单据 ({receipt.Id})</font>\n>驳回时间：<font color='comment'>{DateTime.Now.ToString("MM-dd HH-mm")}</font>\n>审批备注：<font color='info'>已完成</font>\n>请点击：[查看详情]({Config.ErpUrl}/autologin?loginId={receipt.CreateBy}&target={recipientPath}";
+                        var recipientPath = HttpUtility.UrlEncode($"/teacher/change-class-manager?tab=1&id={receipt.Id}");
+                        var content = $"<font color='info'>审核完成通知</font> 你有一张业务单据已审核完成\n>**概要信息** \n>审  批  人：<font color='warning'>{user.AccountName}</font>\n>单据信息：<font color='comment'>{EnumHelper.ToName(receipt.ReceiptType)}单据 ({receipt.Id})</font>\n>驳回时间：<font color='comment'>{DateTime.Now.ToString("MM-dd HH-mm")}</font>\n>审批备注：<font color='info'>已完成</font>\n>请点击：[查看详情]({Config.ErpUrl}/autologin?loginId={receipt.CreateBy}&target={recipientPath})";
                         PushWorkChatHelper.PushToWorkChat(content, notifyUsers, "业务单据驳回通知");
                     }
                     #endregion
@@ -1116,11 +1116,11 @@ namespace Edu.Module.EduTask
                     }
 
                     #region 通过通知
-                    var notifyUsers = accountRepository.GetWorkUserIdRepository(receipt.Id);
+                    var notifyUsers = accountRepository.GetWorkUserIdRepository(receipt.CreateBy);
                     if (!string.IsNullOrEmpty(notifyUsers))
                     {
-                        var recipientPath = HttpUtility.UrlEncode($"/teacher/change-class-manager?tab=0&id={receipt.Id}");
-                        var content = $"<font color='info'>审核通知</font> 你有一张业务单据被通过\n>**概要信息** \n>审  批  人：<font color='warning'>{user.AccountName}</font>\n>单据信息：<font color='comment'>{EnumHelper.ToName(receipt.ReceiptType)}单据 ({receipt.Id})</font>\n>驳回时间：<font color='comment'>{DateTime.Now.ToString("MM-dd HH-mm")}</font>\n>审批备注：<font color='warning'>进行中</font>\n>请点击：[查看详情]({Config.ErpUrl}/autologin?loginId={receipt.CreateBy}&target={recipientPath}";
+                        var recipientPath = HttpUtility.UrlEncode($"/teacher/change-class-manager?tab=1&id={receipt.Id}");
+                        var content = $"<font color='info'>审核通知</font> 你有一张业务单据被通过\n>**概要信息** \n>审  批  人：<font color='warning'>{user.AccountName}</font>\n>单据信息：<font color='comment'>{EnumHelper.ToName(receipt.ReceiptType)}单据 ({receipt.Id})</font>\n>驳回时间：<font color='comment'>{DateTime.Now.ToString("MM-dd HH-mm")}</font>\n>审批备注：<font color='warning'>进行中</font>\n>请点击：[查看详情]({Config.ErpUrl}/autologin?loginId={receipt.CreateBy}&target={recipientPath})";
                         PushWorkChatHelper.PushToWorkChat(content, notifyUsers, "业务单据驳回通知");
                     }
                     #endregion
@@ -1370,8 +1370,8 @@ namespace Edu.Module.EduTask
                         {
                             if (!string.IsNullOrEmpty(x.WorkUserId))
                             {
-                                var recipientPath = HttpUtility.UrlEncode($"/teacher/change-class-manager?tab=1&id={receiptModel.Id}");
-                                var content = $"待审通知 你有一张业务单据等待审核\n>**概要信息** \n>单据信息：<font color='comment'>{EnumHelper.ToName(receiptModel.ReceiptType)}单据 ({receiptModel.Id})</font>\n>创  建  人：<font color='comment'>{UserReidsCache.GetUserLoginInfo(receiptModel.CreateBy).AccountName}</font>\n>创建时间：<font color='comment'>{receiptModel.CreateTime.ToString("MM-dd HH-mm")}</font>\n>请点击：[查看详情]({Config.ErpUrl}/autologin?loginId={x.Id}&target={recipientPath}";
+                                var recipientPath = HttpUtility.UrlEncode($"/teacher/change-class-manager?tab=3&id={receiptModel.Id}");
+                                var content = $"待审通知 你有一张业务单据等待审核\n>**概要信息** \n>单据信息：<font color='comment'>{EnumHelper.ToName(receiptModel.ReceiptType)}单据 ({receiptModel.Id})</font>\n>创  建  人：<font color='comment'>{UserReidsCache.GetUserLoginInfo(receiptModel.CreateBy).AccountName}</font>\n>创建时间：<font color='comment'>{receiptModel.CreateTime.ToString("MM-dd HH-mm")}</font>\n>请点击：[查看详情]({Config.ErpUrl}/autologin?loginId={x.Id}&target={recipientPath})";
                                 PushWorkChatHelper.PushToWorkChat(content, x.WorkUserId, "业务单据待审通知");
                             }
                         });

Edu.Repository/EduTask/RB_Education_ReceiptRepository.cs

@@ -417,8 +417,8 @@ WHERE 1=1
                                     var account = new RB_AccountRepository().GetEmployeeInfo(tItem);
                                     if (account!=null && !string.IsNullOrEmpty(account.WorkUserId))
                                     {
-                                        var recipientPath = HttpUtility.UrlEncode($"/teacher/change-class-manager?tab=1&id={model.Id}");
-                                        var content = $"待审通知 你有一张业务单据等待审核\n>**概要信息** \n>单据信息：<font color='comment'>{EnumHelper.ToName(model.ReceiptType)}单据 ({model.Id})</font>\n>创  建  人：<font color='comment'>{account.EmployeeName}</font>\n>创建时间：<font color='comment'>{DateTime.Now.ToString("MM-dd HH-mm")}</font>\n>请点击：[查看详情]({Config.ErpUrl}/autologin?loginId={tItem}&target={recipientPath}";
+                                        var recipientPath = HttpUtility.UrlEncode($"/teacher/change-class-manager?tab=3&id={model.Id}");
+                                        var content = $"待审通知 你有一张业务单据等待审核\n>**概要信息** \n>单据信息：<font color='comment'>{EnumHelper.ToName(model.ReceiptType)}单据 ({model.Id})</font>\n>创  建  人：<font color='comment'>{account.EmployeeName}</font>\n>创建时间：<font color='comment'>{DateTime.Now.ToString("MM-dd HH-mm")}</font>\n>请点击：[查看详情]({Config.ErpUrl}/autologin?loginId={tItem}&target={recipientPath})";
                                         PushWorkChatHelper.PushToWorkChat(content, account.WorkUserId, "业务单据待审通知");
                                     }
                                     #endregion
@@ -433,8 +433,8 @@ WHERE 1=1
                                 var account = new RB_AccountRepository().GetEmployeeInfo(subItem.UserId);
                                 if (account != null && !string.IsNullOrEmpty(account.WorkUserId))
                                 {
-                                    var recipientPath = HttpUtility.UrlEncode($"/teacher/change-class-manager?tab=1&id={model.Id}");
-                                    var content = $"待审通知 你有一张业务单据等待审核\n>**概要信息** \n>单据信息：<font color='comment'>{EnumHelper.ToName(model.ReceiptType)}单据 ({model.Id})</font>\n>创  建  人：<font color='comment'>{account.EmployeeName}</font>\n>创建时间：<font color='comment'>{DateTime.Now.ToString("MM-dd HH-mm")}</font>\n>请点击：[查看详情]({Config.ErpUrl}/autologin?loginId={subItem.UserId}&target={recipientPath}";
+                                    var recipientPath = HttpUtility.UrlEncode($"/teacher/change-class-manager?tab=3&id={model.Id}");
+                                    var content = $"待审通知 你有一张业务单据等待审核\n>**概要信息** \n>单据信息：<font color='comment'>{EnumHelper.ToName(model.ReceiptType)}单据 ({model.Id})</font>\n>创  建  人：<font color='comment'>{account.EmployeeName}</font>\n>创建时间：<font color='comment'>{DateTime.Now.ToString("MM-dd HH-mm")}</font>\n>请点击：[查看详情]({Config.ErpUrl}/autologin?loginId={subItem.UserId}&target={recipientPath})";
                                     PushWorkChatHelper.PushToWorkChat(content, account.WorkUserId, "业务单据待审通知");
                                 }
                                 #endregion

Edu.Repository/User/RB_AccountRepository.cs

@@ -144,17 +144,17 @@ SELECT A.*,IFNULL(G.GroupName,'') AS GroupName,IFNULL(s.SName,'') AS SchoolName,
        ,IFNULL(d.DeptName,'') AS DeptName,IFNULL(p.PostName,'') AS PostName
 FROM 
 (
-		SELECT A.Id,A.Account,A.`Password`,A.AccountType,A.AccountId,A.CreateBy,A.CreateTime,A.UpdateBy,A.UpdateTime,A.Group_Id,B.School_Id,A.`Status`,B.LeaveStatus
+		SELECT A.WorkUserId,A.Id,A.Account,A.`Password`,A.AccountType,A.AccountId,A.CreateBy,A.CreateTime,A.UpdateBy,A.UpdateTime,A.Group_Id,B.School_Id,A.`Status`,B.LeaveStatus
               ,A.AnnualLeaveDay, A.DirectSupervisor,A.OpenId,A.ActivationStatus,IFNULL(B.MName,'') AS AccountName,B.MHead AS UserIcon,B.Dept_Id,B.Post_Id,IFNULL(B.Email,'') AS Email
 		FROM rb_account AS A INNER JOIN rb_manager AS B ON A.AccountId=B.MId AND A.AccountType=1
 		WHERE 1=1  {0}
 		UNION ALL
-		SELECT A.Id,A.Account,A.`Password`,A.AccountType,A.AccountId,A.CreateBy,A.CreateTime,A.UpdateBy,A.UpdateTime,A.Group_Id,B.School_Id,A.`Status`,B.LeaveStatus
+		SELECT A.WorkUserId,A.Id,A.Account,A.`Password`,A.AccountType,A.AccountId,A.CreateBy,A.CreateTime,A.UpdateBy,A.UpdateTime,A.Group_Id,B.School_Id,A.`Status`,B.LeaveStatus
               ,A.AnnualLeaveDay, A.DirectSupervisor,A.OpenId,A.ActivationStatus,IFNULL(B.TeacherName,'') AS AccountName,B.TeacherIcon AS UserIcon,B.Dept_Id,B.Post_Id,IFNULL(B.Email,'') AS Email
 		FROM rb_account AS A INNER JOIN rb_teacher AS B ON A.AccountId=B.TId AND A.AccountType=2
 		WHERE 1=1  {0}
 		UNION ALL
-		SELECT A.Id,A.Account,A.`Password`,A.AccountType,A.AccountId,A.CreateBy,A.CreateTime,A.UpdateBy,A.UpdateTime,A.Group_Id,B.School_Id,A.`Status`,B.LeaveStatus
+		SELECT A.WorkUserId,A.Id,A.Account,A.`Password`,A.AccountType,A.AccountId,A.CreateBy,A.CreateTime,A.UpdateBy,A.UpdateTime,A.Group_Id,B.School_Id,A.`Status`,B.LeaveStatus
               ,A.AnnualLeaveDay, A.DirectSupervisor,A.OpenId,A.ActivationStatus,IFNULL(B.AssistName,'') AS AccountName,B.AssistIcon AS UserIcon,B.Dept_Id,B.Post_Id,IFNULL(B.Email,'') AS Email
 		FROM rb_account AS A INNER JOIN rb_assist AS B ON A.AccountId=B.AId AND A.AccountType=3
 		WHERE 1=1  {0}