CreditCardPayment修改，增加SqlSugar AndIF()

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -456,7 +456,7 @@ namespace OASystem.API.Controllers
             #region 团组基本信息
 
             Grp_DelegationInfo _delegation = _groupRepository.Query<Grp_DelegationInfo>(s => s.Id == _dto.DiId).First();
-            if (_delegation == null)
+            if (_delegation != null)
             {
                 _view.ClientName = _delegation.ClientName;
                 _view.DiId = _dto.DiId;
@@ -468,16 +468,21 @@ namespace OASystem.API.Controllers
             }
             else
             {
-                return Ok(JsonView(false, "团组Id为空"));
+                return Ok(JsonView(false, "团组信息为空"));
             }
 
             #endregion
 
             #region 费用清单
+            var exp = Expressionable.Create<Grp_CreditCardPayment>();
+            exp.AndIF(_dto.AuditStatus != -1, it => it.IsAuditGM == _dto.AuditStatus);
+            exp.AndIF(_dto.Label != -1, it => it.CTable == _dto.Label);
+
 
             //缺少IF的语法糖 CTable
             List<Grp_CreditCardPayment> entityList = _groupRepository
-                .Query<Grp_CreditCardPayment>(s => s.DIId == _dto.DiId && s.CTable == _dto.Label && s.IsAuditGM == _dto.AuditStatus && s.IsDel == 0 && s.CreateUserId > 0)
+                .Query<Grp_CreditCardPayment>(s => s.DIId == _dto.DiId && s.IsDel == 0 && s.CreateUserId > 0)
+                .Where(exp.ToExpression())
                 .ToList();
 
             List<Grp_CreditCardPaymentDetailView> detailList = new List<Grp_CreditCardPaymentDetailView>();
@@ -665,7 +670,7 @@ namespace OASystem.API.Controllers
 
 
         /// <summary>
-        /// 获取团组费用审核
+        /// 修改团组费用审核状态
         /// </summary>
         /// <param name="paras">参数Json字符串</param>
         /// <returns></returns>

OASystem/OASystem.Domain/Dtos/Groups/GrpCreditCardPaymentDto.cs

@@ -14,12 +14,12 @@ namespace OASystem.Domain.Dtos.Groups
         public int DiId { get; set; }
 
         /// <summary>
-        /// 费用类型 0-所有, 76-酒店预订,77-行程,79-车导地接,80-签证,81-邀请公务,82-团组客户保险,85-机票预订,98-团组增减款项,285-其他款���
+        /// 费用类型 -1 -所有, 76-酒店预订,79-车导地接,80-签证,81-邀请公务,85-机票预订,98-团组增减款���
         /// </summary>
         public int Label { get; set; } = 0;
 
         /// <summary>
-        /// 审核状态 0/1/2，未审核/审核通过/审核不通过
+        /// 审核状态 0/1/2，未审核/审核通过/审核不通过 ,-1:所有
         /// </summary>
         public int AuditStatus { get; set; }
     }