feat 营业点消费明细导出

Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs

@@ -86,6 +86,18 @@ public class BalancesController : ControllerBase
         return await _balanceService.RecordPageDetailsAsync(request);
     }
 
+    /// <summary>
+    /// 营业点消费明细导出
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    [ExcelResult("营业点消费明细")]
+    [HttpGet("recordPageDetails/export")]
+    public async Task<List<BalanceRecordDetailPageResponse>> RecordPageDetailsToExportAsync([FromQuery] BalanceRecordPageDetailRequest request)
+    {
+        return await _balanceService.RecordPageDetailsToExportAsync(request);
+    }
+
     /// <summary>
     /// 设备消费记录
     /// </summary>

Src/Dlhis.Canteen/Order/Response/BalanceRecordDetailPageResponse.cs

@@ -1,5 +1,7 @@
 using Dlhis.Entity.Canteen.Enums;
+using Dlhis.ExcelHelper;
 using Kurisu.AspNetCore.DataAccess.Dto;
+using Kurisu.AspNetCore.Utils.Converters;
 using Kurisu.AspNetCore.Utils.Extensions;
 using Newtonsoft.Json;
 
@@ -40,41 +42,55 @@ public class BalanceRecordDetailPageResponse
     /// <summary>
     /// 工号
     /// </summary>
+    [Excel("工号")]
     public string UserCode { get; set; }
 
     /// <summary>
     /// 名称
     /// </summary>
+    [Excel("姓名")]
     public string UserName { get; set; }
 
     /// <summary>
     /// 部门名称
     /// </summary>
+    [Excel("部门")]
     public string DepartmentName { get; set; }
 
     /// <summary>
     /// 成本日期
     /// </summary>
+    [Excel("成本日期", "yyyy-MM-dd")]
+    [JsonConverter(typeof(ToDateJsonConverter))]
     public DateTime CostDate { get; set; }
 
     /// <summary>
     /// 消费时间
     /// </summary>
+    [Excel("消费时间", "yyyy-MM-dd HH:mm:ss")]
     public DateTime CostDateTime { get; set; }
 
-    /// <summary>
-    /// 备注
-    /// </summary>
-    public string Remark { get; set; }
-
     /// <summary>
     /// 消费金额
     /// </summary>
+    [Excel("金额", "0.00")]
     public string Amount => CurrentAmount.ToString("f2");
 
     [JsonIgnore]
     public decimal CurrentAmount { get; set; }
 
+    /// <summary>
+    /// 消费来源
+    /// </summary>
+    [Excel("消费来源")]
+    public string SourceDesc => Source.GetDescription();
+
+    /// <summary>
+    /// 营业点
+    /// </summary>
+    [Excel("营业点")]
+    public string BusinessPlaceName { get; set; }
+
     /// <summary>
     /// 餐次
     /// </summary>
@@ -83,30 +99,30 @@ public class BalanceRecordDetailPageResponse
     /// <summary>
     /// 餐次
     /// </summary>
+    [Excel("餐次")]
     public string ShiftTypeDesc => ShiftType?.GetDescription();
 
     /// <summary>
-    /// 营业点
+    /// 消费来源
-    /// </summary>
-    public string BusinessPlaceName { get; set; }
-
-    /// <summary>
-    /// 扣款方式
     /// </summary>
     public BalanceRecordSourceEnumType Source { get; set; }
 
-    /// <summary>
-    /// 扣款方式
-    /// </summary>
-    public string SourceDesc => Source.GetDescription();
 
     /// <summary>
     /// 厂区
     /// </summary>
+    [Excel("厂区")]
     public string Factory { get; set; }
 
     /// <summary>
     /// 人事范围
     /// </summary>
+    [Excel("人事范围")]
     public string Werks { get; set; }
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    [Excel("备注")]
+    public string Remark { get; set; }
 }

Src/Dlhis.Canteen/Order/Services/IBalanceService.cs

@@ -32,6 +32,9 @@ public interface IBalanceService : IScopeDependency
     /// <returns></returns>
     Task<BalanceRecordByBusinessPlaceResponse> RecordPageDetailsAsync(BalanceRecordPageDetailRequest request);
 
+
+    Task<List<BalanceRecordDetailPageResponse>> RecordPageDetailsToExportAsync(BalanceRecordPageDetailRequest request);
+
     Task<ConsumeNumberResponse> GetConsumeNumberAsync();
 
     Task ManuallyImportBalanceAndReCalcAsync(List<BalanceManuallyImportRequest> requests);

Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs

@@ -112,7 +112,7 @@ public class BalanceService : IBalanceService
     /// <inheritdoc />
     public async Task<List<BalanceRecordResponse>> GetPageToExportAsync(BalanceRecordPageRequest request)
     {
-         var rows = await _dbContext.Queryable<BalanceRecordEntity>()
+        var rows = await _dbContext.Queryable<BalanceRecordEntity>()
             .LeftJoin<DepartmentEntity>((record, department) => record.DepartmentNo == department.No)
             .LeftJoin<BusinessPlaceEntity>((record, department, bPlace) => record.BusinessPlaceCode == bPlace.Code)
             .WhereIF(request.SearchDateTimePeriod.HasValue(), record => record.CostDate >= request.SearchDateTimePeriod.Start && record.CostDate <= request.SearchDateTimePeriod.End)
@@ -352,6 +352,61 @@ public class BalanceService : IBalanceService
     }
 
 
+    public async Task<List<BalanceRecordDetailPageResponse>> RecordPageDetailsToExportAsync(BalanceRecordPageDetailRequest request)
+    {
+        var myCodes = (await _businessPlacePermissionsApi.GetMyAsync()).Select(x => (Guid?)x.Code).ToList();
+        if (request.BusinessplaceCodes.IsPresent())
+        {
+            myCodes = myCodes.Where(x => request.BusinessplaceCodes.Contains(x)).ToList();
+        }
+
+        //var myCodes = request.BusinessplaceCodes;
+
+        var queryable = _dbContext.Queryable<BalanceRecordEntity>()
+            .LeftJoin<DepartmentEntity>((record, department) => record.DepartmentNo == department.No)
+            .LeftJoin<BusinessPlaceEntity>((record, department, bPlace) => record.BusinessPlaceCode == bPlace.Code)
+            .WhereIF(request.SearchDateTimePeriod.HasValue(), record => record.CostDate >= request.SearchDateTimePeriod.Start && record.CostDate <= request.SearchDateTimePeriod.End)
+            .Where(record => record.Type == BalanceRecordTypeEnumType.Out && record.Status == BalanceRecordStatusEnumType.Valid)
+            .Where(record => myCodes.Contains(record.BusinessPlaceCode))
+            .WhereIF(request.ShiftType.HasValue, record => record.ShiftType == request.ShiftType)
+            .WhereIF(request.Search.IsPresent(), record => record.UserCode == request.Search || record.Name == request.Search);
+
+        var rows = await queryable
+            .OrderBy(record => new { CostDate = SqlFunc.Desc(record.CostDate), CostDateTime = SqlFunc.Desc(record.CostDateTime) })
+            .Select((record, department, bPlace) => new BalanceRecordDetailPageResponse
+            {
+                Id = record.Id,
+                No = record.No,
+                CurrentAmount = SqlFunc.Abs(record.Amount),
+                CostDate = record.CostDate,
+                UserNo = record.UserNo,
+                UserCode = record.UserCode,
+                Source = record.Source,
+                UserName = record.Name,
+                DepartmentName = department.Name,
+                BusinessPlaceName = bPlace.Name,
+                CostDateTime = record.CostDateTime,
+                ShiftType = record.ShiftType,
+                Werks = record.Werks,
+                Factory = record.TenantId,
+                Remark = record.Remark,
+            })
+            .ToListAsync();
+
+        try
+        {
+            var tenants = await _tenantApi.GetTenantsInternalAsync();
+            rows.ForEach(item => { item.Factory = tenants.FirstOrDefault(x => x.Code == item.Factory)?.Name; });
+        }
+        catch (Exception)
+        {
+            //ignore
+        }
+
+        return rows;
+    }
+
+
     public async Task SupplementBalanceAsync(BalanceSupplementRequest request)
     {
         var balanceInfo = await _dbContext.Queryable<BalanceRecordEntity>().Where(x => x.No == request.No).SingleAsync();

Src/Dlhis.Canteen/appsettings.Development.json

@@ -19,9 +19,9 @@
   },
   "SwaggerOptions": {
     "Enable": true,
-    "Authority": "https://yikatong.isawesome.cn/oauth2",
+    "Authority": "http://localhost:5000",
-    "ClientId": "4fb184324eac4180",
+    "ClientId": "98958aa485d38412",
-    "ClientSecret": "8ac8f235152f1524",
+    "ClientSecret": "52589e011f02fe19",
     "Scopes": {
       "openid": "openid",
       "profile": "profile",
@@ -29,8 +29,8 @@
     }
   },
   "IdentityServerOptions": {
-    "Authority": "https://yikatong.isawesome.cn/oauth2",
+    "Authority": "http://localhost:5000",
-    "RequireHttpsMetadata": true,
+    "RequireHttpsMetadata": false,
     "Issuer": "identity.isawesome.cn",
     "Audience": "",
     "Pat": {

Src/Dlhis.Canteen/appsettings.json

@@ -45,7 +45,7 @@
     }
   },
   "RedisOptions": {
-    "ConnectionString": "192.168.199.30:30115,defaultDatabase=1,password=dlhis123"
+    "ConnectionString": "192.168.199.124:6379,defaultDatabase=1,password=dlhis123"
   },
   "Serilog": {
     "MinimumLevel": {