diff --git a/APT.BaseData.Services/Services/FM/FMFlowPermitService.cs b/APT.BaseData.Services/Services/FM/FMFlowPermitService.cs index b088a59..afb2752 100644 --- a/APT.BaseData.Services/Services/FM/FMFlowPermitService.cs +++ b/APT.BaseData.Services/Services/FM/FMFlowPermitService.cs @@ -613,11 +613,8 @@ namespace APT.BaseData.Services.Services.FM //回调方法写在之后 不然之前数据都没有保存到数据库 原有的方法不能使用 if (!string.IsNullOrEmpty(CALLBACK_INTERFACE)) { - if (CALLBACK_INTERFACE == "BS/BSSafeCheck/CheckAuditEnd" || CALLBACK_INTERFACE == "BS/BSSafeCheck/CheckPlanAuditEnd" || CALLBACK_INTERFACE == "BS/BSRiskSubmit/Notice" || - CALLBACK_INTERFACE == "BS/BSRiskSubmit/DealEnd" || CALLBACK_INTERFACE == "BS/BSRiskSubmitDelayApply/DealEnd" || CALLBACK_INTERFACE == "FO/FOJobEventRecord/BackUpdate") + if (CALLBACK_INTERFACE.EndsWith("New")) { - CALLBACK_INTERFACE = CALLBACK_INTERFACE + "New"; - this.UnifiedCommit(() => { ApproveCallBackService.CallBackNew(CALLBACK_INTERFACE, approve, false); @@ -630,10 +627,6 @@ namespace APT.BaseData.Services.Services.FM ApproveCallBackService.CallBack(CALLBACK_INTERFACE, listDATA_ID); }); } - //this.UnifiedCommit(() => - //{ - // ApproveCallBackService.CallBack(CALLBACK_INTERFACE, listDATA_ID); - //}); } } @@ -1046,10 +1039,35 @@ namespace APT.BaseData.Services.Services.FM //如果 审批流需要执行默认审批 调用 回调方法 //回调方法写在之后 不然之前数据都没有保存到数据库 原有的方法不能使用 - this.UnifiedCommit(() => + //this.UnifiedCommit(() => + //{ + // ApproveCallBackService.CallBack(CALLBACK_INTERFACE, listDATA_ID); + //}); + + if (!string.IsNullOrEmpty(CALLBACK_INTERFACE) && listDATA_ID.Count > 0) { - ApproveCallBackService.CallBack(CALLBACK_INTERFACE, listDATA_ID); - }); + if (CALLBACK_INTERFACE.EndsWith("New")) + { + foreach (var item in listApprove) + { + if (item.APPROVE_STATUS == 10) + { + this.UnifiedCommit(() => + { + ApproveCallBackService.CallBackNew(CALLBACK_INTERFACE, item, false); + }); + } + } + } + else + { + this.UnifiedCommit(() => + { + ApproveCallBackService.CallBack(CALLBACK_INTERFACE, listDATA_ID); + }); + } + } + } @@ -1471,10 +1489,8 @@ namespace APT.BaseData.Services.Services.FM //回调方法写在之后 不然之前数据都没有保存到数据库 原有的方法不能使用 if (!string.IsNullOrEmpty(CALLBACK_INTERFACE) && listDATA_ID.Count > 0) { - if (CALLBACK_INTERFACE == "BS/BSSafeCheck/CheckAuditEnd" || CALLBACK_INTERFACE == "BS/BSSafeCheck/CheckPlanAuditEnd" || CALLBACK_INTERFACE == "BS/BSRiskSubmit/Notice" || - CALLBACK_INTERFACE == "BS/BSRiskSubmit/DealEnd" || CALLBACK_INTERFACE == "BS/BSRiskSubmitDelayApply/DealEnd" || CALLBACK_INTERFACE == "FO/FOJobEventRecord/BackUpdate") + if (CALLBACK_INTERFACE.EndsWith("New")) { - CALLBACK_INTERFACE = CALLBACK_INTERFACE + "New"; foreach (var item in listApprove) { if (item.APPROVE_STATUS == 10) @@ -1488,7 +1504,6 @@ namespace APT.BaseData.Services.Services.FM } else { - this.UnifiedCommit(() => { ApproveCallBackService.CallBack(CALLBACK_INTERFACE, listDATA_ID);