From 1a045134896caa033d1feb103b9a7ce6ff5dd7e0 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Tue, 12 Nov 2024 10:39:55 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E7=94=A8=E6=88=B7=E6=B6=88=E8=B4=B9?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=98=BE=E7=A4=BA=E5=B7=B2=E9=80=80=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Services/Implements/GainfoGroupService.cs | 22 +++++++++----------
 .../Services/Implements/BalanceService.cs     |  8 +++----
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoGroupService.cs b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoGroupService.cs
index 237f7ceb..619dddde 100644
--- a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoGroupService.cs
+++ b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoGroupService.cs
@@ -112,19 +112,19 @@ public class GainfoGroupService : IGainfoGroupService
         var gainfo = await _dbContext.Queryable<GainfoEntity>().Where(x => x.Code == userCode).SingleAsync();
         var userNo = gainfo?.No;
 
-        return await _dbContext.Queryable<GainfoGroupEntity>()
-            .LeftJoin<GainfoGroupRelationshipEntity>((x, r) => x.Code == r.GroupCode)
-            .Where((x, r) => r.UserNo == userNo)
-            .Select(x => new GainfoGroupTreeResponse
+        return await _dbContext.Queryable<GainfoGroupRelationshipEntity>()
+            .LeftJoin<GainfoGroupEntity>((x, xg) => x.GroupCode == xg.Code)
+            .Where((x, xg) => x.UserNo == userNo)
+            .Select((x, xg) => new GainfoGroupTreeResponse
             {
                 Id = x.Id,
-                PCode = x.PCode,
-                Code = x.Code,
-                Name = x.Name,
-                Remark = x.Remark,
-                Editable = x.Editable,
-                IsDefault = x.IsDefault,
-                TenantId = x.TenantId
+                PCode = xg.PCode,
+                Code = xg.Code,
+                Name = xg.Name,
+                Remark = xg.Remark,
+                Editable = xg.Editable,
+                IsDefault = xg.IsDefault,
+                TenantId = xg.TenantId
             })
             .ToListAsync();
     }
diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
index 58252a3d..80b219d5 100644
--- a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
+++ b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
@@ -348,8 +348,8 @@ public class BalanceService : IBalanceService
             .LeftJoin<DepartmentEntity>((record, ga, department) => ga.DepartmentNo == department.No)
             .LeftJoin<BusinessPlaceEntity>((record, ga, department, bPlace) => record.BusinessPlaceCode == bPlace.Code)
             .Where((record, ga) => record.UserCode == jinkoCode)
-            .Where(record => record.Status == BalanceRecordStatusEnumType.Valid && record.Type == BalanceRecordTypeEnumType.Out)
-            .Where(record => record.Source != BalanceRecordSourceEnumType.EMealVoucher) //不展示电子餐券信息
+            .Where(record => record.Type == BalanceRecordTypeEnumType.Out && (record.Status == BalanceRecordStatusEnumType.Valid || record.Status == BalanceRecordStatusEnumType.Obsolute))
+            .Where(record => record.Source != BalanceRecordSourceEnumType.EMealVoucher)
             .WhereIF(request.SearchDateTimePeriod.HasValue(), record => record.CostDate >= request.SearchDateTimePeriod.Start && record.CostDate <= request.SearchDateTimePeriod.End)
             .WhereIF(request.ApplicationType.HasValue, record => record.ApplicationType == request.ApplicationType)
             .OrderBy(record => record.CostDateTime)
@@ -358,7 +358,7 @@ public class BalanceService : IBalanceService
                 Id = record.Id,
                 CurrentAmount = SqlFunc.Abs(record.Amount),
                 Source = record.Source,
-                No = record.No,
+                No = SqlFunc.IIF(record.Status == BalanceRecordStatusEnumType.Obsolute && record.Remark == "退款", "(已退)" + record.No, record.No),
                 BusinessPlaceName = bPlace.Name,
                 ShiftType = record.ShiftType,
                 CostDateTime = record.CostDateTime,
@@ -372,7 +372,7 @@ public class BalanceService : IBalanceService
 
         var monthSum = await _dbContext.Queryable<BalanceRecordEntity>()
             .Where(x => x.CostDateTime >= monthStart && x.CostDateTime <= monthEnd)
-            .Where(x => x.Status == BalanceRecordStatusEnumType.Valid && x.Type == BalanceRecordTypeEnumType.Out)
+            .Where(x => x.Type == BalanceRecordTypeEnumType.Out && (x.Status == BalanceRecordStatusEnumType.Valid || x.Status == BalanceRecordStatusEnumType.Obsolute))
             .Where(x => x.Source != BalanceRecordSourceEnumType.EMealVoucher)
             .Where(x => x.UserCode == jinkoCode)
             .SumAsync(x => SqlFunc.Abs(x.Amount));