diff --git a/APT.MicroApi/APT.PF.WebApi/Controllers/Api/ApproveController.cs b/APT.MicroApi/APT.PF.WebApi/Controllers/Api/ApproveController.cs index 870c20a..916fa39 100644 --- a/APT.MicroApi/APT.PF.WebApi/Controllers/Api/ApproveController.cs +++ b/APT.MicroApi/APT.PF.WebApi/Controllers/Api/ApproveController.cs @@ -95,13 +95,27 @@ var dbApprove = this.GetEntity(entity.ID.ToString(), false, "Nav_ApproveDetails"); if (dbApprove == null) this.ThrowError("020027"); - if (dbApprove.APPROVE_STATUS != (int)ApproveStatus.Doing) - this.ThrowError("020028"); var node = dbApprove.Nav_ApproveDetails.FirstOrDefault(i => i.ID == entity.CurrentNode.ID); if (!node.IS_CURRENT) this.ThrowError("020030"); + T_FM_NOTIFICATION_TASK task = null; + if (dbApprove.APPROVE_STATUS != (int)ApproveStatus.Doing) + { + //this.ThrowError("020028"); + //原来是报错,现在直接把待办消掉 + task = this.GetEntity(i => i.SOURCE_DATA_ID == entity.ID && i.USER_ID == node.APPROVE_USER_ID + && i.NOTICE_STATUS == FMNoticeStatusEnum.未处理.GetInt(), false); + if (task != null) + { + task.NOTICE_STATUS = FMNoticeStatusEnum.正常已办.GetInt(); + task.TASK_DT = DateTime.Now; + this.UpdateEntityNoCommit(task); + } + return ""; + } + //查询消息表 - var task = this.GetEntity(i => i.SOURCE_DATA_ID == entity.ID && i.USER_ID == node.APPROVE_USER_ID + task = this.GetEntity(i => i.SOURCE_DATA_ID == entity.ID && i.USER_ID == node.APPROVE_USER_ID && i.NOTICE_STATUS == FMNoticeStatusEnum.未处理.GetInt(), false); if (task != null) {