瀏覽代碼

添加 IsDel 过滤条件及 JSON 序列化支持

在 `StatisticsController.cs` 中添加了对 `IsDel` 属性的过滤,确保只查询未删除的记录,并优化了代码格式。在 `Fin_DailyFeePaymentView.cs` 中引入了 `System.Text.Json.Serialization`,并添加了 `IsDel` 属性,标记为 `JsonIgnore` 以在序列化时忽略该属性。
Lyyyi 1 周之前
父節點
當前提交
d0febfd6a4

+ 14 - 13
OASystem/OASystem.Api/Controllers/StatisticsController.cs

@@ -5807,23 +5807,24 @@ Where dfp.IsDel = 0 And dfp.IsPay = 1
                 {
                     RefAsync<int> total = 0;
                     var _view = await _sqlSugar.SqlQueryable<DailyFeePaymentRangeView>(sql)
-                                               .Where(x => x.ApplicantDt >= _beginDt && x.ApplicantDt <= _endDt)
-                                               .WhereIF(dailypaymentTypeData.Count > 0,
-                                                        x => dailypaymentTypeData.Contains(x.PriceTypeId))
-                                               .WhereIF(_dto.CompanyIds.Count > 0, x => _dto.CompanyIds.Contains(x.CompanyId))
-                                               .WhereIF(!string.IsNullOrEmpty(_dto.Filter), x => x.ViewStr.Contains(_dto.Filter))
-                                               .OrderByDescending(x => x.ApplicantDt)
-                                               .ToPageListAsync(
-                                                    pageNumber: _dto.PageIndex,
-                                                    pageSize: _dto.PageSize,
-                                                    totalNumber: total
-                                                    );
+                        .Where(x => x.ApplicantDt >= _beginDt && x.ApplicantDt <= _endDt)
+                        .WhereIF(dailypaymentTypeData.Count > 0,
+                                x => dailypaymentTypeData.Contains(x.PriceTypeId))
+                        .WhereIF(_dto.CompanyIds.Count > 0, x => _dto.CompanyIds.Contains(x.CompanyId))
+                        .WhereIF(!string.IsNullOrEmpty(_dto.Filter), x => x.ViewStr.Contains(_dto.Filter))
+                        .OrderByDescending(x => x.ApplicantDt)
+                        .ToPageListAsync(
+                            pageNumber: _dto.PageIndex,
+                            pageSize: _dto.PageSize,
+                            totalNumber: total
+                            );
 
                     _sqlSugar.ThenMapper(_view, x =>
                     {
                         x.Contents = _sqlSugar.Queryable<DailyFeePaymentContentView>()
-                                              .SetContext(x1 => x1.DFPId, () => x.Id, x)
-                                              .ToList();
+                            .SetContext(x1 => x1.DFPId, () => x.Id, x)
+                            .Where(x => x.IsDel == 0)
+                            .ToList();
                     });
 
                     //单独处理

+ 4 - 0
OASystem/OASystem.Domain/ViewModels/Financial/Fin_DailyFeePaymentView.cs

@@ -8,6 +8,7 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Text;
+using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 
@@ -593,6 +594,9 @@ namespace OASystem.Domain.ViewModels.Financial
         //}
 
         //public string ViewSubStr { get; set; }
+
+        [JsonIgnore]
+        public int IsDel { get; set; }
     }