diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerConfirmController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerConfirmController.cs index 50072a6..03d82cb 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerConfirmController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerConfirmController.cs @@ -48,27 +48,27 @@ namespace APT.SK.WebApi.Controllers.Api if (entity.RECITIFY_USER_ID == null) throw new Exception("整改责任人必须填写"); T_FM_NOTIFICATION_TASK finishNotice = null; - if (entity.STATUS != PFStandardStatus.Draft) - { - var taskId = entity.TaskID; - if (taskId == Guid.Empty) - { - var taskTemp = GetEntity(i => i.SOURCE_DATA_ID == entity.ID && i.USER_ID == userId - && i.NOTICE_STATUS == FMNoticeStatusEnum.未处理.GetInt() && i.SOURCE_FORMCODE == "SK018"); - if (taskTemp != null) - { - taskTemp.NOTICE_STATUS = 1; - taskTemp.SOURCE_FORMCODE = "SK018_SHOWPRINT"; - finishNotice = taskTemp; - } - } - if (taskId != Guid.Empty) - { - finishNotice = NotificationTaskService.FOGetTaskFinishModel(taskId, entity.ID, "SK018_SHOWPRINT"); - } - UpdateEntity(finishNotice); - throw new Exception("你已提交,请勿重复提交!"); - } + //if (entity.STATUS != PFStandardStatus.Draft && entity.STATUS != PFStandardStatus.Rejected) + //{ + // var taskId = entity.TaskID; + // if (taskId == Guid.Empty) + // { + // var taskTemp = GetEntity(i => i.SOURCE_DATA_ID == entity.ID && i.USER_ID == userId + //&& i.NOTICE_STATUS == FMNoticeStatusEnum.未处理.GetInt() && i.SOURCE_FORMCODE == "SK018"); + // if (taskTemp != null) + // { + // taskTemp.NOTICE_STATUS = 1; + // taskTemp.SOURCE_FORMCODE = "SK018_SHOWPRINT"; + // finishNotice = taskTemp; + // } + // } + // if (taskId != Guid.Empty) + // { + // finishNotice = NotificationTaskService.FOGetTaskFinishModel(taskId, entity.ID, "SK018_SHOWPRINT"); + // } + // UpdateEntity(finishNotice); + // throw new Exception("你已提交,请勿重复提交!"); + //} var photos = entity.Nav_Photos; entity.Nav_Photos = null; var files = entity.Nav_Files;