ccy/mh_sms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

整改记录 审批 履职情况 修改

Browse Source 
检查任务取消
This commit is contained in:
wyw 2024-06-07 14:32:08 +08:00
parent 5e11201784
commit f11b208a2f
2 changed files with 91 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs
View File

@ -5679,6 +5679,16 @@ namespace APT.BaseData.Services.DomainServices
listLog = GetUpdateDeal(OPERATEPOINT_Enums.RiskSendAudit, RISK_SUBMIT_ID.Value, APT.Infrastructure.Api.AppContext.CurrentSession.UserID.Value, listContentID, taskFinish.TASK_ENDDT);
}
break;
case "BS/BSRiskSubmit/DealEndNew"://整改记录
var contentDeal = GetEntity<T_BS_RISK_SUBMIT_CONTENT_DEAL>(modelApp.DATA_ID);
if (contentDeal != null)
{
var modelLog = GetUpdateDeal(OPERATEPOINT_Enums.RiskDealAudit, contentDeal.RISK_SUBMIT_ID.Value, APT.Infrastructure.Api.AppContext.CurrentSession.UserID.Value, contentDeal.RISK_SUBMIT_CONTENT_ID, taskFinish.TASK_ENDDT);
if (modelLog != null)
listLog = new List<T_BS_OPERATE_LOG>() { modelLog };
}
break;
default:
break;
}
@ -5694,6 +5704,8 @@ namespace APT.BaseData.Services.DomainServices
UpdateEntityNoCommit(taskFinish);
if (listTaskNext != null && listTaskNext.Count > 0)//下一个节点
BantchSaveEntityNoCommit(listTaskNext);
if (listLog != null && listLog.Any())//本节点操作记录
BantchSaveEntityNoCommit(listLog);
});
}
else
@ -8365,7 +8377,7 @@ namespace APT.BaseData.Services.DomainServices
//#endregion
#region 方法重复写 如有修改 需同步修改 BSOperateLogService 对应方法
#region 方法重复写 如有修改 需同步修改 BSOperateLogService 对应方法
public List<T_BS_OPERATE_LOG> GetListOperateLog(OPERATEPOINT_Enums OPERATEPOINT, Guid DATA_ID, Guid UserIDLogin, List<Guid> ListDATA_ID, List<Guid> ListUserID, List<string> ListUserName, Guid? ORG_ID, Guid? DATA_ID_SUB = null, List<Guid> ListUserIDDone = null, bool isEnd = false, DateTime? TASK_ENDDT = null)
{

77
APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSSafeCheckController.cs
View File

@ -8596,6 +8596,83 @@ namespace APT.BS.WebApi.Controllers.Api
});
}
#endregion
/// <summary>
/// 检查任务取消
/// </summary>
/// <param name="filter"></param>
/// <returns></returns>
[HttpPost, Route("Cancel")]
public JsonActionResult<bool> Cancel([FromBody] KeywordFilter filter)
{
return SafeExecute<bool>(() =>
{
//后台配置自定义按钮事件 keyWord就是对应的id
//只能取消自己的单子
Guid CheckID = Guid.Empty;
Guid TaskID = Guid.Empty;
if (!string.IsNullOrEmpty(filter.Keyword))
{
try
{
CheckID = new Guid(filter.Keyword);
if (!string.IsNullOrEmpty(filter.Parameter1))
{
TaskID = new Guid(filter.Parameter1);
}
}
catch { }
}
if (CheckID == Guid.Empty)
throw new Exception("获取信息失败，请重试！");
var Check = GetEntity<T_BS_SAFE_CHECK>(CheckID);
if (Check == null)
throw new Exception("未获取到检查单，操作失败！");
Check.ENABLE_STATUS = 1;
Check.MODIFIER_ID = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
Check.MODIFY_TIME = DateTime.Now;
T_FM_NOTIFICATION_TASK task = null;
MS.Domain.Entities.SC.BI.T_BI_NOTIFICATION_TASK_NEW taskBI = null;
if (TaskID != Guid.Empty)
{
task = NotificationTaskService.GetEntityTask(TaskID, "BS032_SHOWPRINT");
if (task != null)
{
task.ISCANCEL = true;
task.MODIFIER_ID = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
task.MODIFY_TIME = DateTime.Now;
}
taskBI = GetEntity<MS.Domain.Entities.SC.BI.T_BI_NOTIFICATION_TASK_NEW>(e => e.SOURCE_DATA_ID == CheckID && e.NOTICE_STATUS == 0 && e.SOURCE_FORMCODE == "BS032");
if (taskBI != null)
{
taskBI.MODIFIER_ID = task.MODIFIER_ID;
taskBI.MODIFY_TIME = task.MODIFY_TIME;
taskBI.TASK_DT = task.TASK_DT;
taskBI.NOTICE_STATUS = task.NOTICE_STATUS;
taskBI.IS_DELETED = true;
}
}
UnifiedCommit(() =>
{
if (Check != null)
UpdateEntityNoCommit(Check);
if (task != null)
UpdateEntityNoCommit(task);
if (taskBI != null)
UpdateEntityNoCommit(taskBI);
});
return true;
});
}
}
/// <summary>