Commit e199fe1b authored by 黄奎's avatar 黄奎

页面修改

parent c1834eb9
...@@ -472,7 +472,7 @@ SELECT ar.AccountRemark,A.Id,A.Account,A.AccountId,A.WorkUserId,A.Group_Id,A.Sch ...@@ -472,7 +472,7 @@ SELECT ar.AccountRemark,A.Id,A.Account,A.AccountId,A.WorkUserId,A.Group_Id,A.Sch
,(CASE WHEN CONCAT(DATE_FORMAT(now(),'%Y'),'-',DATE_FORMAT(BirthDate,'%m-%d')) >= DATE_FORMAT(now(),'%Y-%m-%d') ,(CASE WHEN CONCAT(DATE_FORMAT(now(),'%Y'),'-',DATE_FORMAT(BirthDate,'%m-%d')) >= DATE_FORMAT(now(),'%Y-%m-%d')
AND CONCAT(DATE_FORMAT(now(),'%Y'),'-',DATE_FORMAT(BirthDate,'%m-%d')) <= DATE_FORMAT(date_add(now(),INTERVAL 6 DAY),'%Y-%m-%d') AND CONCAT(DATE_FORMAT(now(),'%Y'),'-',DATE_FORMAT(BirthDate,'%m-%d')) <= DATE_FORMAT(date_add(now(),INTERVAL 6 DAY),'%Y-%m-%d')
THEN 1 THEN 1
ELSE 0 END) IsBirth ELSE 0 END) IsBirth,A.UserRole
FROM FROM
( (
SELECT A.Id,A.Account,A.`Password`, 1 as AccountType,B.MId as AccountId,A.WorkUserId SELECT A.Id,A.Account,A.`Password`, 1 as AccountType,B.MId as AccountId,A.WorkUserId
......
...@@ -915,6 +915,7 @@ namespace Edu.WebApi.Controllers.User ...@@ -915,6 +915,7 @@ namespace Edu.WebApi.Controllers.User
if (isB2B) if (isB2B)
{ {
message = "此学员手机号已绑定同行!请重新录入!"; message = "此学员手机号已绑定同行!请重新录入!";
PushMessage(model);
} }
else else
{ {
...@@ -949,6 +950,7 @@ namespace Edu.WebApi.Controllers.User ...@@ -949,6 +950,7 @@ namespace Edu.WebApi.Controllers.User
if (isB2B) if (isB2B)
{ {
message = "此学员QQ已绑定同行!请重新录入!"; message = "此学员QQ已绑定同行!请重新录入!";
PushMessage(model);
} }
else else
{ {
...@@ -970,6 +972,7 @@ namespace Edu.WebApi.Controllers.User ...@@ -970,6 +972,7 @@ namespace Edu.WebApi.Controllers.User
if (isB2B) if (isB2B)
{ {
message = "此学员微信号已绑定同行!请重新录入!"; message = "此学员微信号已绑定同行!请重新录入!";
PushMessage(model);
} }
else else
{ {
...@@ -1013,12 +1016,12 @@ namespace Edu.WebApi.Controllers.User ...@@ -1013,12 +1016,12 @@ namespace Edu.WebApi.Controllers.User
WorkMsgType = "markdown", WorkMsgType = "markdown",
SendTime = DateTime.Now, SendTime = DateTime.Now,
SendType = 0, SendType = 0,
Title = "同业添加学生通知", Title = "同业查询学生通知",
Platform = 5, Platform = 5,
}; };
if (model.CreateBy > 0) if (model.CreateBy > 0)
{ {
modelWork.ReceiveId = model.CreateType.ToString(); modelWork.ReceiveId = model.CreateBy.ToString();
Common.Message.MessageHelper.SendMessage(modelWork); Common.Message.MessageHelper.SendMessage(modelWork);
} }
if (assistList != null && assistList.Count > 0) if (assistList != null && assistList.Count > 0)
...@@ -1263,6 +1266,10 @@ namespace Edu.WebApi.Controllers.User ...@@ -1263,6 +1266,10 @@ namespace Edu.WebApi.Controllers.User
{ {
extModel.CreateByName = UserReidsCache.GetUserLoginInfo(extModel.CreateBy)?.AccountName ?? ""; extModel.CreateByName = UserReidsCache.GetUserLoginInfo(extModel.CreateBy)?.AccountName ?? "";
} }
if (customer != null)
{
PushMessage(extModel);
}
return ApiResult.Success(data: extModel); return ApiResult.Success(data: extModel);
} }
......
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