Commit 6fd4c9ed authored by liudong1993's avatar liudong1993

推送消息调整

parent f12fc489
......@@ -1715,7 +1715,7 @@ namespace Property.Module.FixedAssets
//推送消息
if (sendAccount.Any())
{
PushAuditMessage(sendAccount, demodel.Id, "您有待审核的资产信息", "资产审核通知", userInfo.EmployeeId, SysTemPushTypeEnum.PropertyAudit);
PushAuditMessage(sendAccount, demodel.Id, "您有待审核的资产信息", "资产审核通知", userInfo.EmployeeId, Common.Models.PushMessageCategoryEnum.Property);
}
}
}
......@@ -2032,7 +2032,7 @@ namespace Property.Module.FixedAssets
//推送消息
if (sendAccount.Any())
{
PushAuditMessage(sendAccount, Id, "您有待审核的资产信息", "资产审核通知", userInfo.EmployeeId, SysTemPushTypeEnum.PropertyAudit);
PushAuditMessage(sendAccount, Id, "您有待审核的资产信息", "资产审核通知", userInfo.EmployeeId, Common.Models.PushMessageCategoryEnum.Property);
}
}
}
......@@ -2095,7 +2095,7 @@ namespace Property.Module.FixedAssets
//推送消息
if (sendAccount.Any())
{
PushAuditMessage(sendAccount, demodel.Id, "您有待审核的耗材入库信息", "耗材审核通知", userInfo.EmployeeId, SysTemPushTypeEnum.SuppliesAudit);
PushAuditMessage(sendAccount, demodel.Id, "您有待审核的耗材入库信息", "耗材审核通知", userInfo.EmployeeId, Common.Models.PushMessageCategoryEnum.Property);
}
return ApiResult.Success("流程生成成功");
......@@ -2112,21 +2112,27 @@ namespace Property.Module.FixedAssets
/// <param name="title"></param>
/// <param name="empId"></param>
/// <param name="type"></param>
public void PushAuditMessage(List<EmAccoutIdModel> account, int workFlowId, string content, string title, int? empId, SysTemPushTypeEnum type)
public void PushAuditMessage(List<EmAccoutIdModel> account, int workFlowId, string content, string title, int? empId, Common.Models.PushMessageCategoryEnum type)
{
//Dictionary<string, object> appExtras = new Dictionary<string, object>();
//string url = "";
//if (type == SysTemPushTypeEnum.PropertyAudit) {
// url = "AssetsShenpi?Id=" + workFlowId + "&compType=shenpi";
//}
//Dictionary<string, object> webExtras = new Dictionary<string, object>
//{
// { "jumpUrl", url }
//};
//appExtras.Add("jumpUrl", "vt://financeApprovalDetail/view?ID=" + workFlowId + "&Conditon=3&Source=message&Type=" + Type);
//IMService.PushFinanceMessage(account, empId, content, title, type, SystemPushLogTypeEnum.XMApp, appExtras);
//IMService.PushMessage(account.RefMapperToList<Property.Common.Models.EmAccoutIdModel>(), empId, content, title, type, SystemPushLogTypeEnum.Web, webExtras);
List<Common.Message.PushMessageModel> SendList = new List<Common.Message.PushMessageModel>();
foreach (var item in account)
{
Common.Message.PushMessageModel model = new Common.Message.PushMessageModel()
{
CategoryId = type,
Content = content,
CoverImg = "",
CreateByName = item.EmAccount,
JumpUrl = $"",
SendTime = DateTime.Now,
SendType = 0,
Title = title,
Platform = 2,
ReceiveId = item.EmployeeId.ToString(),
};
SendList.Add(model);
}
Common.Message.MessageHelper.SendMessage(SendList);
}
/// <summary>
......@@ -3888,7 +3894,7 @@ namespace Property.Module.FixedAssets
//推送消息
if (sendAccount.Any())
{
PushAuditMessage(sendAccount, demodel.Id, "您有待审核的请购信息", "请购审核通知", userInfo.EmployeeId, SysTemPushTypeEnum.PropertyAudit);
PushAuditMessage(sendAccount, demodel.Id, "您有待审核的请购信息", "请购审核通知", userInfo.EmployeeId, Common.Models.PushMessageCategoryEnum.BuyingRequisition);
}
}
}
......@@ -3964,7 +3970,7 @@ namespace Property.Module.FixedAssets
//推送消息
if (sendAccount.Any())
{
PushAuditMessage(sendAccount, Id, "您有待审核的请购信息", "请购审核通知", userInfo.EmployeeId, SysTemPushTypeEnum.RequisitionAudit);
PushAuditMessage(sendAccount, Id, "您有待审核的请购信息", "请购审核通知", userInfo.EmployeeId, Common.Models.PushMessageCategoryEnum.BuyingRequisition);
}
}
}
......
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