增强日期验证和费用项处理逻辑

在 `FinancialController.cs` 中，添加了 `PostPayRequest_Center` 方法的日期范围验证，确保日期格式正确，并修改了 SQL 查询条件以支持更多审核状态。

在 `EnterExitCostQuoteRepository.cs` 中，重构了 `basicItems` 的处理逻辑，使用 `ForEach` 替代 `Select`，并引入 `QuoteSubItemInfo` 以更好地处理备注项。同时，更新了 `viewInfo.FeeItems` 的赋值逻辑，确保正确赋值 `QuoteId` 和 `Infos`。

OASystem/OASystem.Api/Controllers/FinancialController.cs

@@ -2177,6 +2177,7 @@ namespace OASystem.API.Controllers
         public async Task<IActionResult> PostPayRequest_Center(PostPayRequestByDateRangeDto dto)
         {
             Stopwatch stopwatch = Stopwatch.StartNew();
+
             #region 验证
             DateTime beginDt, endDt;
             string format = "yyyy-MM-dd";
@@ -2198,6 +2199,7 @@ namespace OASystem.API.Controllers
             #endregion
 
             #endregion
+
             try
             {
                 PaymentRequestCheckedView checkedView = new PaymentRequestCheckedView();
@@ -2648,7 +2650,10 @@ namespace OASystem.API.Controllers
                                                 From Fin_DailyFeePayment dfp
                                                 Inner Join Sys_Company c On dfp.CompanyId = c.Id
                                                 Left Join Sys_Users u On dfp.CreateUserId = u.Id
-                                                Where dfp.IsDel=0 {0} And dfp.FAudit = 1 And dfp.MAudit = 1 And dfp.IsPay = 0
+                                                Where dfp.IsDel=0 {0} 
+                                                AND (dfp.FAudit = 1 OR dfp.FAudit = 3) 
+                                                AND (dfp.MAudit = 1 OR dfp.MAudit = 3) 
+                                                AND dfp.IsPay = 0
                                                 ) temp ", sqlWhere);
             #endregion
 

OASystem/OASystem.Infrastructure/Repositories/Groups/EnterExitCostQuoteRepository.cs

@@ -183,15 +183,39 @@ namespace OASystem.Infrastructure.Repositories.Groups
 
             if (basicItems.Any())
             {
-                viewInfo.FeeItems = basicItems.Select(x => 
-                    new QuoteItemInfo { 
-                        ItemId = x.Id, 
+                var quoteItemInfos = new List<QuoteItemInfo>();
+                basicItems.ForEach(x =>
+                {
+                    var quoteSubItemInfos = new List<QuoteSubItemInfo>();
+                    if (x.IsOnlyRemark)
+                    {
+                        quoteSubItemInfos.Add(new QuoteSubItemInfo
+                        {
+                            Id = 0,
+                            ItemId = x.Id,
+                            Index = 1,
+                            FeeName = "",
+                            UnitPrice = 0.00M,
+                            Currency = "CNY",
+                            Quantity = 1.00M,
+                            PplNum = 1,
+                            TotalAmt = 0.00M,
+                            Remark = $"-"
+                        });
+                    }
+
+                    quoteItemInfos.Add(new QuoteItemInfo
+                    {
+                        QuoteId = quoteId,
+                        ItemId = x.Id,
                         ItemName = x.Name,
-                        IsOnlyRemark = x.IsOnlyRemark, 
-                        Index = x.Index 
-                    })
-                    .OrderBy(x => x.Index)
-                    .ToArray();
+                        IsOnlyRemark = x.IsOnlyRemark,
+                        Infos = quoteSubItemInfos.ToArray(),
+                        Index = x.Index
+                    });
+                });
+
+                viewInfo.FeeItems = quoteItemInfos.OrderBy(x => x.Index).ToArray();
             }
 
             var quoteInfo = await _sqlSugar.Queryable<Grp_EnterExitCostQuote>()
@@ -221,7 +245,18 @@ namespace OASystem.Infrastructure.Repositories.Groups
 
                 if (quoteItems.Any())
                 {
-                    viewInfo.FeeItems = viewInfo.FeeItems.Select(x => new QuoteItemInfo { Index = x.Index, QuoteId = dto.Id, ItemId = x.ItemId, ItemName = x.ItemName, Infos = quoteItems.Where(y => y.ItemId == x.ItemId).OrderBy(y => y.Index).ToArray() }).ToArray();
+                    foreach (var x in viewInfo.FeeItems)
+                    {
+                        var currQuoteInfos = quoteItems.Where(y => y.ItemId == x.ItemId).OrderBy(y => y.Index).ToArray();
+                        if (x.IsOnlyRemark)
+                        {
+                            if (currQuoteInfos.Length > 0)
+                            {
+                                x.Infos = currQuoteInfos;
+                            }
+                        }
+                        else x.Infos = currQuoteInfos;
+                    }
                 }
             }
 
@@ -243,16 +278,40 @@ namespace OASystem.Infrastructure.Repositories.Groups
 
             if (basicItems.Any())
             {
-                viewInfo.FeeItems = basicItems.Select(x =>
-                    new QuoteItemInfo
+                var quoteItemInfos = new List<QuoteItemInfo>();
+                basicItems.ForEach(x =>
+                {
+
+                    var quoteSubItemInfos = new List<QuoteSubItemInfo>();
+                    if (x.IsOnlyRemark)
+                    {
+                        quoteSubItemInfos.Add(new QuoteSubItemInfo
+                        {
+                            Id = 0,
+                            ItemId = x.Id,
+                            Index = 1,
+                            FeeName = "",
+                            UnitPrice = 0.00M,
+                            Currency = "CNY",
+                            Quantity = 1.00M,
+                            PplNum = 1,
+                            TotalAmt = 0.00M,
+                            Remark = $"-"
+                        });
+                    }
+
+                    quoteItemInfos.Add(new QuoteItemInfo
                     {
+                        QuoteId = 0,
                         ItemId = x.Id,
                         ItemName = x.Name,
                         IsOnlyRemark = x.IsOnlyRemark,
+                        Infos = quoteSubItemInfos.ToArray(),
                         Index = x.Index
-                    })
-                    .OrderBy(x => x.Index)
-                    .ToArray();
+                    });
+                });
+
+                viewInfo.FeeItems = quoteItemInfos.OrderBy(x => x.Index).ToArray();
             }
 
             var quoteInfo = await _sqlSugar.Queryable<Grp_EnterExitCostQuote>()
@@ -282,7 +341,13 @@ namespace OASystem.Infrastructure.Repositories.Groups
 
                 if (quoteItems.Any())
                 {
-                    viewInfo.FeeItems = viewInfo.FeeItems.Select(x => new QuoteItemInfo { Index = x.Index, QuoteId = quoteInfo.Id, ItemId = x.ItemId, ItemName = x.ItemName, Infos = quoteItems.Where(y => y.ItemId == x.ItemId).OrderBy(y => y.Index).ToArray() }).ToArray();
+                    //viewInfo.FeeItems = viewInfo.FeeItems.Select(x => new QuoteItemInfo { Index = x.Index, QuoteId = quoteInfo.Id, ItemId = x.ItemId, ItemName = x.ItemName, Infos = quoteItems.Where(y => y.ItemId == x.ItemId).OrderBy(y => y.Index).ToArray() }).ToArray();
+
+                    viewInfo.FeeItems.ForEach(x =>
+                    {
+                        x.QuoteId = quoteInfo.Id;
+                        x.Infos = quoteItems.Where(y => y.ItemId == x.ItemId).OrderBy(y => y.Index).ToArray(); ;
+                    });
                 }
             }