diff --git a/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Application.Contracts/AppBusiness/TestSchool/Dtos/CreateUpdateTestSchoolDto.cs b/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Application.Contracts/AppBusiness/TestSchool/Dtos/CreateUpdateTestSchoolDto.cs
index 358b0c2..2f7aa7d 100644
--- a/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Application.Contracts/AppBusiness/TestSchool/Dtos/CreateUpdateTestSchoolDto.cs
+++ b/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Application.Contracts/AppBusiness/TestSchool/Dtos/CreateUpdateTestSchoolDto.cs
@@ -16,7 +16,7 @@ public class CreateUpdateTestSchoolDto
///
///
///
- public SchoolType OrderType { get; set; }
+ public Enum_SchoolType OrderType { get; set; }
///
///
diff --git a/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Application.Contracts/AppBusiness/TestSchool/Dtos/CreateUpdateTestStudentDetailDto.cs b/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Application.Contracts/AppBusiness/TestSchool/Dtos/CreateUpdateTestStudentDetailDto.cs
index fa106c6..bc17bf9 100644
--- a/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Application.Contracts/AppBusiness/TestSchool/Dtos/CreateUpdateTestStudentDetailDto.cs
+++ b/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Application.Contracts/AppBusiness/TestSchool/Dtos/CreateUpdateTestStudentDetailDto.cs
@@ -19,5 +19,5 @@ public class CreateUpdateTestStudentDetailDto
///
///
///
- public StudentType OrderType { get; set; }
+ public Enum_StudentType OrderType { get; set; }
}
\ No newline at end of file
diff --git a/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Application.Contracts/AppBusiness/TestSchool/Dtos/TestSchoolDto.cs b/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Application.Contracts/AppBusiness/TestSchool/Dtos/TestSchoolDto.cs
index eedfe53..e4508ba 100644
--- a/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Application.Contracts/AppBusiness/TestSchool/Dtos/TestSchoolDto.cs
+++ b/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Application.Contracts/AppBusiness/TestSchool/Dtos/TestSchoolDto.cs
@@ -20,7 +20,7 @@ public class TestSchoolDto : AuditedEntityDto
///
///
///
- public SchoolType OrderType { get; set; }
+ public Enum_SchoolType OrderType { get; set; }
///
///
diff --git a/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Application.Contracts/AppBusiness/TestSchool/Dtos/TestStudentDetailDto.cs b/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Application.Contracts/AppBusiness/TestSchool/Dtos/TestStudentDetailDto.cs
index 030ae07..510525b 100644
--- a/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Application.Contracts/AppBusiness/TestSchool/Dtos/TestStudentDetailDto.cs
+++ b/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Application.Contracts/AppBusiness/TestSchool/Dtos/TestStudentDetailDto.cs
@@ -23,5 +23,5 @@ public class TestStudentDetailDto : AuditedEntityDto
///
///
///
- public StudentType OrderType { get; set; }
+ public Enum_StudentType OrderType { get; set; }
}
\ No newline at end of file
diff --git a/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Domain.Shared/Enums/Enum_ExportCustomUserSetting.cs b/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Domain.Shared/Enums/Enum_ExportCustomUserSetting.cs
new file mode 100644
index 0000000..974e0bf
--- /dev/null
+++ b/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Domain.Shared/Enums/Enum_ExportCustomUserSetting.cs
@@ -0,0 +1,14 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Faster.Zheng.Winin.Enums
+{
+ public enum Enum_ExportCustomUserSetting
+ {
+ [Display(Name = "未定义")]
+ None=0,
+ [Display(Name = "导出")]
+ Yes=1,
+ [Display(Name = "不导出")]
+ No = 2
+ }
+}
diff --git a/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Domain.Shared/Enums/SchoolType.cs b/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Domain.Shared/Enums/Enum_SchoolType.cs
similarity index 89%
rename from Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Domain.Shared/Enums/SchoolType.cs
rename to Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Domain.Shared/Enums/Enum_SchoolType.cs
index 2145c41..bb0b5be 100644
--- a/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Domain.Shared/Enums/SchoolType.cs
+++ b/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Domain.Shared/Enums/Enum_SchoolType.cs
@@ -2,7 +2,7 @@
namespace Faster.Zheng.Winin.Enums
{
- public enum SchoolType
+ public enum Enum_SchoolType
{
[Display(Name = "未定义")]
None=0,
diff --git a/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Domain.Shared/Enums/StudentType.cs b/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Domain.Shared/Enums/Enum_StudentType.cs
similarity index 88%
rename from Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Domain.Shared/Enums/StudentType.cs
rename to Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Domain.Shared/Enums/Enum_StudentType.cs
index 449b095..ffe78ed 100644
--- a/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Domain.Shared/Enums/StudentType.cs
+++ b/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Domain.Shared/Enums/Enum_StudentType.cs
@@ -2,7 +2,7 @@
namespace Faster.Zheng.Winin.Enums
{
- public enum StudentType
+ public enum Enum_StudentType
{
[Display(Name = "未定义")]
None=0,
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
deleted file mode 100644
index 2e1a980..0000000
--- a/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Domain/AppBusiness/ExportCustomUser/ExportCustomUser.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-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 :AuditedAggregateRoot
- {
- public string ExportUserId { get; set; }
- public string ExportColumnName { get; set; }
- public string ExportTableName { get; set; }
- }
-}
diff --git a/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Domain/AppBusiness/ExportCustomUserSetting/ExportCustomUserSetting.cs b/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Domain/AppBusiness/ExportCustomUserSetting/ExportCustomUserSetting.cs
new file mode 100644
index 0000000..84a12d8
--- /dev/null
+++ b/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Domain/AppBusiness/ExportCustomUserSetting/ExportCustomUserSetting.cs
@@ -0,0 +1,42 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using Faster.Zheng.Winin.Enums;
+using Volo.Abp.Domain.Entities.Auditing;
+
+namespace Faster.Zheng.Winin.AppBusiness.ExportCustomUserSetting;
+
+///
+/// 用户个型导出配置
+///
+public class ExportCustomUserSetting : AuditedAggregateRoot
+{
+ ///
+ /// 用户ID
+ ///
+ [Display(Name = "用户ID")]
+ public string ExportUserId { get; set; }
+
+ ///
+ /// 用户姓名
+ ///
+ [Display(Name = "用户姓名")]
+ public string ExportUserName { get; set; }
+
+ ///
+ /// 列名
+ ///
+ [Display(Name = "列名")]
+ public string ExportColumnName { get; set; }
+
+ ///
+ /// 表名
+ ///
+ [Display(Name = "表名")]
+ public string ExportTableName { get; set; }
+
+ ///
+ /// 导出设置项
+ ///
+ [Display(Name = "导出设置项")]
+ public Enum_ExportCustomUserSetting CustomUserSetting { get; set; }
+}
\ No newline at end of file
diff --git a/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Domain/AppBusiness/TestSchool/TestSchool.cs b/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Domain/AppBusiness/TestSchool/TestSchool.cs
index 920d1c3..f3576aa 100644
--- a/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Domain/AppBusiness/TestSchool/TestSchool.cs
+++ b/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Domain/AppBusiness/TestSchool/TestSchool.cs
@@ -8,12 +8,14 @@ using Volo.Abp.Domain.Entities.Auditing;
namespace Faster.Zheng.Winin.AppBusiness.TestSchool;
//[Table("School")] 不起作用
+
+//设置索引
[Index(nameof(TestSchool.SchoolName), nameof(TestSchool.OrderType))]
public class TestSchool : AuditedAggregateRoot
{
public string SchoolName { get; set; }
- public SchoolType OrderType { get; set; }
+ public Enum_SchoolType OrderType { get; set; }
public List Details { get; set; } = new();
}
diff --git a/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Domain/AppBusiness/TestSchool/TestStudentDetail.cs b/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Domain/AppBusiness/TestSchool/TestStudentDetail.cs
index ff575c8..c7a6110 100644
--- a/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Domain/AppBusiness/TestSchool/TestStudentDetail.cs
+++ b/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Domain/AppBusiness/TestSchool/TestStudentDetail.cs
@@ -13,5 +13,5 @@ public class TestStudentDetail : AuditedAggregateRoot
public string StudentName { get; set; }
- public StudentType OrderType { get; set; }
+ public Enum_StudentType OrderType { get; set; }
}
diff --git a/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Web/Pages/AppBusiness/TestSchool/TestSchool/ViewModels/CreateEditTestSchoolViewModel.cs b/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Web/Pages/AppBusiness/TestSchool/TestSchool/ViewModels/CreateEditTestSchoolViewModel.cs
index 782957a..ef8ede6 100644
--- a/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Web/Pages/AppBusiness/TestSchool/TestSchool/ViewModels/CreateEditTestSchoolViewModel.cs
+++ b/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Web/Pages/AppBusiness/TestSchool/TestSchool/ViewModels/CreateEditTestSchoolViewModel.cs
@@ -11,7 +11,7 @@ public class CreateEditTestSchoolViewModel
public string SchoolName { get; set; }
[Display(Name = "TestSchoolOrderType")]
- public SchoolType OrderType { get; set; }
+ public Enum_SchoolType OrderType { get; set; }
[Display(Name = "TestSchoolDetails")]
public List Details { get; set; }
diff --git a/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Web/Pages/AppBusiness/TestSchool/TestStudentDetail/ViewModels/CreateEditTestStudentDetailViewModel.cs b/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Web/Pages/AppBusiness/TestSchool/TestStudentDetail/ViewModels/CreateEditTestStudentDetailViewModel.cs
index eb3612d..e312adb 100644
--- a/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Web/Pages/AppBusiness/TestSchool/TestStudentDetail/ViewModels/CreateEditTestStudentDetailViewModel.cs
+++ b/Code/Be/Faster.Zheng.Winin/src/Faster.Zheng.Winin.Web/Pages/AppBusiness/TestSchool/TestStudentDetail/ViewModels/CreateEditTestStudentDetailViewModel.cs
@@ -13,5 +13,5 @@ public class CreateEditTestStudentDetailViewModel
public string StudentName { get; set; }
[Display(Name = "TestStudentDetailOrderType")]
- public StudentType OrderType { get; set; }
+ public Enum_StudentType OrderType { get; set; }
}