wyw/mh_jy_safe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: wyw:3bc9a80abd0110a0f801da1fabedd2e88ea2ba32
Branches Tags
wyw:master
..
compare: wyw:69c079b5d93a288a539c57fc35b6b38cc5f2dfee
Branches Tags
wyw:master

No commits in common. "3bc9a80abd0110a0f801da1fabedd2e88ea2ba32" and "69c079b5d93a288a539c57fc35b6b38cc5f2dfee" have entirely different histories.
3bc9a80abd ... 69c079b5d9

1 changed files with 2 additions and 3 deletions
Show Stats Expand all files Collapse all files

5
APT.MicroApi/APT.PP.WebApi/Controllers/Api/SEController.cs
View File

@ -1745,7 +1745,6 @@ namespace APT.PP.WebApi.Controllers.Api.PP
foreach (var survey in surveys) foreach (var survey in surveys)
{ {
survey.COMPNAY_REPORT = true; 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)) 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))
{ {
@ -1757,11 +1756,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("部门安全员")); 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) 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_REPORTEDIT", FMTASKTYPE.Default)); 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));
} }
if (depSafe != null) 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_REPORTEDIT", FMTASKTYPE.Default)); 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));
} }
} }
} }