ccy/mh_sms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加名称

Browse Source
This commit is contained in:
wjn 2024-08-15 09:45:59 +08:00
parent 97e133e87d
commit 546a979817
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs
View File

@ -4156,7 +4156,8 @@ namespace APT.BaseData.Services.DomainServices
Guid sendUserId = Guid.Empty; Guid sendUserId = Guid.Empty;
string sendName = ""; string sendName = "";
var sendUser = new T_FM_USER(); var sendUser = new T_FM_USER();
var userDepartmentId = GetEntity<T_FM_USER>(t => t.ID == entity.NOTE_TAKER_ID && t.ENABLE_STATUS == 0).DEPARTMENT_ID;
var department = GetEntity<T_FM_DEPARTMENT>(userDepartmentId.ToString());
if (entity.LEVEL == FMDepartmentType.公司) if (entity.LEVEL == FMDepartmentType.公司)
{ {
var approveRole = GetEntity<T_PF_APPROVAL_ROLE>(t => t.NAME == "安环部安全员").ID; var approveRole = GetEntity<T_PF_APPROVAL_ROLE>(t => t.NAME == "安环部安全员").ID;
@ -4170,8 +4171,6 @@ namespace APT.BaseData.Services.DomainServices
} }
else else
{ {
var userDepartmentId = GetEntity<T_FM_USER>(t => t.ID == entity.NOTE_TAKER_ID && t.ENABLE_STATUS == 0).DEPARTMENT_ID;
var department = GetEntity<T_FM_DEPARTMENT>(userDepartmentId.ToString());
Guid departmentId = Guid.Empty; Guid departmentId = Guid.Empty;
if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.班组) if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.班组)
{ {
@ -4342,7 +4341,7 @@ namespace APT.BaseData.Services.DomainServices
} }
entity.STATUS = FOPreMeetingStatusEnum.归档; entity.STATUS = FOPreMeetingStatusEnum.归档;
NotificationTaskService.SendNotificationTask("危险源与风险辨识评价结果", result.ID, orgId, sendUserId, sendName, NotificationTaskService.SendNotificationTask("《"+department.NAME+"》危险源与风险辨识评价结果", result.ID, orgId, sendUserId, sendName,
DateTime.Now, DateTime.Parse(DateTime.Now.AddDays(5).ToShortDateString() + " 23:59:59"), (int)FMNoticeTypeEnum.消息, "HM122", () => DateTime.Now, DateTime.Parse(DateTime.Now.AddDays(5).ToShortDateString() + " 23:59:59"), (int)FMNoticeTypeEnum.消息, "HM122", () =>
{ {
if (entity != null) if (entity != null)
@ -4475,7 +4474,8 @@ namespace APT.BaseData.Services.DomainServices
Guid sendUserId = Guid.Empty; Guid sendUserId = Guid.Empty;
string sendName = ""; string sendName = "";
var sendUser = new T_FM_USER(); var sendUser = new T_FM_USER();
var userDepartmentId = GetEntity<T_FM_USER>(t => t.ID == entity.NOTE_TAKER_ID && t.ENABLE_STATUS == 0).DEPARTMENT_ID;
var department = GetEntity<T_FM_DEPARTMENT>(userDepartmentId.ToString());
if (entity.LEVEL == FMDepartmentType.公司) if (entity.LEVEL == FMDepartmentType.公司)
{ {
var approveRole = GetEntity<T_PF_APPROVAL_ROLE>(t => t.NAME == "安环部安全员").ID; var approveRole = GetEntity<T_PF_APPROVAL_ROLE>(t => t.NAME == "安环部安全员").ID;
@ -4489,8 +4489,6 @@ namespace APT.BaseData.Services.DomainServices
} }
else else
{ {
var userDepartmentId = GetEntity<T_FM_USER>(t => t.ID == entity.NOTE_TAKER_ID && t.ENABLE_STATUS == 0).DEPARTMENT_ID;
var department = GetEntity<T_FM_DEPARTMENT>(userDepartmentId.ToString());
Guid departmentId = Guid.Empty; Guid departmentId = Guid.Empty;
if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.班组) if (department.DEPARTMENT_TYPE == (int)FMDepartmentType.班组)
{ {
@ -4613,7 +4611,7 @@ namespace APT.BaseData.Services.DomainServices
} }
} }
entity.STATUS = FOPreMeetingStatusEnum.归档; entity.STATUS = FOPreMeetingStatusEnum.归档;
NotificationTaskService.SendNotificationTask("职业危害辨识评价结果", result.ID, orgId, sendUserId, sendName, NotificationTaskService.SendNotificationTask("《"+department.NAME+">职业危害辨识评价结果", result.ID, orgId, sendUserId, sendName,
DateTime.Now, DateTime.Parse(DateTime.Now.AddDays(5).ToShortDateString() + " 23:59:59"), (int)FMNoticeTypeEnum.消息, "HM122", () => DateTime.Now, DateTime.Parse(DateTime.Now.AddDays(5).ToShortDateString() + " 23:59:59"), (int)FMNoticeTypeEnum.消息, "HM122", () =>
{ {
if (entity != null) if (entity != null)