From 12b577e0d72c8d9794c530666027cc375e5a22cf Mon Sep 17 00:00:00 2001
From: cheche <717840555@qq.com>
Date: Mon, 11 Mar 2024 14:33:48 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E6=A1=A3=E6=A1=88=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Response/GainfoDetailResponse.cs          | 25 +++++++++++++++++++
 .../Services/Implements/GainfoService.cs      | 14 ++++++++++-
 .../Services/Implements/BalanceService.cs     | 10 +++++---
 3 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/Src/Dlhis.Basic/Organization/Response/GainfoDetailResponse.cs b/Src/Dlhis.Basic/Organization/Response/GainfoDetailResponse.cs
index 6ffc95a7..6a3488fa 100644
--- a/Src/Dlhis.Basic/Organization/Response/GainfoDetailResponse.cs
+++ b/Src/Dlhis.Basic/Organization/Response/GainfoDetailResponse.cs
@@ -1,5 +1,7 @@
 using Dlhis.Entity.Basic.Enums;
 using Kurisu.AspNetCore.Utils.Extensions;
+using SqlSugar;
+using System.ComponentModel.DataAnnotations;
 
 namespace Dlhis.Basic.Organization.Response;
 
@@ -25,6 +27,11 @@ public class GainfoDetailResponse
     /// </summary>
     public string Code { get; set; }
 
+    /// <summary>
+    /// 部门
+    /// </summary>
+    public string DepartmentNo { get; set; }
+
     /// <summary>
     /// 部门名称
     /// </summary>
@@ -121,5 +128,23 @@ public class GainfoDetailResponse
     /// </summary>
     public string Face { get; set; }
 
+    /// <summary>
+    /// 在职状态
+    /// </summary>
+    public string Status { get; set; }
 
+    /// <summary>
+    /// 厂区
+    /// </summary>
+    public string Factory { get; set; }
+
+    /// <summary>
+    /// 厂区名称
+    /// </summary>
+    public string FactoryName { get; set; }
+
+    /// <summary>
+    /// 入职日期
+    /// </summary>
+    public DateTime OnboardingDate { get; set; }
 }
diff --git a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs
index 4b61a811..089e6d40 100644
--- a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs
+++ b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs
@@ -28,6 +28,7 @@ public class GainfoService : IGainfoService
     private readonly IServiceProvider _serviceProvider;
     private readonly IConfiguration _configuration;
     private readonly ILogger<GainfoService> _logger;
+    private readonly IDepartmentService _departmentService;
 
     public GainfoService(IGainfoStore gainfoStore,
         IDbContext dbContext,
@@ -36,7 +37,8 @@ public class GainfoService : IGainfoService
         RedisCache redisCache,
         IServiceProvider serviceProvider,
         IConfiguration configuration,
-        ILogger<GainfoService> logger)
+        ILogger<GainfoService> logger,
+        IDepartmentService departmentService = null)
     {
         _gainfoStore = gainfoStore;
         _dbContext = dbContext;
@@ -46,6 +48,7 @@ public class GainfoService : IGainfoService
         _serviceProvider = serviceProvider;
         _configuration = configuration;
         _logger = logger;
+        _departmentService = departmentService;
     }
 
     /// <summary>
@@ -420,8 +423,17 @@ public class GainfoService : IGainfoService
                 CountryName = type2.Display,
                 NationName = type3.Display,
                 ClassName = type4.Display,
+                Factory = ga.Factory,
+                OnboardingDate = ga.CreateTime,
             })
             .FirstAsync();
+        info.Status = request.Status.GetDescription();
+        var trees = await _departmentService.GetTreeAsync();
+        var res = trees.First(x => x.No == info.Factory);
+        if (res != null)
+        {
+            info.FactoryName = res.Name;
+        }
 
         if (info != null)
         {
diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
index 9dd25f9d..1602bfe9 100644
--- a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
+++ b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
@@ -158,7 +158,7 @@ public class BalanceService : IBalanceService
             obj.LateNightPrice = LateNightNumberOfPeople == 0 ? 0 : Math.Round(obj.LateNightAmount / LateNightNumberOfPeople, 2);
 
             // 总人数  总金额
-            obj.TotalNumberOfPeople = obj.BreakfastNumberOfPeople + obj.LunchNumberOfPeople + obj.DinnerNumberOfPeople + obj.LateNightNumberOfPeople;
+            obj.TotalNumberOfPeople = costIdGroup.Select(x => x.UserNo).Distinct().Count();
             obj.TotalAmount = obj.BreakfastAmount + obj.LunchAmount + obj.DinnerAmount + obj.LateNightAmount;
 
             lst.Add(obj);
@@ -292,7 +292,7 @@ public class BalanceService : IBalanceService
             obj.LateNightPrice = LateNightNumberOfPeople == 0 ? 0 : Math.Round(obj.LateNightAmount / LateNightNumberOfPeople, 2);
 
             // 总人数  总金额
-            obj.TotalNumberOfPeople = obj.BreakfastNumberOfPeople + obj.LunchNumberOfPeople + obj.DinnerNumberOfPeople + obj.LateNightNumberOfPeople;
+            obj.TotalNumberOfPeople = departmentGroup.Select(x => x.UserNo).Distinct().Count();
             obj.TotalAmount = obj.BreakfastAmount + obj.LunchAmount + obj.DinnerAmount + obj.LateNightAmount;
             lst.Add(obj);
         }
@@ -372,7 +372,7 @@ public class BalanceService : IBalanceService
             obj.LateNightPrice = LateNightNumberOfPeople == 0 ? 0 : Math.Round(obj.LateNightAmount / LateNightNumberOfPeople, 2);
 
             // 总人数  总金额
-            obj.TotalNumberOfPeople = obj.BreakfastNumberOfPeople + obj.LunchNumberOfPeople + obj.DinnerNumberOfPeople + obj.LateNightNumberOfPeople;
+            obj.TotalNumberOfPeople = originTenantIdGroup.Select(x => x.UserNo).Distinct().Count();
             obj.TotalAmount = obj.BreakfastAmount + obj.LunchAmount + obj.DinnerAmount + obj.LateNightAmount;
             lst.Add(obj);
         }
@@ -421,7 +421,9 @@ public class BalanceService : IBalanceService
             obj.LunchNumberOfPeople = first.Where(x => x.ShiftType == shiftCodeDict["Lunch"]).Select(x => x.UserNo).Distinct().Count();
             obj.DinnerNumberOfPeople = first.Where(x => x.ShiftType == shiftCodeDict["Dinner"]).Select(x => x.UserNo).Distinct().Count();
             obj.LateNightNumberOfPeople = first.Where(x => x.ShiftType == shiftCodeDict["LateNight"]).Select(x => x.UserNo).Distinct().Count();
-            obj.TotalNumberOfPeople = obj.BreakfastNumberOfPeople + obj.LunchNumberOfPeople + obj.DinnerNumberOfPeople + obj.LateNightNumberOfPeople;
+
+            obj.TotalNumberOfPeople = first.Where(x => x.CostDate.ToString("yyyy-MM-dd") == first.Key).Select(x => x.UserNo).Distinct().Count();
+            
             lst.Add(obj);
         }
         // 分页操作