Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe
This commit is contained in:
commit
0da60d33a1
@ -1745,6 +1745,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
|
||||
foreach (var survey in surveys)
|
||||
{
|
||||
survey.COMPNAY_REPORT = true;
|
||||
survey.STATUS = SESafeSurveyStatus.完成;
|
||||
//发起部门 负责人 或者安全员
|
||||
if ((chargeUser != null && chargeUser.DEPARTMENT_ID.HasValue && chargeUser.DEPARTMENT_ID.Value == survey.LAUNCH_DEPARTMENT_ID.Value) || (chargeUserSafe != null && chargeUserSafe.DEPARTMENT_ID.HasValue && chargeUserSafe.DEPARTMENT_ID.Value == survey.LAUNCH_DEPARTMENT_ID.Value))
|
||||
{
|
||||
@ -1756,11 +1757,11 @@ namespace APT.PP.WebApi.Controllers.Api.PP
|
||||
var depSafe = GetEntity<T_FM_USER>(t => t.ENABLE_STATUS == 0 && t.DEPARTMENT_ID.HasValue && t.DEPARTMENT_ID.Value == survey.LAUNCH_DEPARTMENT_ID.Value && t.Nav_ApproveRole.NAME.Contains("部门安全员"));
|
||||
if (depcharge != null)
|
||||
{
|
||||
notices.Add(NotificationTaskService.InsertUserNoticeTaskModel("意识调查-" + surveys[0].LAUNCH_TIME + "-部门汇总", survey.ID, survey.ORG_ID, depcharge.ID, depcharge.NAME, DateTime.Now, (int)FMFormTypeEnum.计划任务通知, "SE005_ALLREPORT", FMTASKTYPE.Default));
|
||||
notices.Add(NotificationTaskService.InsertUserNoticeTaskModel("意识调查-" + surveys[0].LAUNCH_TIME + "-部门汇总", survey.ID, survey.ORG_ID, depcharge.ID, depcharge.NAME, DateTime.Now, (int)FMFormTypeEnum.计划任务通知, "SE005_REPORTEDIT", FMTASKTYPE.Default));
|
||||
}
|
||||
if (depSafe != null)
|
||||
{
|
||||
notices.Add(NotificationTaskService.InsertUserNoticeTaskModel("意识调查-" + surveys[0].LAUNCH_TIME + "-部门汇总", survey.ID, survey.ORG_ID, depSafe.ID, depSafe.NAME, DateTime.Now, (int)FMFormTypeEnum.计划任务通知, "SE005_ALLREPORT", FMTASKTYPE.Default));
|
||||
notices.Add(NotificationTaskService.InsertUserNoticeTaskModel("意识调查-" + surveys[0].LAUNCH_TIME + "-部门汇总", survey.ID, survey.ORG_ID, depSafe.ID, depSafe.NAME, DateTime.Now, (int)FMFormTypeEnum.计划任务通知, "SE005_REPORTEDIT", FMTASKTYPE.Default));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user