Skip to content

E
Education
Commit 56141d04 authored by 罗超's avatar 罗超
Browse files
Options

新增学员状态的推送通知

parent dd834973
Hide whitespace changes
Inline Side-by-side
Showing with 276 additions and 42 deletions
Edu.Model/ViewModel/Grade/RB_Class_Plan_ViewModel.cs
View file @ 56141d04
......@@ -164,5 +164,6 @@ namespace Edu.Model.ViewModel.Grade
/// </summary>
public int OrderBy { get; set; }
}
}
Edu.Module.Course/ClassModule.cs
View file @ 56141d04
......@@ -1946,7 +1946,7 @@ namespace Edu.Module.Course
// 学员名称（名称+电话），剩余课时，关联单号，待收金额，班级老师，班级名称
var path = $"/sale/myOrder?OrderId={guestModel.OrderId}";
path = HttpUtility.UrlEncode(path);
string markdownContent = $"`欠费通知` 学员欠费停课通知\n>**概要信息** \n>学员名称：{guestModel.GuestName}({guestModel.Mobile})\n>当前状态：<font color='warning'>停课</font>\n>关联单号：{guestModel.OrderId}\n>\n>待收金额：<font color='warning'>￥{shengyuMoney.ToString("0.00")}</font>\n>班级名称：<font>{classModel.ClassName}</font>\n>请点击：[查看详情]({Config.ErpUrl}/autologin?loginId={orderModel.EnterID}&target={path})";
string markdownContent = $"`停课通知` 学员欠费停课通知\n>**概要信息** \n>学员名称：{guestModel.GuestName}({guestModel.Mobile})\n>当前状态：<font color='warning'>停课</font>\n>关联单号：{guestModel.OrderId}\n>\n>待收金额：<font color='warning'>￥{shengyuMoney.ToString("0.00")}</font>\n>停课理由：费用不足，系统自动触发停课限制\n>班级名称：<font>{classModel.ClassName}</font>\n>请点击：[查看详情]({Config.ErpUrl}/autologin?loginId={orderModel.EnterID}&target={path})";
Common.Message.PushMessageModel modelWork = new Common.Message.PushMessageModel()
{
CategoryId = PushMessageCategoryEnum.SalePeople,
......@@ -1967,29 +1967,31 @@ namespace Edu.Module.Course
#endregion
#region 欠费提醒（管理者）
var queryNotifyManagerWorkId = accountRepository.GetWorkUserIdByDictRepository("Push_Arrears");
if (!string.IsNullOrEmpty(queryTargetWorkId))
var queryNotifyManager = accountRepository.GetWorkUserIdByDictRepository("Push_Arrears");
if (queryNotifyManager != null && queryNotifyManager.Count > 0)
{
var path = $"/sale/orderStatistics?OrderId={guestModel.OrderId}";
path = HttpUtility.UrlEncode(path);
string markdownContent = $"`欠费通知` 学员欠费停课通知\n>**概要信息** \n>学员名称：{guestModel.GuestName}({guestModel.Mobile})\n>当前状态：<font color='warning'>停课</font>\n>关联单号：{guestModel.OrderId}({sellerInfo.AccountName})\n>\n>待收金额：<font color='warning'>￥{shengyuMoney.ToString("0.00")}</font>\n>班级名称：<font>{classModel.ClassName}</font>\n>请点击：[查看详情]({Config.ErpUrl}/autologin?loginId={orderModel.EnterID}&target={path})";
Common.Message.PushMessageModel modelWork = new Common.Message.PushMessageModel()
queryNotifyManager.ForEach(x =>
{
CategoryId = PushMessageCategoryEnum.SalePeople,
Content = markdownContent,
CoverImg = "",
CreateByName = "系统",
JumpUrl = "",
WorkMsgType = "markdown",
SendTime = DateTime.Now,
SendType = 0,
Title = "学员欠费停课通知",
Platform = 5,
ReceiveId = queryNotifyManagerWorkId
};
Common.Message.MessageHelper.SendMessage(modelWork);
var path = $"/sale/orderStatistics?OrderId={guestModel.OrderId}";
path = HttpUtility.UrlEncode(path);
string markdownContent = $"`停课通知` 学员欠费停课通知\n>**概要信息** \n>学员名称：{guestModel.GuestName}({guestModel.Mobile})\n>当前状态：<font color='warning'>停课</font>\n>关联单号：{guestModel.OrderId}({sellerInfo.AccountName})\n>\n>待收金额：<font color='warning'>￥{shengyuMoney.ToString("0.00")}</font>\n>停课理由：费用不足，系统自动触发停课限制\n>班级名称：<font>{classModel.ClassName}</font>\n>请点击：[查看详情]({Config.ErpUrl}/autologin?loginId={x.Id}&target={path})";
Common.Message.PushMessageModel modelWork = new Common.Message.PushMessageModel()
{
CategoryId = PushMessageCategoryEnum.SalePeople,
Content = markdownContent,
CoverImg = "",
CreateByName = "系统",
JumpUrl = "",
WorkMsgType = "markdown",
SendTime = DateTime.Now,
SendType = 0,
Title = "学员欠费停课通知",
Platform = 5,
ReceiveId = x.WorkUserId
};
Common.Message.MessageHelper.SendMessage(modelWork);
});
}
#endregion
}
......@@ -2026,13 +2028,48 @@ namespace Edu.Module.Course
}
#endregion
#region 即将欠费提醒（管理者）
var queryNotifyManagerWorkId = accountRepository.GetWorkUserIdByDictRepository("Push_Arrears");
if (!string.IsNullOrEmpty(queryNotifyManagerWorkId))
var queryNotifyManager = accountRepository.GetWorkUserIdByDictRepository("Push_Arrears");
if (queryNotifyManager!=null && queryNotifyManager.Count>0)
{
var path = $"/sale/orderStatistics?OrderId={guestModel.OrderId}";
path = HttpUtility.UrlEncode(path);
queryNotifyManager.ForEach(x => {
var path = $"/sale/orderStatistics?OrderId={guestModel.OrderId}";
path = HttpUtility.UrlEncode(path);
string markdownContent = $"`欠费预警` 学员即将欠费通知\n>**概要信息** \n>学员名称：{guestModel.GuestName}({guestModel.Mobile})\n>剩余课时：<font color='warning'>{shenyuHours}</font>\n>关联单号：{guestModel.OrderId}({sellerInfo.AccountName})\n>\n>待收金额：<font color='warning'>￥{shengyuMoney.ToString("0.00")}</font>\n>班级名称：<font>{classModel.ClassName}</font>\n>请点击：[查看详情]({Config.ErpUrl}/autologin?loginId={orderModel.EnterID}&target={path})";
string markdownContent = $"`欠费预警` 学员即将欠费通知\n>**概要信息** \n>学员名称：{guestModel.GuestName}({guestModel.Mobile})\n>剩余课时：<font color='warning'>{shenyuHours}</font>\n>关联单号：{guestModel.OrderId}({sellerInfo.AccountName})\n>\n>待收金额：<font color='warning'>￥{shengyuMoney.ToString("0.00")}</font>\n>班级名称：<font>{classModel.ClassName}</font>\n>请点击：[查看详情]({Config.ErpUrl}/autologin?loginId={x.Id}&target={path})";
Common.Message.PushMessageModel modelWork = new Common.Message.PushMessageModel()
{
CategoryId = PushMessageCategoryEnum.SalePeople,
Content = markdownContent,
CoverImg = "",
CreateByName = "系统",
JumpUrl = "",
WorkMsgType = "markdown",
SendTime = DateTime.Now,
SendType = 0,
Title = "学员即将欠费通知",
Platform = 5,
ReceiveId = x.WorkUserId
};
Common.Message.MessageHelper.SendMessage(modelWork);
});
}
#endregion
}
else if (guestModel.TotalHours == guestModel.ValidClassHours && shenyuHours < 12 && shenyuHours>0)
{
var orderModel = orderRepository.GetEntity(guestModel.OrderId);
var shengyuMoney = orderModel.PreferPrice - orderModel.Income + orderModel.Refund - orderModel.PlatformTax - orderModel.DiscountMoney - orderModel.LessPrice;
var classModel = classRepository.GetEntity<RB_Class_ViewModel>(guestModel.ClassId);
var sellerInfo = UserReidsCache.GetUserLoginInfo(orderModel.EnterID);
#region 即将结课提醒 (销售端)
var queryTargetWorkId = accountRepository.GetWorkUserIdRepository(orderModel.EnterID);
if (!string.IsNullOrEmpty(queryTargetWorkId))
{
// 学员名称（名称+电话），剩余课时，关联单号，待收金额，班级老师，班级名称
var path = $"/sale/myOrder?OrderId={guestModel.OrderId}";
path = HttpUtility.UrlEncode(path);
string markdownContent = $"`结课预警` 学员即将结课通知\n>**概要信息** \n>学员名称：{guestModel.GuestName}({guestModel.Mobile})\n>剩余课时：<font color='warning'>{shenyuHours}</font>\n>是否续班：<font color='{(orderModel.RenewOrderId > 0 ? "info" : "warning")}'>{(orderModel.RenewOrderId > 0 ? "已续班(" + orderModel.RenewOrderId + ")" : "未续班")}</font>\n>关联单号：{guestModel.OrderId}\n>\n>班级名称：<font>{classModel.ClassName}</font>\n>请点击：[查看详情]({Config.ErpUrl}/autologin?loginId={orderModel.EnterID}&target={path})";
Common.Message.PushMessageModel modelWork = new Common.Message.PushMessageModel()
{
CategoryId = PushMessageCategoryEnum.SalePeople,
......@@ -2043,28 +2080,60 @@ namespace Edu.Module.Course
WorkMsgType = "markdown",
SendTime = DateTime.Now,
SendType = 0,
Title = "学员即将欠费通知",
Title = "学员即将结课通知",
Platform = 5,
ReceiveId = queryNotifyManagerWorkId
ReceiveId = queryTargetWorkId
};
Common.Message.MessageHelper.SendMessage(modelWork);
}
#endregion
#region 即将结课提醒 (管理端)
var queryNotifyManager = accountRepository.GetWorkUserIdByDictRepository("Push_EndClass");
if (queryNotifyManager != null && queryNotifyManager.Count > 0)
{
queryNotifyManager.ForEach(x =>
{
// 学员名称（名称+电话），剩余课时，关联单号，待收金额，班级老师，班级名称
var path = $"/sale/orderStatistics?OrderId={guestModel.OrderId}";
path = HttpUtility.UrlEncode(path);
string markdownContent = $"`结课预警` 学员即将结课通知\n>**概要信息** \n>学员名称：{guestModel.GuestName}({guestModel.Mobile})\n>剩余课时：<font color='warning'>{shenyuHours}</font>\n>是否续班：<font color='{(orderModel.RenewOrderId > 0 ? "info" : "warning")}'>{(orderModel.RenewOrderId > 0 ? "已续班(" + orderModel.RenewOrderId + ")" : "未续班")}</font>\n>关联单号：{guestModel.OrderId} ({sellerInfo.AccountName})\n>\n>班级名称：<font>{classModel.ClassName}</font>\n>请点击：[查看详情]({Config.ErpUrl}/autologin?loginId={x.Id}&target={path})";
Common.Message.PushMessageModel modelWork = new Common.Message.PushMessageModel()
{
CategoryId = PushMessageCategoryEnum.SalePeople,
Content = markdownContent,
CoverImg = "",
CreateByName = "系统",
JumpUrl = "",
WorkMsgType = "markdown",
SendTime = DateTime.Now,
SendType = 0,
Title = "学员即将结课通知",
Platform = 5,
ReceiveId = x.WorkUserId
};
Common.Message.MessageHelper.SendMessage(modelWork);
});
}
#endregion
}
else if (guestModel.TotalHours == guestModel.ValidClassHours && shenyuHours < 12)
else if (guestModel.TotalHours == guestModel.ValidClassHours && shenyuHours == 0)
{
#region 即将结课提醒
var orderModel = orderRepository.GetEntity(guestModel.OrderId);
var shengyuMoney = orderModel.PreferPrice - orderModel.Income + orderModel.Refund - orderModel.PlatformTax - orderModel.DiscountMoney - orderModel.LessPrice;
var classModel = classRepository.GetEntity<RB_Class_ViewModel>(guestModel.ClassId);
var sellerInfo = UserReidsCache.GetUserLoginInfo(orderModel.EnterID);
#region 即将结课提醒 (销售端)
var queryTargetWorkId = accountRepository.GetWorkUserIdRepository(orderModel.EnterID);
if (!string.IsNullOrEmpty(queryTargetWorkId))
{
// 学员名称（名称+电话），剩余课时，关联单号，待收金额，班级老师，班级名称
var path = $"/sale/myOrder?OrderId={guestModel.OrderId}";
path = HttpUtility.UrlEncode(path);
var shengyuMoney = orderModel.PreferPrice - orderModel.Income + orderModel.Refund - orderModel.PlatformTax - orderModel.DiscountMoney - orderModel.LessPrice;
var classModel = classRepository.GetEntity<RB_Class_ViewModel>(guestModel.ClassId);
string markdownContent = $"`结课预警` 学员即将结课通知\n>**概要信息** \n>学员名称：{guestModel.GuestName}({guestModel.Mobile})\n>剩余课时：<font color='warning'>{shenyuHours}</font>\n>是否续班：<font color='{(orderModel.RenewOrderId > 0 ? "info" : "warning")}'>{(orderModel.RenewOrderId > 0 ? "已续班(" + orderModel.RenewOrderId + ")" : "未续班")}</font>\n>关联单号：{guestModel.OrderId}\n>\n>班级名称：<font>{classModel.ClassName}</font>\n>请点击：[查看详情]({Config.ErpUrl}/autologin?loginId={orderModel.EnterID}&target={path})";
string markdownContent = $"`结课通知` 学员已结课通知\n>**概要信息** \n>学员名称：{guestModel.GuestName}({guestModel.Mobile})\n>剩余课时：<font color='warning'>{shenyuHours}</font>\n>是否续班：<font color='{(orderModel.RenewOrderId > 0 ? "info" : "warning")}'>{(orderModel.RenewOrderId > 0 ? "已续班(" + orderModel.RenewOrderId + ")" : "未续班")}</font>\n>关联单号：{guestModel.OrderId}\n>\n>班级名称：<font>{classModel.ClassName}</font>\n>请点击：[查看详情]({Config.ErpUrl}/autologin?loginId={orderModel.EnterID}&target={path})";
Common.Message.PushMessageModel modelWork = new Common.Message.PushMessageModel()
{
CategoryId = PushMessageCategoryEnum.SalePeople,
......@@ -2075,7 +2144,7 @@ namespace Edu.Module.Course
WorkMsgType = "markdown",
SendTime = DateTime.Now,
SendType = 0,
Title = "学员即将欠费通知",
Title = "学员已结课通知",
Platform = 5,
ReceiveId = queryTargetWorkId
};
......@@ -2083,9 +2152,77 @@ namespace Edu.Module.Course
}
#endregion
#region 即将结课提醒 (销售端)
var queryNotifyManager = accountRepository.GetWorkUserIdByDictRepository("Push_EndClass");
if (queryNotifyManager != null && queryNotifyManager.Count > 0)
{
queryNotifyManager.ForEach(x =>
{
// 学员名称（名称+电话），剩余课时，关联单号，待收金额，班级老师，班级名称
var path = $"/sale/orderStatistics?OrderId={guestModel.OrderId}";
path = HttpUtility.UrlEncode(path);
string markdownContent = $"`结课通知` 学员已结课通知\n>**概要信息** \n>学员名称：{guestModel.GuestName}({guestModel.Mobile})\n>剩余课时：<font color='warning'>{shenyuHours}</font>\n>是否续班：<font color='{(orderModel.RenewOrderId > 0 ? "info" : "warning")}'>{(orderModel.RenewOrderId > 0 ? "已续班(" + orderModel.RenewOrderId + ")" : "未续班")}</font>\n>关联单号：{guestModel.OrderId} ({sellerInfo.AccountName})\n>\n>班级名称：<font>{classModel.ClassName}</font>\n>请点击：[查看详情]({Config.ErpUrl}/autologin?loginId={x.Id}&target={path})";
Common.Message.PushMessageModel modelWork = new Common.Message.PushMessageModel()
{
CategoryId = PushMessageCategoryEnum.SalePeople,
Content = markdownContent,
CoverImg = "",
CreateByName = "系统",
JumpUrl = "",
WorkMsgType = "markdown",
SendTime = DateTime.Now,
SendType = 0,
Title = "学员已结课通知",
Platform = 5,
ReceiveId = x.WorkUserId
};
Common.Message.MessageHelper.SendMessage(modelWork);
});
}
#endregion
}
if (item.CheckStatus == 1)
{
#region 通知缺勤信息
var param = new RB_Class_Plan_ViewModel()
{
ClassTimeId=item.ClassTimeId
};
var planModel = class_PlanRepository.GetClassPlanListExtRepository(param).FirstOrDefault();
var queryNotifyManager = accountRepository.GetWorkUserIdByDictRepository("Push_Absence");
if (queryNotifyManager != null && queryNotifyManager.Count > 0)
{
queryNotifyManager.ForEach(x =>
{
// 学员名称（名称+电话），剩余课时，关联单号，待收金额，班级老师，班级名称
var path = $"/stuMan/studentManage?OrderId={guestModel.OrderId}";
path = HttpUtility.UrlEncode(path);
string markdownContent = $"`缺勤通知` 学员缺勤信息告知\n>**概要信息** \n>学员名称：{guestModel.GuestName}({guestModel.Mobile})\n>缺勤时间：<font color='warning'>{planModel.ClassDate}({planModel.StartTime}-{planModel.EndTime})</font>\n>关联单号：{guestModel.OrderId}\n>班级名称：<font>{planModel.ClassName}</font>\n>带班老师：<font>{planModel.TeacherName}</font>\n>请点击：[查看详情]({Config.ErpUrl}/autologin?loginId={x.Id}&target={path})";
Common.Message.PushMessageModel modelWork = new Common.Message.PushMessageModel()
{
CategoryId = PushMessageCategoryEnum.SalePeople,
Content = markdownContent,
CoverImg = "",
CreateByName = "系统",
JumpUrl = "",
WorkMsgType = "markdown",
SendTime = DateTime.Now,
SendType = 0,
Title = "学员缺勤通知",
Platform = 5,
ReceiveId = x.WorkUserId
};
Common.Message.MessageHelper.SendMessage(modelWork);
});
}
#endregion
}
flag = order_GuestRepository.Update(orderFileds, new WhereHelper(nameof(RB_Order_Guest_ViewModel.Id), item.OrderGuestId));
if (flag && !string.IsNullOrEmpty(LogContent))
{
......@@ -2189,6 +2326,66 @@ namespace Edu.Module.Course
fileds.Add(nameof(RB_Order_Guest_ViewModel.GuestState), 5);
checkFileds.Add(nameof(RB_Class_Check_ViewModel.IsAbsentHours), 1);
checkFileds.Add(nameof(RB_Class_Check_ViewModel.MakeUpStatus), 4);
var orderModel = orderRepository.GetEntity(guestModel.OrderId);
var shengyuMoney = orderModel.PreferPrice - orderModel.Income + orderModel.Refund - orderModel.PlatformTax - orderModel.DiscountMoney - orderModel.LessPrice;
var classModel = classRepository.GetEntity<RB_Class_ViewModel>(guestModel.ClassId);
var sellerInfo = UserReidsCache.GetUserLoginInfo(orderModel.EnterID);
#region 欠费提醒（销售）
var queryTargetWorkId = accountRepository.GetWorkUserIdRepository(orderModel.EnterID);
if (!string.IsNullOrEmpty(queryTargetWorkId))
{
// 学员名称（名称+电话），剩余课时，关联单号，待收金额，班级老师，班级名称
var path = $"/sale/myOrder?OrderId={guestModel.OrderId}";
path = HttpUtility.UrlEncode(path);
string markdownContent = $"`停课通知` 学员欠费停课通知\n>**概要信息** \n>学员名称：{guestModel.GuestName}({guestModel.Mobile})\n>当前状态：<font color='warning'>停课</font>\n>关联单号：{guestModel.OrderId}\n>\n>待收金额：<font color='warning'>￥{shengyuMoney.ToString("0.00")}</font>\n>停课理由：连续缺课超过{Config.AbsentHours}课时，系统自动停课\n>班级名称：<font>{classModel.ClassName}</font>\n>请点击：[查看详情]({Config.ErpUrl}/autologin?loginId={orderModel.EnterID}&target={path})";
Common.Message.PushMessageModel modelWork = new Common.Message.PushMessageModel()
{
CategoryId = PushMessageCategoryEnum.SalePeople,
Content = markdownContent,
CoverImg = "",
CreateByName = "系统",
JumpUrl = "",
WorkMsgType = "markdown",
SendTime = DateTime.Now,
SendType = 0,
Title = "学员欠费停课通知",
Platform = 5,
ReceiveId = queryTargetWorkId
};
Common.Message.MessageHelper.SendMessage(modelWork);
}
#endregion
#region 欠费提醒（管理者）
var queryNotifyManager = accountRepository.GetWorkUserIdByDictRepository("Push_Arrears");
if (queryNotifyManager != null && queryNotifyManager.Count > 0)
{
queryNotifyManager.ForEach(x =>
{
var path = $"/sale/orderStatistics?OrderId={guestModel.OrderId}";
path = HttpUtility.UrlEncode(path);
string markdownContent = $"`停课通知` 学员欠费停课通知\n>**概要信息** \n>学员名称：{guestModel.GuestName}({guestModel.Mobile})\n>当前状态：<font color='warning'>停课</font>\n>关联单号：{guestModel.OrderId}({sellerInfo.AccountName})\n>\n>待收金额：<font color='warning'>￥{shengyuMoney.ToString("0.00")}</font>\n>停课理由：连续缺课超过{Config.AbsentHours}课时，系统自动停课\n>班级名称：<font>{classModel.ClassName}</font>\n>请点击：[查看详情]({Config.ErpUrl}/autologin?loginId={x.Id}&target={path})";
Common.Message.PushMessageModel modelWork = new Common.Message.PushMessageModel()
{
CategoryId = PushMessageCategoryEnum.SalePeople,
Content = markdownContent,
CoverImg = "",
CreateByName = "系统",
JumpUrl = "",
WorkMsgType = "markdown",
SendTime = DateTime.Now,
SendType = 0,
Title = "学员欠费停课通知",
Platform = 5,
ReceiveId = x.WorkUserId
};
Common.Message.MessageHelper.SendMessage(modelWork);
});
}
#endregion
}
if (fileds != null && fileds.Count > 0 && checkFileds != null && checkFileds.Count > 0)
{
......
Edu.Module.Course/OrderModule.cs
View file @ 56141d04
......@@ -5,6 +5,7 @@ using Edu.Common.API;
using Edu.Common.Enum;
using Edu.Common.Enum.Course;
using Edu.Common.Enum.Sale;
using Edu.Common.Enum.System;
using Edu.Common.Plugin;
using Edu.Model.CacheModel;
using Edu.Model.Entity.Contract;
......@@ -32,6 +33,7 @@ using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using VT.FW.DB;
namespace Edu.Module.Course
......@@ -846,6 +848,41 @@ namespace Edu.Module.Course
System.Threading.Tasks.Task.Run(() => UpdateClassInventoryNum(demodel));
}
#endregion
#region 推送订单报入日志
var queryNotifyManager = accountRepository.GetWorkUserIdByDictRepository("Push_NewOrder");
var param = new RB_Class_ViewModel()
{
ClassId = demodel.ClassId
};
var classDetailModel = classRepository.GetClassAndCourseListRepository(param).FirstOrDefault();
if (queryNotifyManager != null && queryNotifyManager.Count > 0)
{
queryNotifyManager.ForEach(x =>
{
var path = $"/sale/orderStatistics?OrderId={OrderId}";
path = HttpUtility.UrlEncode(path);
string markdownContent = $"<font color='info'>新订单通知</font> 新报入订单推送通知\n>**概要信息** \n>订单编号：{OrderId}\n>关联销售：{userInfo.AccountName}\n>报入班级：{classDetailModel.ClassName}\n>带班老师：{classDetailModel.TeacherName}\n>学习课程：{classDetailModel.CourseName}\n>开班时间：{classDetailModel.OpenTime}\n>订单金额：<font color='warning'>￥{demodel.PreferPrice}({demodel.GuestNum}人)</font>\n>销售备注：<font color='comment'>{demodel.SaleRemark}</font>\n>请点击：[查看详情]({Config.ErpUrl}/autologin?loginId={x.Id}&target={path})";
Common.Message.PushMessageModel modelWork = new Common.Message.PushMessageModel()
{
CategoryId = PushMessageCategoryEnum.SalePeople,
Content = markdownContent,
CoverImg = "",
CreateByName = "系统",
JumpUrl = "",
WorkMsgType = "markdown",
SendTime = DateTime.Now,
SendType = 0,
Title = "新订单通知",
Platform = 5,
ReceiveId = x.WorkUserId
};
Common.Message.MessageHelper.SendMessage(modelWork);
});
}
#endregion
}
#region 写日志
......
Edu.Repository/Grade/RB_Class_PlanRepository.cs
View file @ 56141d04
......@@ -91,10 +91,11 @@ WHERE 1=1
SELECT A.*,IFNULL(B.RoomName,'') AS RoomName,IFNULL(T.TeacherName,'') AS TeacherName,IFNULL(T.TeacherHead,'') AS UserIcon
,Time.StartTime,time.EndTime,time.ClassTimeId
,TIMESTAMPDIFF(MINUTE, CONCAT('2020-12-16',' ',time.StartTime), CONCAT('2020-12-16',' ',time.EndTime)) AS ClassMinutes
,time.TimeHour
,time.TimeHour,c.ClassName
FROM RB_Class_Plan AS A LEFT JOIN rb_class_room AS B ON A.ClassRoomId=B.RoomId
LEFT JOIN rb_teacher AS T ON A.TeacherId=T.TId
LEFT JOIN rb_class_time AS time ON A.ClassPlanId=Time.ClassPlanId
Left JOIN rb_class as c ON c.ClassId=A.ClassId
WHERE 1=1
");
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.Status), (int)DateStateEnum.Normal);
......
Edu.Repository/User/RB_AccountRepository.cs
View file @ 56141d04
......@@ -662,13 +662,11 @@ WHERE e.RB_Group_id ={GroupId} AND e.IsLeave =0 AND o.Score =0 GROUP BY e.Employ
/// </summary>
/// <param name="departmentIds"></param>
/// <returns></returns>
public string GetWorkUserIdByDictRepository(string dictKey)
public List<RB_Account_ViewModel> GetWorkUserIdByDictRepository(string dictKey)
{
string sql = $"select GROUP_CONCAT(WorkUserId SEPARATOR '|') from rb_account a where EXISTS(select DictKey from rb_dictvalue where DictKey='{dictKey}' and FIND_IN_SET(a.Id,Content)>0)";
string sql = $"select Id,WorkUserId from rb_account a where EXISTS(select DictKey from rb_dictvalue where DictKey='{dictKey}' and FIND_IN_SET(a.Id,Content)>0) and WorkUserId is not null";
var result = ExecuteScalar(sql, null);
return result != null ? string.Empty : result.ToString();
return Get<RB_Account_ViewModel>(sql).ToList();
}
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment