diff --git a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/HazardTaskController.cs b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/HazardTaskController.cs
index abbd7f8..0a5380a 100644
--- a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/HazardTaskController.cs
+++ b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/HazardTaskController.cs
@@ -297,7 +297,7 @@ namespace APT.HM.WebApi.Controllers.Api
}
allUsers.Add(recordUser);
}
- allUsers= allUsers.DistinctBy(u => new { u.USER_ID, u.AREA_ID }).ToList();
+ allUsers = allUsers.DistinctBy(u => new { u.USER_ID, u.AREA_ID }).ToList();
}
}
//添加附件
@@ -408,5 +408,38 @@ namespace APT.HM.WebApi.Controllers.Api
}
return result;
}
+ ///
+ /// 审批流回调
+ ///
+ ///
+ ///
+ [HttpPost, Route("RejectUpdate")]
+ public JsonActionResult RejectUpdate([FromBody] T_PF_APPROVE entity)
+ {
+ return SafeExecute(() =>
+ {
+ T_PF_APPROVE modelApp = null;
+ List listAppDetail = null;
+ T_FM_NOTIFICATION_TASK taskFinish = null;
+ string Msg = string.Empty;
+ var record = GetEntity(entity.DATA_ID, new string[] { "Nav_LiableUser" });
+ bool ResultGetInfo = ApproveCallBackService.GetApproject(entity, ref modelApp, ref listAppDetail, ref taskFinish, ref Msg);
+ if (!ResultGetInfo)
+ throw new Exception("驳回失败!");
+ record.STATUS = FOPreMeetingStatusEnum.审批拒绝;
+ var sendNotice = NotificationTaskService.InsertUserNoticeTaskModel("职业危害辨识任务-驳回", entity.DATA_ID, record.ORG_ID, (Guid)record.LIABLE_USER_ID, record.Nav_LiableUser.NAME, DateTime.Now, DateTime.Now.AddDays(7), 0, "HM102");
+ UnifiedCommit(() =>
+ {
+ if (record != null)
+ UpdateEntityNoCommit(record); //保存主表
+ if (sendNotice != null)
+ AddEntityNoCommit(sendNotice);
+ });
+
+ return true;
+
+
+ });
+ }
}
}