diff --git a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitController.cs b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitController.cs index 2ac93ec..bb5eb4d 100644 --- a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitController.cs +++ b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitController.cs @@ -1766,7 +1766,7 @@ namespace APT.BS.WebApi.Controllers.Api T_FM_NOTIFICATION_TASK taskAdd = null; if (risk.SUBMIT_TYPE == (int)APT.MS.Domain.Enums.SUBMIT_TYPE.User) { - taskAdd = NotificationTaskService.InsertUserNoticeTaskModel("指定责任单位", entity.RISK_SUBMIT_ID.Value, entity.ORG_ID, risk.USER_ID.Value, risk.Nav_User.NAME, DateTime.Now, dtEnd, (int)FMNoticeTypeEnum.消息, "BS061"); + taskAdd = NotificationTaskService.InsertUserNoticeTaskModel("信息完善", entity.RISK_SUBMIT_ID.Value, entity.ORG_ID, risk.USER_ID.Value, risk.Nav_User.NAME, DateTime.Now, dtEnd, (int)FMNoticeTypeEnum.消息, "BS061"); } else { @@ -4457,7 +4457,7 @@ namespace APT.BS.WebApi.Controllers.Api #endregion DateTime dtEnd = NotificationTaskService.GetTaskEndTime(FMTASKTYPE.BS_RiskUp_PersonAdd, entity.ORG_ID.Value, DateTime.Now, null, null); - taskMaster = NotificationTaskService.InsertUserNoticeTaskModel("手动隐患上报-指定责任单位", entity.ID, entity.ORG_ID, UserId, userName, DateTime.Now, dtEnd, 0, "BS061"); + taskMaster = NotificationTaskService.InsertUserNoticeTaskModel("手动隐患上报-信息完善", entity.ID, entity.ORG_ID, UserId, userName, DateTime.Now, dtEnd, 0, "BS061"); } this.UnifiedCommit(() => @@ -5758,7 +5758,7 @@ namespace APT.BS.WebApi.Controllers.Api #endregion DateTime dtEnd = NotificationTaskService.GetTaskEndTime(FMTASKTYPE.BS_RiskUp_PersonAdd, entity.ORG_ID.Value, DateTime.Now, null, null); - taskMaster = NotificationTaskService.InsertUserNoticeTaskModel("手动隐患上报-指定责任单位", entity.ID, risk.ORG_ID, UserId, userName, DateTime.Now, dtEnd, 0, "BS073");//原 BS061 + taskMaster = NotificationTaskService.InsertUserNoticeTaskModel("手动隐患上报-信息完善", entity.ID, risk.ORG_ID, UserId, userName, DateTime.Now, dtEnd, 0, "BS073");//原 BS061 if (entity.TaskID != Guid.Empty) { taskEnd = NotificationTaskService.GetEntityTask(entity.TaskID, "BS072_SHOWPRINT"); @@ -6401,6 +6401,63 @@ namespace APT.BS.WebApi.Controllers.Api } + /// + /// 隐患上报信息完善 添加删除事件 + /// + /// + /// + /// + [HttpGet, Route("RiskDel")] + public JsonActionResult RiskDel(Guid ID) + { + return SafeExecute(() => + { + var entityContent = GetEntity(ID); + if (entityContent == null) + { + throw new Exception("获取操作信息失败!"); + } + if (entityContent.RiskContentState == (int)RiskContentState.ReportedReject) + { + throw new Exception("该单已删除,点击右上角[X]按钮关闭该页面!"); + } + var task = GetEntity(e => e.SOURCE_DATA_ID.HasValue && e.SOURCE_DATA_ID.Value == ID && e.NOTICE_STATUS == 0); + if (task == null) + { + throw new Exception("获取待办信息失败!"); + } + if (task.USER_ID != APT.Infrastructure.Api.AppContext.CurrentSession.UserID) + { + throw new Exception("您不是该单的信息完善人员,操作失败!"); + } + task.NOTICE_STATUS = (int)FMNoticeStatusEnum.关闭; + task.MODIFY_TIME = DateTime.Now; + task.MODIFIER_ID = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; + if (entityContent.DESCRIBE.Length < 480) + { + entityContent.DESCRIBE = task.USER_NAME + ":终止上报信息完善"; + } + entityContent.RiskContentState = (int)RiskContentState.ReportedReject; + T_BS_RISK_SUBMIT sub = null; + if (entityContent.RISK_SUBMIT_ID.HasValue) + { + sub = GetEntity(entityContent.RISK_SUBMIT_ID.Value); + sub.SUBMIT_STATUS = (int)BSSubmitStatusEnum.AuditRefuse; + } + + this.UnifiedCommit(() => + { + if (sub != null) + UpdateEntityNoCommit(sub); + if (entityContent != null) + UpdateEntityNoCommit(entityContent); + if (task != null) + UpdateEntityNoCommit(task); + }); + return true; + }); + } + #endregion } }