From 9a88977339880c70a0b660fba1848a43144b258c Mon Sep 17 00:00:00 2001
From: cheche <717840555@qq.com>
Date: Fri, 26 Jan 2024 11:55:15 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=8F=96=E6=B6=88=E5=BF=85=E9=80=89costi?=
 =?UTF-8?q?d?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Services/Implements/BalanceService.cs      | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
index 38d59bb5..406cc86c 100644
--- a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
+++ b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
@@ -131,7 +131,7 @@ public class BalanceService : IBalanceService
         }
         return lst;
     }
-   
+
     /// <summary>
     /// 消费明细
     /// </summary>
@@ -198,7 +198,8 @@ public class BalanceService : IBalanceService
             .WhereIF(!request.OriginTenantId.IsEmpty(), record => record.TenantId == request.OriginTenantId)
             .WhereIF(request.StartDatetime.HasValue, record => record.CostDateTime >= request.StartDatetime)
             .WhereIF(request.EndDatetime.HasValue, record => record.CostDateTime <= request.EndDatetime)
-            .Where(record => record.CostId == request.CostId && record.Type == BalanceRecordTypeEnumType.Out)
+            .WhereIF(!request.CostId.IsEmpty(), record => record.CostId == request.CostId)
+            .Where(record => record.Type == BalanceRecordTypeEnumType.Out)
             .OrderBy(record => record.CreateTime, OrderByType.Desc)
             .ToListAsync();
 
@@ -210,7 +211,8 @@ public class BalanceService : IBalanceService
             var obj = new BalanceRecordSummaryRespones
             {
                 DepartmentNo = departmentGroup.Key,
-                CostId = request.CostId
+                CostId = request.CostId,
+                OriginTenantId = ""
             };
 
             // 每个餐次人数
@@ -237,10 +239,6 @@ public class BalanceService : IBalanceService
             obj.DinnerPrice = obj.DinnerNumberOfPeople == 0 ? 0 : obj.DinnerAmount / obj.DinnerNumberOfPeople;
             obj.LateNightPrice = obj.LateNightNumberOfPeople == 0 ? 0 : obj.LateNightAmount / obj.LateNightNumberOfPeople;
 
-            // 每个部门餐次中的 OriginTenantId
-            obj.OriginTenantId = departmentGroup.FirstOrDefault()?.OriginTenantId;
-
-
             // 总人数  总金额
             obj.TotalNumberOfPeople = obj.BreakfastNumberOfPeople + obj.LunchNumberOfPeople + obj.DinnerNumberOfPeople + obj.LateNightNumberOfPeople;
             obj.TotalAmount = obj.BreakfastAmount + obj.LunchAmount + obj.DinnerAmount + obj.LateNightAmount;
@@ -265,7 +263,8 @@ public class BalanceService : IBalanceService
             .WhereIF(!request.OriginTenantId.IsEmpty(), record => record.TenantId == request.OriginTenantId)
            .WhereIF(request.StartDatetime.HasValue, record => record.CostDateTime >= request.StartDatetime)
            .WhereIF(request.EndDatetime.HasValue, record => record.CostDateTime <= request.EndDatetime)
-            .Where(record => record.CostId == request.CostId && record.Type == BalanceRecordTypeEnumType.Out)
+            .WhereIF(!request.CostId.IsEmpty(), record => record.CostId == request.CostId)
+            .Where(record => record.Type == BalanceRecordTypeEnumType.Out)
             .OrderBy(record => record.CreateTime, OrderByType.Desc)
             .ToListAsync();
 
@@ -313,9 +312,6 @@ public class BalanceService : IBalanceService
         return lst;
     }
 
-
-
-
     /// <summary>
     /// 用餐分析
     /// </summary>