From 803d539978c93793477a538d3893f3a3a6279b1e Mon Sep 17 00:00:00 2001
From: "boxu.zheng" <boxu.zheng@ccwin-in.com>
Date: Mon, 10 Jul 2023 17:02:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppBase/ZbxBase.cs                           |  6 ++----
 .../ExportCustomUser/ExportCustomUser.cs         | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Domain/AppBusiness/ExportCustomUser/ExportCustomUser.cs

diff --git a/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Application/AppBase/ZbxBase.cs b/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Application/AppBase/ZbxBase.cs
index 2093427..1bc23d7 100644
--- a/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Application/AppBase/ZbxBase.cs
+++ b/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Application/AppBase/ZbxBase.cs
@@ -61,8 +61,6 @@ public class ZbxBase<TEntity, TEntityDto, TKey, TPagedAndSortedResultRequestDto,
     public async Task<PagedResultDto<TEntityDto>> GetPageListByFilterAsync(SfsRequestInputBase sfsRequestInputBase,
         bool includeDetails = false, CancellationToken cancellationToken = default)
     {
-        //await TestSqlAsync();
-
         var expression = sfsRequestInputBase.Condition.Filters?.Count > 0
             ? sfsRequestInputBase.Condition.Filters.ToLambda<TEntity>()
             : p => true;
@@ -297,8 +295,8 @@ public class ZbxBase<TEntity, TEntityDto, TKey, TPagedAndSortedResultRequestDto,
         {
             var englishName=mainProperties[i].Name;
             //本地化
-            //var localizerName = _localizer[englishName];
-            headerRow.CreateCell(i).SetCellValue(englishName);
+            var localizerName = _localizer[typeof(TEntityDto).Name.Replace("Dto","") + englishName];
+            headerRow.CreateCell(i).SetCellValue(localizerName);
         }
 
         // 获取从表的属性 创建从表 表头
diff --git a/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Domain/AppBusiness/ExportCustomUser/ExportCustomUser.cs b/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Domain/AppBusiness/ExportCustomUser/ExportCustomUser.cs
new file mode 100644
index 0000000..e578993
--- /dev/null
+++ b/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Domain/AppBusiness/ExportCustomUser/ExportCustomUser.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Volo.Abp.Domain.Entities.Auditing;
+
+namespace Faster.Zheng.Winin.AppBusiness.AppExportUser
+{
+    public class ExportCustomUser
+    {
+        public string ExportUserId { get; set; }
+        public string ExportColumnName { get; set; }
+        public string ExportTableName { get; set; }
+    }
+}