浏览代码

优化查询条件以过滤已删除记录

在 `StatisticsController.cs` 文件中,添加了对 `DailyFeePaymentContentView` 查询的条件 `x => x.IsDel == 0`,以确保只获取未删除的记录。同时,移除了原有的代码行,提升了查询逻辑的一致性和清晰性。
Lyyyi 1 周之前
父节点
当前提交
ad3e7728b4
共有 1 个文件被更改,包括 13 次插入12 次删除
  1. 13 12
      OASystem/OASystem.Api/Controllers/StatisticsController.cs

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

@@ -5834,22 +5834,23 @@ Where dfp.IsDel = 0 And dfp.IsPay = 1
                 else if (_dto.Type == 2) //view
                 {
                     var _view = await _sqlSugar.SqlQueryable<ExcelView>(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: 1,
-                                                    pageSize: 99999
-                                                    );
+                        .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: 1,
+                            pageSize: 99999
+                            );
 
                     _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();
 
                         string str = "";
                         int index = 1;