1、付款申请 团组相关信息 增加 审核条件 IsAuditGM = 3

2、付款申请 团组相关信息 增加 返回字段AuditStatus

OASystem/OASystem.Api/Controllers/FinancialController.cs

@@ -2103,7 +2103,7 @@ namespace OASystem.API.Controllers
                 sqlWhere += string.Format(@" And Id In ({0})", string.Join(",", _groupIds));
             }
 
-            string sql_1 = string.Format(@"Select * From Grp_CreditCardPayment Where IsDel = 0 And IsPay = 0 And IsAuditGM = 1 {0}", sqlWhere);
+            string sql_1 = string.Format(@"Select * From Grp_CreditCardPayment Where IsDel = 0 And IsPay = 0 And (IsAuditGM = 1 Or IsAuditGM = 3 ){0}", sqlWhere);
             #endregion
 
             var _paymentDatas = _sqlSugar.SqlQueryable<Grp_CreditCardPayment>(sql_1).ToList();//付款信息
@@ -2291,7 +2291,9 @@ namespace OASystem.API.Controllers
                                 PayCurrCode = setDatas.Find(it => it.Id == hotelContent.Currency)?.Name ?? "",
                                 PaymentAmount = _PaymentAmount1,
                                 PayRate = hotelContent.Rate,
-                                CNYSubTotalAmount = _CNYSubTotalAmount1
+                                CNYSubTotalAmount = _CNYSubTotalAmount1,
+                                AuditStatus = payInfo.IsAuditGM
+
                             };
                             string remaksDescription1 = $"【{childInfo1.PayType}】【{childInfo1.ModuleName}】{rouNumber}、[申请人：{childInfo1.Applicant}]{subPriceName}[收款方：{childInfo1.Payee}] {childInfo1.PayCurrCode} {_PaymentAmount1.ToString("#0.00")}、CNY：{childInfo1.CNYSubTotalAmount.ToString("#0.00")}(团组：{groupInfo.TeamName})";
 
@@ -2329,7 +2331,8 @@ namespace OASystem.API.Controllers
                             PayCurrCode = setDatas.Find(it => it.Id == payInfo.PaymentCurrency)?.Name ?? "",
                             PaymentAmount = _PaymentAmount,
                             PayRate = payInfo.DayRate,
-                            CNYSubTotalAmount = _CNYSubTotalAmount
+                            CNYSubTotalAmount = _CNYSubTotalAmount,
+                            AuditStatus = payInfo.IsAuditGM
                         };
 
                         string remaksDescription = $"【{childInfo.PayType}】【{childInfo.ModuleName}】{rouNumber}、[申请人：{childInfo.Applicant}]{priName}[收款方：{childInfo.Payee}] {childInfo.PayCurrCode} {_PaymentAmount.ToString("#0.00")}、CNY：{childInfo.CNYSubTotalAmount.ToString("#0.00")}(团组：{groupInfo.TeamName})";

OASystem/OASystem.Api/Controllers/StatisticsController.cs

@@ -2488,8 +2488,6 @@ FROM
                         clientGradeData = new List<object> { }
                     }));
                 }
-
-                
             }
 
             string sql = "";
@@ -2621,7 +2619,6 @@ Order By Count Desc");
             return Ok(JsonView(true, "操作成功!", rankingData, total));
         }
 
-
         /// <summary>
         ///  市场部销售额
         ///  团组列表、客户类型、客户等级、接单排名

OASystem/OASystem.Domain/ViewModels/Financial/Fin_DailyFeePaymentView.cs

@@ -494,6 +494,12 @@ namespace OASystem.Domain.ViewModels.Financial
         /// 费用描述 
         /// </summary>
         public string RemaksDescription { get; set; }
+
+        /// <summary>
+        /// 审核状态
+        /// 0 未审核 1已通过 2未通过 3 自动审核
+        /// </summary>
+        public int AuditStatus { get; set; }
     }
 
     public class PaymentRequestCheckedView