审批流API修改 得同步修改前端和数据库配置
This commit is contained in:
		
							parent
							
								
									d874aafb8e
								
							
						
					
					
						commit
						4be8c45cc1
					
				@ -613,11 +613,8 @@ namespace APT.BaseData.Services.Services.FM
 | 
				
			|||||||
            //回调方法写在之后  不然之前数据都没有保存到数据库  原有的方法不能使用
 | 
					            //回调方法写在之后  不然之前数据都没有保存到数据库  原有的方法不能使用
 | 
				
			||||||
            if (!string.IsNullOrEmpty(CALLBACK_INTERFACE))
 | 
					            if (!string.IsNullOrEmpty(CALLBACK_INTERFACE))
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
                if (CALLBACK_INTERFACE == "BS/BSSafeCheck/CheckAuditEnd" || CALLBACK_INTERFACE == "BS/BSSafeCheck/CheckPlanAuditEnd" || CALLBACK_INTERFACE == "BS/BSRiskSubmit/Notice" ||
 | 
					                if (CALLBACK_INTERFACE.EndsWith("New"))
 | 
				
			||||||
                            CALLBACK_INTERFACE == "BS/BSRiskSubmit/DealEnd" || CALLBACK_INTERFACE == "BS/BSRiskSubmitDelayApply/DealEnd" || CALLBACK_INTERFACE == "FO/FOJobEventRecord/BackUpdate")
 | 
					 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
                    CALLBACK_INTERFACE = CALLBACK_INTERFACE + "New";
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
                    this.UnifiedCommit(() =>
 | 
					                    this.UnifiedCommit(() =>
 | 
				
			||||||
                    {
 | 
					                    {
 | 
				
			||||||
                        ApproveCallBackService.CallBackNew(CALLBACK_INTERFACE, approve, false);
 | 
					                        ApproveCallBackService.CallBackNew(CALLBACK_INTERFACE, approve, false);
 | 
				
			||||||
@ -630,10 +627,6 @@ namespace APT.BaseData.Services.Services.FM
 | 
				
			|||||||
                        ApproveCallBackService.CallBack(CALLBACK_INTERFACE, listDATA_ID);
 | 
					                        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 (!string.IsNullOrEmpty(CALLBACK_INTERFACE) && listDATA_ID.Count > 0)
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
                if (CALLBACK_INTERFACE == "BS/BSSafeCheck/CheckAuditEnd" || CALLBACK_INTERFACE == "BS/BSSafeCheck/CheckPlanAuditEnd" || CALLBACK_INTERFACE == "BS/BSRiskSubmit/Notice" ||
 | 
					                if (CALLBACK_INTERFACE.EndsWith("New"))
 | 
				
			||||||
                            CALLBACK_INTERFACE == "BS/BSRiskSubmit/DealEnd" || CALLBACK_INTERFACE == "BS/BSRiskSubmitDelayApply/DealEnd" || CALLBACK_INTERFACE == "FO/FOJobEventRecord/BackUpdate")
 | 
					 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
                    CALLBACK_INTERFACE = CALLBACK_INTERFACE + "New";
 | 
					 | 
				
			||||||
                    foreach (var item in listApprove)
 | 
					                    foreach (var item in listApprove)
 | 
				
			||||||
                    {
 | 
					                    {
 | 
				
			||||||
                        if (item.APPROVE_STATUS == 10)
 | 
					                        if (item.APPROVE_STATUS == 10)
 | 
				
			||||||
@ -1488,7 +1504,6 @@ namespace APT.BaseData.Services.Services.FM
 | 
				
			|||||||
                }
 | 
					                }
 | 
				
			||||||
                else
 | 
					                else
 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
 | 
					 | 
				
			||||||
                    this.UnifiedCommit(() =>
 | 
					                    this.UnifiedCommit(() =>
 | 
				
			||||||
                    {
 | 
					                    {
 | 
				
			||||||
                        ApproveCallBackService.CallBack(CALLBACK_INTERFACE, listDATA_ID);
 | 
					                        ApproveCallBackService.CallBack(CALLBACK_INTERFACE, listDATA_ID);
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user