This commit is contained in:
何美荣 2024-04-10 14:19:50 +08:00
parent d104a47a1e
commit cd190293fa

View File

@ -1899,7 +1899,7 @@ namespace APT.BaseData.Services.DomainServices
}); });
} }
var user = this.GetEntity<T_FM_USER>(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum. && t.ID == tech.DISCLOSURE_PERSON_ID); var user = this.GetEntity<T_FM_USER>(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum. && t.ID == entity.APPLY_USER_ID);
//发消息 //发消息
DateTime dtEnd = NotificationTaskService.GetTaskEndTime(FMTASKTYPE.JobSite, entity.ORG_ID.Value, DateTime.Now, null, null); DateTime dtEnd = NotificationTaskService.GetTaskEndTime(FMTASKTYPE.JobSite, entity.ORG_ID.Value, DateTime.Now, null, null);
notices.Add(NotificationTaskService.InsertUserNoticeTaskModel("安全技术交底表(外包)", tech.ID, entity.ORG_ID, user.ID, user.NAME, DateTime.Now, notices.Add(NotificationTaskService.InsertUserNoticeTaskModel("安全技术交底表(外包)", tech.ID, entity.ORG_ID, user.ID, user.NAME, DateTime.Now,
@ -2213,15 +2213,15 @@ namespace APT.BaseData.Services.DomainServices
tech.IS_AUTO = (int)ISImportantEnum.; tech.IS_AUTO = (int)ISImportantEnum.;
tech.IS_OUTSOURCE = true; tech.IS_OUTSOURCE = true;
tech.RELATED_ID = entity.RELATED_ID; tech.RELATED_ID = entity.RELATED_ID;
if (entity.MONITOR_USER_ID != null) //if (entity.MONITOR_USER_ID != null)
{ //{
T_FO_TECH_DISCLOSURE_PERSON person = new T_FO_TECH_DISCLOSURE_PERSON(); // T_FO_TECH_DISCLOSURE_PERSON person = new T_FO_TECH_DISCLOSURE_PERSON();
person.ORG_ID = entity.ORG_ID; // person.ORG_ID = entity.ORG_ID;
person.USER_ID = entity.MONITOR_USER_ID; // person.USER_ID = entity.MONITOR_USER_ID;
person.TECH_DISCLOSURE_FROM_ID = tech.ID; // person.TECH_DISCLOSURE_FROM_ID = tech.ID;
person.CREATER_ID = entity.CREATER_ID; // person.CREATER_ID = entity.CREATER_ID;
techUsers.Add(person); // techUsers.Add(person);
} //}
if (entity.Nav_CrucialLicensePerson != null && entity.Nav_CrucialLicensePerson.Any()) if (entity.Nav_CrucialLicensePerson != null && entity.Nav_CrucialLicensePerson.Any())
{ {
entity.Nav_CrucialLicensePerson.ForEach(t => entity.Nav_CrucialLicensePerson.ForEach(t =>