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

审批待办未消失的，再次批的时候直接消掉待办

Browse Source
This commit is contained in:
何美荣 2026-06-01 17:03:22 +08:00
parent 3b9bad3ee6
commit 9979beb271
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
APT.MicroApi/APT.PF.WebApi/Controllers/Api/ApproveController.cs
View File

@ -95,13 +95,27 @@
var dbApprove = this.GetEntity<T_PF_APPROVE>(entity.ID.ToString(), false, "Nav_ApproveDetails"); var dbApprove = this.GetEntity<T_PF_APPROVE>(entity.ID.ToString(), false, "Nav_ApproveDetails");
if (dbApprove == null) if (dbApprove == null)
this.ThrowError("020027"); 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); var node = dbApprove.Nav_ApproveDetails.FirstOrDefault(i => i.ID == entity.CurrentNode.ID);
if (!node.IS_CURRENT) if (!node.IS_CURRENT)
this.ThrowError("020030"); this.ThrowError("020030");
T_FM_NOTIFICATION_TASK task = null;
if (dbApprove.APPROVE_STATUS != (int)ApproveStatus.Doing)
{
//this.ThrowError("020028");
//原来是报错，现在直接把待办消掉
task = this.GetEntity<T_FM_NOTIFICATION_TASK>(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<T_FM_NOTIFICATION_TASK>(i => i.SOURCE_DATA_ID == entity.ID && i.USER_ID == node.APPROVE_USER_ID task = this.GetEntity<T_FM_NOTIFICATION_TASK>(i => i.SOURCE_DATA_ID == entity.ID && i.USER_ID == node.APPROVE_USER_ID
&& i.NOTICE_STATUS == FMNoticeStatusEnum.未处理.GetInt(), false); && i.NOTICE_STATUS == FMNoticeStatusEnum.未处理.GetInt(), false);
if (task != null) if (task != null)
{ {