diff --git a/Src/Dlhis.Canteen/Order/Response/BalanceRecordResponse.cs b/Src/Dlhis.Canteen/Order/Response/BalanceRecordResponse.cs
index 07734136..d8ffb6ad 100644
--- a/Src/Dlhis.Canteen/Order/Response/BalanceRecordResponse.cs
+++ b/Src/Dlhis.Canteen/Order/Response/BalanceRecordResponse.cs
@@ -114,4 +114,9 @@ public class BalanceRecordResponse
/// 记录产生时间
///
public DateTime CostDateTime { get; set; }
+
+ ///
+ /// 汇总金额
+ ///
+ public decimal Sum { get; set; }
}
diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
index ab97c515..7348a454 100644
--- a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
+++ b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
@@ -94,7 +94,7 @@ public class BalanceService : IBalanceService
};
}
- var query = _dbContext.Queryable()
+ var page = await _dbContext.Queryable()
.LeftJoin((record, ga) => record.UserNo == ga.No)
.LeftJoin((record, ga, department) => ga.DepartmentNo == department.No)
.LeftJoin((record, ga, department, bplace) => record.BusinessPlaceCode == bplace.Code)
@@ -128,12 +128,14 @@ public class BalanceService : IBalanceService
DepartmentName = department.Name,
BusinessPlaceName = bplace.Name,
BusinessShiftName = bshift.Name,
- CostDateTime = record.CreateTime // todo
- });
+ CostDateTime = record.CostDateTime
+ }).ToPageListAsync(request);
- //.ToPageListAsync(request);
- await Console.Out.WriteLineAsync(query.ToSqlValue());
- return await query.ToPageListAsync(request);
+
+ var sum = page.Data.Sum(x => Math.Abs(x.Amount));
+ page.Data.ForEach(x => x.Sum = sum);
+
+ return page;
}
public async Task> GetPageByUserAsync(BalanceRecordUserPageRequest request)