From 4be8c45cc1f19bc75795543d5a3775c105271054 Mon Sep 17 00:00:00 2001
From: wyw <571921741@qq.com>
Date: Wed, 15 May 2024 08:45:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=B5=81API=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=20=E5=BE=97=E5=90=8C=E6=AD=A5=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=92=8C=E6=95=B0=E6=8D=AE=E5=BA=93=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Services/FM/FMFlowPermitService.cs        | 45 ++++++++++++-------
 1 file changed, 30 insertions(+), 15 deletions(-)

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);