From 7387c1e0f6451dc3d3f4ef028b3e7cfd7eee8372 Mon Sep 17 00:00:00 2001 From: ck_yeun9 Date: Sun, 20 Apr 2025 03:23:56 +0800 Subject: [PATCH 1/5] housekeeping. --- .../Business/Asset/AssetService.cs | 4 +-- .../Business/Asset/IAssetService.cs | 1 - .../Business/Customer/CustomerService.cs | 14 ++++------- .../EnergyManagementService.cs | 5 ++-- .../IEnergyManagementService.cs | 1 - .../IPromotionContentService.cs | 1 - .../PromotionContentService.cs | 2 +- .../Business/Reser/IReserService.cs | 1 - .../Business/Reser/ReserService.cs | 3 +-- .../Business/Room/IRoomService.cs | 1 - .../Business/Room/IRoomTypeService.cs | 1 - .../Business/Room/RoomService.cs | 6 ++--- .../Business/Room/RoomTypeService.cs | 4 +-- .../Business/Sellthing/SellService.cs | 3 +-- .../Business/Spend/ISpendService.cs | 1 - .../Business/Spend/SpendService.cs | 8 +++--- .../Employee/Check/EmployeeCheckService.cs | 2 +- .../Employee/Check/IEmployeeCheckService.cs | 1 - .../Employee/EmployeeService.cs | 25 ++++++++----------- .../Employee/IEmployeeService.cs | 1 - .../Employee/Photo/EmployeePhotoService.cs | 6 ++--- .../Employee/Photo/IEmployeePhotoService.cs | 3 +-- .../Sys/NavBar/INavBarService.cs | 1 - .../Administrator/AdminService.cs | 5 ---- .../SystemManagement/Base/BaseService.cs | 5 ---- .../SystemManagement/Base/IBaseService.cs | 2 -- .../SystemManagement/Notice/INoticeService.cs | 1 - .../SystemManagement/Role/IRoleAppService.cs | 5 ---- .../SystemManagement/Role/RoleAppService.cs | 7 +----- .../ISupervisionStatisticsService.cs | 1 - .../VipRule/IVipRuleAppService.cs | 1 - .../Util/IUtilService.cs | 1 - .../Util/UtilService.cs | 6 ++--- .../BaseDto/BaseDto.cs | 4 +-- .../BaseDto/BaseInputDto.cs | 10 ++------ .../BaseDto/BaseOutputDto.cs | 7 +----- .../BaseDto/ListInputDto.cs | 10 ++------ .../BaseDto/ListOutputDto.cs | 2 -- .../BaseDto/SingleOutputDto.cs | 8 +----- .../BaseDto/StatusCodeConstants.cs | 8 +----- .../Asset/Dto/Asset/CreateAssetInputDto.cs | 2 +- .../Asset/Dto/Asset/DeleteAssetInputDto.cs | 2 +- .../Asset/Dto/Asset/ReadAssetInputDto.cs | 2 +- .../Asset/Dto/Asset/UpdateAssetInputDto.cs | 2 +- .../Dto/CustoType/CreateCustoTypeInputDto.cs | 2 +- .../Dto/CustoType/DeleteCustoTypeInputDto.cs | 2 +- .../Dto/CustoType/ReadCustoTypeInputDto.cs | 2 +- .../Dto/CustoType/UpdateCustoTypeInputDto.cs | 2 +- .../Dto/Customer/CreateCustomerInputDto.cs | 2 +- .../Dto/Customer/DeleteCustomerInputDto.cs | 2 +- .../Dto/Customer/ReadCustomerInputDto.cs | 2 +- .../Dto/Customer/UpdateCustomerInputDto.cs | 2 +- .../GenderType/CreateGenderTypeInputDto.cs | 2 +- .../GenderType/DeleteGenderTypeInputDto.cs | 2 +- .../Dto/GenderType/ReadGenderTypeInputDto.cs | 2 +- .../GenderType/UpdateGenderTypeInputDto.cs | 2 +- .../CreatePassportTypeInputDto.cs | 2 +- .../DeletePassportTypeInputDto.cs | 2 +- .../PassportType/ReadPassportTypeInputDto.cs | 2 +- .../UpdatePassportTypeInputDto.cs | 2 +- .../Dto/DeleteEnergyManagementInputDto.cs | 2 +- .../Dto/ReadEnergyManagementInputDto.cs | 2 +- .../Dto/UpdateEnergyManagementInputDto.cs | 2 +- .../Dto/CreatePromotionContentInputDto.cs | 2 +- .../Dto/DeletePromotionContentInputDto.cs | 2 +- .../Dto/ReadPromotionContentInputDto.cs | 2 +- .../Dto/UpdatePromotionContentInputDto.cs | 2 +- .../Business/Reser/Dto/CreateReserInputDto.cs | 2 +- .../Business/Reser/Dto/DeleteReserInputDto.cs | 2 +- .../Business/Reser/Dto/ReadReserInputDto.cs | 2 +- .../Business/Reser/Dto/UpdateReserInputDto.cs | 2 +- .../Dto/RoomState/CreateRoomStateInputDto.cs | 2 +- .../Dto/RoomState/DeleteRoomStateInputDto.cs | 2 +- .../Dto/RoomState/ReadRoomStateInputDto.cs | 2 +- .../Dto/RoomState/UpdateRoomStateInputDto.cs | 2 +- .../Dto/RoomType/CreateRoomTypeInputDto.cs | 2 +- .../Dto/RoomType/DeleteRoomTypeInputDto.cs | 2 +- .../Room/Dto/RoomType/ReadRoomTypeInputDto.cs | 2 +- .../Dto/RoomType/UpdateRoomTypeInputDto.cs | 5 +--- .../Sellthing/Dto/CreateSellThingInputDto.cs | 2 +- .../Sellthing/Dto/DeleteSellThingInputDto.cs | 2 +- .../Sellthing/Dto/ReadSellThingInputDto.cs | 2 +- .../Sellthing/Dto/UpdateSellThingInputDto.cs | 2 +- .../Spend/Dto/Spend/CreateSpendInputDto.cs | 2 +- .../Spend/Dto/Spend/DeleteSpendInputDto.cs | 2 +- .../Spend/Dto/Spend/ReadSpendInputDto.cs | 2 +- .../Spend/Dto/Spend/ReadSpendOutputDto.cs | 2 +- .../Spend/Dto/Spend/UpdateSpendInputDto.cs | 2 +- .../Dto/Employee/CreateEmployeeInputDto.cs | 2 +- .../Dto/Employee/DeleteEmployeeInputDto.cs | 2 +- .../Dto/Employee/ReadEmployeeInputDto.cs | 2 +- .../Dto/Employee/ReadEmployeeOutputDto.cs | 2 +- .../Dto/Employee/UpdateEmployeeInputDto.cs | 2 +- .../CreateEmployeeCheckInputDto.cs | 2 +- .../DeleteEmployeeCheckInputDto.cs | 2 +- .../ReadEmployeeCheckInputDto.cs | 2 +- .../UpdateEmployeeCheckInputDto.cs | 2 +- .../CreateEmployeeHistoryInputDto.cs | 2 +- .../DeleteEmployeeHistoryInputDto.cs | 2 +- .../ReadEmployeeHistoryInputDto.cs | 2 +- .../UpdateEmployeeHistoryInputDto.cs | 2 +- .../CreateEmployeePhotoInputDto.cs | 2 +- .../DeleteEmployeePhotoInputDto.cs | 2 +- .../ReadEmployeePhotoInputDto.cs | 2 +- .../UpdateEmployeePhotoInputDto.cs | 2 +- .../CreateEmployeeRewardPunishmentInputDto.cs | 2 +- .../DeleteEmployeeRewardPunishmentInputDto.cs | 2 +- .../ReadEmployeeRewardPunishmentInputDto.cs | 2 +- .../UpdateEmployeeRewardPunishmentInputDto.cs | 2 +- .../Sys/NavBar/Dto/CreateNavBarInputDto.cs | 2 +- .../Sys/NavBar/Dto/DeleteNavBarInputDto.cs | 2 +- .../Sys/NavBar/Dto/ReadNavBarInputDto.cs | 2 +- .../Sys/NavBar/Dto/UpdateNavBarInputDto.cs | 2 +- .../CreateAdministratorInputDto.cs | 2 +- .../DeleteAdministratorInputDto.cs | 2 +- .../ReadAdministratorInputDto.cs | 2 +- .../ReadAdministratorOutputDto.cs | 4 +-- .../UpdateAdministratorInputDto.cs | 2 +- .../CreateAdministratorTypeInputDto.cs | 2 +- .../DeleteAdministratorTypeInputDto.cs | 2 +- .../ReadAdministratorTypeInputDto.cs | 2 +- .../UpdateAdministratorTypeInputDto.cs | 2 +- .../CreateAppointmentNoticeInputDto.cs | 2 +- .../DeleteAppointmentNoticeInputDto.cs | 2 +- .../ReadAppointmentNoticeInputDto.cs | 2 +- .../UpdateAppointmentNoticeInputDto.cs | 2 +- .../Department/CreateDepartmentInputDto.cs | 2 +- .../Department/DeleteDepartmentInputDto.cs | 2 +- .../Dto/Department/ReadDepartmentInputDto.cs | 2 +- .../Department/UpdateDepartmentInputDto.cs | 2 +- .../SystemManagement/Dto/EnumDto.cs | 8 +----- .../Dto/Menu/CreateMenuInputDto.cs | 2 +- .../Dto/Menu/DeleteMenuInputDto.cs | 2 +- .../Dto/Menu/MenuViewModel.cs | 8 +----- .../Dto/Menu/ReadMenuInputDto.cs | 2 +- .../Dto/Menu/UpdateMenuInputDto.cs | 2 +- .../Dto/Module/CreateModuleInputDto.cs | 2 +- .../Dto/Module/DeleteModuleInputDto.cs | 2 +- .../Dto/Module/ReadModuleInputDto.cs | 2 +- .../Dto/Module/UpdateModuleInputDto.cs | 2 +- .../CreateModulePermissionInputDto.cs | 2 +- .../DeleteModulePermissionInputDto.cs | 2 +- .../ReadModulePermissionInputDto.cs | 2 +- .../ReadModulePermissionOutputDto.cs | 2 -- .../UpdateModulePermissionInputDto.cs | 2 +- .../Dto/Nation/CreateNationInputDto.cs | 2 +- .../Dto/Nation/DeleteNationInputDto.cs | 2 +- .../Dto/Nation/ReadNationInputDto.cs | 2 +- .../Dto/Nation/UpdateNationInputDto.cs | 2 +- .../Dto/Position/CreatePositionInputDto.cs | 2 +- .../Dto/Position/DeletePositionInputDto.cs | 2 +- .../Dto/Position/ReadPositionInputDto.cs | 2 +- .../Dto/Position/UpdatePositionInputDto.cs | 2 +- .../Qualification/CreateEducationInputDto.cs | 2 +- .../Qualification/DeleteEducationInputDto.cs | 2 +- .../Qualification/ReadEducationInputDto.cs | 2 +- .../Qualification/UpdateEducationInputDto.cs | 2 +- .../Dto/Role/CreateRoleInputDto.cs | 2 +- .../Dto/Role/DeleteRoleInputDto.cs | 2 +- .../Dto/Role/ReadRoleInputDto.cs | 2 +- .../Dto/Role/UpdateRoleInputDto.cs | 2 +- .../CreateSupervisionStatisticsInputDto.cs | 2 +- .../DeleteSupervisionStatisticsInputDto.cs | 2 +- .../ReadSupervisionStatisticsInputDto.cs | 2 +- .../UpdateSupervisionStatisticsInputDto.cs | 2 +- .../CreateSystemInformationInputDto.cs | 2 +- .../DeleteSystemInformationInputDto.cs | 2 +- .../ReadSystemInformationInputDto.cs | 2 +- .../UpdateSystemInformationInputDto.cs | 2 +- .../CreateVipLevelRuleInputDto.cs | 2 +- .../DeleteVipLevelRuleInputDto.cs | 2 +- .../VipLevelRule/ReadVipLevelRuleInputDto.cs | 2 +- .../VipLevelRule/ReadVipLevelRuleOutputDto.cs | 4 +-- .../UpdateVipLevelRuleInputDto.cs | 2 +- .../CreateApplicationVersionInputDto.cs | 2 +- .../DeleteApplicationVersionInputDto.cs | 2 +- .../ReadApplicationVersionInputDto.cs | 2 +- .../UpdateApplicationVersionInputDto.cs | 2 +- .../Dto/CardCode/CreateCardCodeInputDto.cs | 2 +- .../Dto/CardCode/DeleteCardCodeInputDto.cs | 2 +- .../Util/Dto/CardCode/ReadCardCodeInputDto.cs | 2 +- .../Dto/CardCode/UpdateCardCodeInputDto.cs | 2 +- .../CreateOperationLogInputDto.cs | 2 +- .../DeleteOperationLogInputDto.cs | 2 +- .../OperationLog/ReadOperationLogInputDto.cs | 2 +- .../OperationLog/ReadOperationLogOutputDto.cs | 1 - .../UpdateOperationLogInputDto.cs | 2 +- .../Business/Asset/Asset.cs | 2 +- .../Business/Room/RoomState.cs | 1 - .../Business/Sellthing/SellThing.cs | 1 - .../Business/Spend/Spend.cs | 3 +-- .../SystemManagement/Menu.cs | 5 +--- .../SystemManagement/MenuViewModel.cs | 6 +---- .../SystemManagement/PoliticalAffiliation.cs | 7 +----- .../SystemManagement/Role.cs | 7 ++---- .../SystemManagement/RolePermission.cs | 5 +--- .../SystemManagement/UserRole.cs | 19 ++++++-------- .../Util/OperationLog.cs | 2 +- .../GenerateJWT/JWTHelper.cs | 2 -- .../Helper/LskyHelper.cs | 19 ++++++-------- .../Helper/MailHelper.cs | 4 +-- .../Helper/RandomStringGenerator.cs | 7 +----- .../Validator/UIDisplayAttribute.cs | 2 +- .../Repository/GenericRepository.cs | 2 +- EOM.TSHotelManagement.Shared/BrotliHelper.cs | 7 +----- EOM.TSHotelManagement.Shared/EnumHelper.cs | 7 +----- .../Interfaces/ILskyConfigFactory.cs | 8 +----- .../Interfaces/IMailConfigFactory.cs | 8 +----- .../Interfaces/LskyConfig.cs | 8 +----- EOM.TSHotelManagement.Shared/MailConfig.cs | 8 +----- .../Business/Asset/AssetController.cs | 6 ++--- .../Business/Customer/CustomerController.cs | 2 +- .../EnergyManagementController.cs | 8 ++---- .../PromotionContent/FontsController.cs | 5 +--- .../Business/Reser/ReserController.cs | 2 -- .../Business/Room/RoomController.cs | 4 +-- .../Business/Room/RoomTypeController.cs | 2 -- .../Business/Sellthing/SellthingController.cs | 2 -- .../Business/Spend/SpendController.cs | 7 +----- .../Employee/Check/EmployeeCheckController.cs | 2 -- .../Employee/EmployeeController.cs | 3 --- .../History/EmployeeHistoryController.cs | 2 -- .../Employee/Photo/EmployeePhotoController.cs | 5 ++-- .../RewardPunishmentController.cs | 2 -- .../Sys/NavBar/NavBarController.cs | 2 -- .../Administrator/AdminController.cs | 6 +---- .../SystemManagement/Base/BaseController.cs | 13 +++------- .../SystemManagement/Menu/MenuController.cs | 6 ++--- .../Notice/NoticeController.cs | 4 +-- .../SystemManagement/Role/RoleController.cs | 5 ++-- .../SupervisionStatisticsController.cs | 4 +-- .../VipRule/VipRuleController.cs | 4 +-- .../Controllers/Util/UtilityController.cs | 3 +-- .../Factory/LskyConfigFactory.cs | 2 +- .../Filter/RequestLoggingMiddleware.cs | 13 ++++------ 235 files changed, 258 insertions(+), 486 deletions(-) diff --git a/EOM.TSHotelManagement.Application/Business/Asset/AssetService.cs b/EOM.TSHotelManagement.Application/Business/Asset/AssetService.cs index c039351..8295c9f 100644 --- a/EOM.TSHotelManagement.Application/Business/Asset/AssetService.cs +++ b/EOM.TSHotelManagement.Application/Business/Asset/AssetService.cs @@ -75,7 +75,7 @@ namespace EOM.TSHotelManagement.Application } catch (Exception ex) { - return new BaseOutputDto() { Message = LocalizationHelper.GetLocalizedString(ex.Message,ex.Message),StatusCode = StatusCodeConstants.InternalServerError }; + return new BaseOutputDto() { Message = LocalizationHelper.GetLocalizedString(ex.Message, ex.Message), StatusCode = StatusCodeConstants.InternalServerError }; } return new BaseOutputDto(); } @@ -100,7 +100,7 @@ namespace EOM.TSHotelManagement.Application int totalCount = 0; if (asset.Page != 0 && asset.PageSize != 0) { - cs.listSource = EntityMapper.MapList(assetRepository.AsQueryable().Where(where.ToExpression()).OrderBy(a => a.AssetNumber) + cs.listSource = EntityMapper.MapList(assetRepository.AsQueryable().Where(where.ToExpression()).OrderBy(a => a.AssetNumber) .ToPageList((int)asset.Page, (int)asset.PageSize, ref totalCount)); cs.total = totalCount; } diff --git a/EOM.TSHotelManagement.Application/Business/Asset/IAssetService.cs b/EOM.TSHotelManagement.Application/Business/Asset/IAssetService.cs index bb66f3e..09129a4 100644 --- a/EOM.TSHotelManagement.Application/Business/Asset/IAssetService.cs +++ b/EOM.TSHotelManagement.Application/Business/Asset/IAssetService.cs @@ -22,7 +22,6 @@ * */ using EOM.TSHotelManagement.Common.Contract; -using EOM.TSHotelManagement.Common.Core; namespace EOM.TSHotelManagement.Application { diff --git a/EOM.TSHotelManagement.Application/Business/Customer/CustomerService.cs b/EOM.TSHotelManagement.Application/Business/Customer/CustomerService.cs index ec12ff0..1b7e8dd 100644 --- a/EOM.TSHotelManagement.Application/Business/Customer/CustomerService.cs +++ b/EOM.TSHotelManagement.Application/Business/Customer/CustomerService.cs @@ -21,18 +21,14 @@ *SOFTWARE. * */ -using EOM.TSHotelManagement.Shared; +using EOM.TSHotelManagement.Common.Contract; using EOM.TSHotelManagement.Common.Core; +using EOM.TSHotelManagement.Common.Util; using EOM.TSHotelManagement.EntityFramework; +using EOM.TSHotelManagement.Shared; using jvncorelib.EntityLib; -using SqlSugar; -using System.ComponentModel; -using EOM.TSHotelManagement.Common; using Microsoft.AspNetCore.DataProtection; -using jvncorelib.EncryptorLib; -using EOM.TSHotelManagement.Common.Contract; -using EOM.TSHotelManagement.Common.Util; -using System.Linq; +using SqlSugar; namespace EOM.TSHotelManagement.Application { @@ -96,7 +92,7 @@ namespace EOM.TSHotelManagement.Application custo.CustomerPhoneNumber = NewTel; try { - var result = custoRepository.Insert(EntityMapper.Map(custo)); + var result = custoRepository.Insert(EntityMapper.Map(custo)); } catch (Exception ex) { diff --git a/EOM.TSHotelManagement.Application/Business/EnergyManagement/EnergyManagementService.cs b/EOM.TSHotelManagement.Application/Business/EnergyManagement/EnergyManagementService.cs index bb4610c..2d5a04e 100644 --- a/EOM.TSHotelManagement.Application/Business/EnergyManagement/EnergyManagementService.cs +++ b/EOM.TSHotelManagement.Application/Business/EnergyManagement/EnergyManagementService.cs @@ -27,7 +27,6 @@ using EOM.TSHotelManagement.Common.Util; using EOM.TSHotelManagement.EntityFramework; using jvncorelib.EntityLib; using SqlSugar; -using System.Linq.Expressions; namespace EOM.TSHotelManagement.Application { @@ -82,7 +81,7 @@ namespace EOM.TSHotelManagement.Application var count = 0; var listSource = wtiRepository.AsQueryable() - .Where(where.ToExpression()).ToPageList(readEnergyManagementInputDto.Page,readEnergyManagementInputDto.PageSize,ref count); + .Where(where.ToExpression()).ToPageList(readEnergyManagementInputDto.Page, readEnergyManagementInputDto.PageSize, ref count); var readEnergies = EntityMapper.MapList(listSource); @@ -144,7 +143,7 @@ namespace EOM.TSHotelManagement.Application { try { - var result = wtiRepository.Update(EntityMapper.Map(hydroelectricity)); + var result = wtiRepository.Update(EntityMapper.Map(hydroelectricity)); if (result) { diff --git a/EOM.TSHotelManagement.Application/Business/EnergyManagement/IEnergyManagementService.cs b/EOM.TSHotelManagement.Application/Business/EnergyManagement/IEnergyManagementService.cs index ba981f7..3ca644d 100644 --- a/EOM.TSHotelManagement.Application/Business/EnergyManagement/IEnergyManagementService.cs +++ b/EOM.TSHotelManagement.Application/Business/EnergyManagement/IEnergyManagementService.cs @@ -22,7 +22,6 @@ * */ using EOM.TSHotelManagement.Common.Contract; -using EOM.TSHotelManagement.Common.Core; /// /// 水电信息接口 diff --git a/EOM.TSHotelManagement.Application/Business/PromotionContent/IPromotionContentService.cs b/EOM.TSHotelManagement.Application/Business/PromotionContent/IPromotionContentService.cs index fe52c39..631460a 100644 --- a/EOM.TSHotelManagement.Application/Business/PromotionContent/IPromotionContentService.cs +++ b/EOM.TSHotelManagement.Application/Business/PromotionContent/IPromotionContentService.cs @@ -22,7 +22,6 @@ * */ using EOM.TSHotelManagement.Common.Contract; -using EOM.TSHotelManagement.Common.Core; namespace EOM.TSHotelManagement.Application { diff --git a/EOM.TSHotelManagement.Application/Business/PromotionContent/PromotionContentService.cs b/EOM.TSHotelManagement.Application/Business/PromotionContent/PromotionContentService.cs index 82d4b40..e7a35dd 100644 --- a/EOM.TSHotelManagement.Application/Business/PromotionContent/PromotionContentService.cs +++ b/EOM.TSHotelManagement.Application/Business/PromotionContent/PromotionContentService.cs @@ -58,7 +58,7 @@ namespace EOM.TSHotelManagement.Application var listSource = fontsRepository.AsQueryable().ToPageList(readPromotionContentInputDto.Page, readPromotionContentInputDto.PageSize, ref count); - fonts.listSource = EntityMapper.MapList(listSource); + fonts.listSource = EntityMapper.MapList(listSource); fonts.total = count; return fonts; } diff --git a/EOM.TSHotelManagement.Application/Business/Reser/IReserService.cs b/EOM.TSHotelManagement.Application/Business/Reser/IReserService.cs index 636e613..3abca1d 100644 --- a/EOM.TSHotelManagement.Application/Business/Reser/IReserService.cs +++ b/EOM.TSHotelManagement.Application/Business/Reser/IReserService.cs @@ -22,7 +22,6 @@ * */ using EOM.TSHotelManagement.Common.Contract; -using EOM.TSHotelManagement.Common.Core; namespace EOM.TSHotelManagement.Application { diff --git a/EOM.TSHotelManagement.Application/Business/Reser/ReserService.cs b/EOM.TSHotelManagement.Application/Business/Reser/ReserService.cs index b083496..b8a0444 100644 --- a/EOM.TSHotelManagement.Application/Business/Reser/ReserService.cs +++ b/EOM.TSHotelManagement.Application/Business/Reser/ReserService.cs @@ -26,7 +26,6 @@ using EOM.TSHotelManagement.Common.Core; using EOM.TSHotelManagement.Common.Util; using EOM.TSHotelManagement.EntityFramework; using EOM.TSHotelManagement.Shared; -using jvncorelib.EncryptorLib; using Microsoft.AspNetCore.DataProtection; using SqlSugar; @@ -124,7 +123,7 @@ namespace EOM.TSHotelManagement.Application var outputReser = EntityMapper.Map(res); - return new SingleOutputDto { Source = outputReser}; + return new SingleOutputDto { Source = outputReser }; } /// diff --git a/EOM.TSHotelManagement.Application/Business/Room/IRoomService.cs b/EOM.TSHotelManagement.Application/Business/Room/IRoomService.cs index a0a4c20..19be848 100644 --- a/EOM.TSHotelManagement.Application/Business/Room/IRoomService.cs +++ b/EOM.TSHotelManagement.Application/Business/Room/IRoomService.cs @@ -22,7 +22,6 @@ * */ using EOM.TSHotelManagement.Common.Contract; -using EOM.TSHotelManagement.Common.Core; namespace EOM.TSHotelManagement.Application { diff --git a/EOM.TSHotelManagement.Application/Business/Room/IRoomTypeService.cs b/EOM.TSHotelManagement.Application/Business/Room/IRoomTypeService.cs index 173c0c7..04c7fe6 100644 --- a/EOM.TSHotelManagement.Application/Business/Room/IRoomTypeService.cs +++ b/EOM.TSHotelManagement.Application/Business/Room/IRoomTypeService.cs @@ -22,7 +22,6 @@ * */ using EOM.TSHotelManagement.Common.Contract; -using EOM.TSHotelManagement.Common.Core; namespace EOM.TSHotelManagement.Application { diff --git a/EOM.TSHotelManagement.Application/Business/Room/RoomService.cs b/EOM.TSHotelManagement.Application/Business/Room/RoomService.cs index 77bfdc7..1781b0c 100644 --- a/EOM.TSHotelManagement.Application/Business/Room/RoomService.cs +++ b/EOM.TSHotelManagement.Application/Business/Room/RoomService.cs @@ -167,7 +167,7 @@ namespace EOM.TSHotelManagement.Application if (!readRoomInputDto.IgnorePaging && readRoomInputDto.Page != 0 && readRoomInputDto.PageSize != 0) { - rooms = roomRepository.AsQueryable().Where(where.ToExpression()).OrderBy(a => a.RoomNumber).ToPageList(readRoomInputDto.Page,readRoomInputDto.PageSize,ref count); + rooms = roomRepository.AsQueryable().Where(where.ToExpression()).OrderBy(a => a.RoomNumber).ToPageList(readRoomInputDto.Page, readRoomInputDto.PageSize, ref count); } else { @@ -195,7 +195,7 @@ namespace EOM.TSHotelManagement.Application }); var listSource = EntityMapper.MapList(rooms); - return new ListOutputDto { listSource = listSource,total = count }; + return new ListOutputDto { listSource = listSource, total = count }; } /// @@ -519,7 +519,7 @@ namespace EOM.TSHotelManagement.Application { var isExist = roomRepository.IsAny(a => a.RoomNumber == rn.RoomNumber); if (isExist) - return new BaseOutputDto { Message = LocalizationHelper.GetLocalizedString("This room already exists.", "房间已存在。"),StatusCode = StatusCodeConstants.InternalServerError}; + return new BaseOutputDto { Message = LocalizationHelper.GetLocalizedString("This room already exists.", "房间已存在。"), StatusCode = StatusCodeConstants.InternalServerError }; roomRepository.Insert(EntityMapper.Map(rn)); } diff --git a/EOM.TSHotelManagement.Application/Business/Room/RoomTypeService.cs b/EOM.TSHotelManagement.Application/Business/Room/RoomTypeService.cs index 289ce7c..c1f032d 100644 --- a/EOM.TSHotelManagement.Application/Business/Room/RoomTypeService.cs +++ b/EOM.TSHotelManagement.Application/Business/Room/RoomTypeService.cs @@ -116,7 +116,7 @@ namespace EOM.TSHotelManagement.Application var source = EntityMapper.Map(roomtype); - return new SingleOutputDto { Source = source}; + return new SingleOutputDto { Source = source }; } #endregion @@ -150,7 +150,7 @@ namespace EOM.TSHotelManagement.Application } catch (Exception ex) { - return new BaseOutputDto { Message = LocalizationHelper.GetLocalizedString(ex.Message,ex.Message), StatusCode = StatusCodeConstants.InternalServerError }; + return new BaseOutputDto { Message = LocalizationHelper.GetLocalizedString(ex.Message, ex.Message), StatusCode = StatusCodeConstants.InternalServerError }; } return new BaseOutputDto(); } diff --git a/EOM.TSHotelManagement.Application/Business/Sellthing/SellService.cs b/EOM.TSHotelManagement.Application/Business/Sellthing/SellService.cs index 9fa9639..855ce9e 100644 --- a/EOM.TSHotelManagement.Application/Business/Sellthing/SellService.cs +++ b/EOM.TSHotelManagement.Application/Business/Sellthing/SellService.cs @@ -25,7 +25,6 @@ using EOM.TSHotelManagement.Common.Contract; using EOM.TSHotelManagement.Common.Core; using EOM.TSHotelManagement.Common.Util; using EOM.TSHotelManagement.EntityFramework; -using EOM.TSHotelManagement.Shared; using jvncorelib.EntityLib; using SqlSugar; @@ -253,7 +252,7 @@ namespace EOM.TSHotelManagement.Application SellThing sellThing = null; sellThing = sellThingRepository.GetSingle(a => a.ProductNumber == readSellThingInputDto.ProductNumber || (a.ProductName == readSellThingInputDto.ProductName && a.ProductPrice == Convert.ToDecimal(readSellThingInputDto.ProductPrice))); - + var source = EntityMapper.Map(sellThing); return new SingleOutputDto() { Source = source }; diff --git a/EOM.TSHotelManagement.Application/Business/Spend/ISpendService.cs b/EOM.TSHotelManagement.Application/Business/Spend/ISpendService.cs index d0faa26..3f4388d 100644 --- a/EOM.TSHotelManagement.Application/Business/Spend/ISpendService.cs +++ b/EOM.TSHotelManagement.Application/Business/Spend/ISpendService.cs @@ -22,7 +22,6 @@ * */ using EOM.TSHotelManagement.Common.Contract; -using EOM.TSHotelManagement.Common.Core; namespace EOM.TSHotelManagement.Application { diff --git a/EOM.TSHotelManagement.Application/Business/Spend/SpendService.cs b/EOM.TSHotelManagement.Application/Business/Spend/SpendService.cs index 2de96c5..8142dad 100644 --- a/EOM.TSHotelManagement.Application/Business/Spend/SpendService.cs +++ b/EOM.TSHotelManagement.Application/Business/Spend/SpendService.cs @@ -21,12 +21,12 @@ *SOFTWARE. * */ +using EOM.TSHotelManagement.Common.Contract; using EOM.TSHotelManagement.Common.Core; +using EOM.TSHotelManagement.Common.Util; using EOM.TSHotelManagement.EntityFramework; -using jvncorelib.EntityLib; using EOM.TSHotelManagement.Shared; -using EOM.TSHotelManagement.Common.Contract; -using EOM.TSHotelManagement.Common.Util; +using jvncorelib.EntityLib; using SqlSugar; namespace EOM.TSHotelManagement.Application @@ -67,7 +67,7 @@ namespace EOM.TSHotelManagement.Application { try { - spendRepository.Insert(EntityMapper.Map(s)); + spendRepository.Insert(EntityMapper.Map(s)); } catch (Exception ex) { diff --git a/EOM.TSHotelManagement.Application/Employee/Check/EmployeeCheckService.cs b/EOM.TSHotelManagement.Application/Employee/Check/EmployeeCheckService.cs index 00a02a6..5624b21 100644 --- a/EOM.TSHotelManagement.Application/Employee/Check/EmployeeCheckService.cs +++ b/EOM.TSHotelManagement.Application/Employee/Check/EmployeeCheckService.cs @@ -146,7 +146,7 @@ namespace EOM.TSHotelManagement.Application { return new SingleOutputDto { StatusCode = StatusCodeConstants.InternalServerError, Message = LocalizationHelper.GetLocalizedString($"Error:\n{ex.Message}", $"错误:\n{ex.Message}") }; } - return new SingleOutputDto { Source = new ReadEmployeeCheckOutputDto { IsChecked = isChecked} }; + return new SingleOutputDto { Source = new ReadEmployeeCheckOutputDto { IsChecked = isChecked } }; } /// diff --git a/EOM.TSHotelManagement.Application/Employee/Check/IEmployeeCheckService.cs b/EOM.TSHotelManagement.Application/Employee/Check/IEmployeeCheckService.cs index f030099..e852513 100644 --- a/EOM.TSHotelManagement.Application/Employee/Check/IEmployeeCheckService.cs +++ b/EOM.TSHotelManagement.Application/Employee/Check/IEmployeeCheckService.cs @@ -22,7 +22,6 @@ * */ using EOM.TSHotelManagement.Common.Contract; -using EOM.TSHotelManagement.Common.Core; namespace EOM.TSHotelManagement.Application { diff --git a/EOM.TSHotelManagement.Application/Employee/EmployeeService.cs b/EOM.TSHotelManagement.Application/Employee/EmployeeService.cs index d9b389c..63debef 100644 --- a/EOM.TSHotelManagement.Application/Employee/EmployeeService.cs +++ b/EOM.TSHotelManagement.Application/Employee/EmployeeService.cs @@ -21,24 +21,17 @@ *SOFTWARE. * */ -using EOM.TSHotelManagement.Common; using EOM.TSHotelManagement.Common.Contract; using EOM.TSHotelManagement.Common.Core; using EOM.TSHotelManagement.Common.Util; using EOM.TSHotelManagement.EntityFramework; using EOM.TSHotelManagement.Shared; -using jvncorelib.EncryptorLib; using jvncorelib.EntityLib; -using jvncorelib.CodeLib; using Microsoft.AspNetCore.DataProtection; -using Microsoft.IdentityModel.Tokens; using SqlSugar; -using SqlSugar.DistributedSystem.Snowflake; using System.ComponentModel; -using System.IdentityModel.Tokens.Jwt; using System.Reflection; using System.Security.Claims; -using System.Text; namespace EOM.TSHotelManagement.Application { @@ -57,7 +50,7 @@ namespace EOM.TSHotelManagement.Application /// /// /// - public class EmployeeService(GenericRepository workerRepository, GenericRepository educationRepository, GenericRepository nationRepository, GenericRepository deptRepository, GenericRepository positionRepository, GenericRepository passportTypeRepository, IDataProtectionProvider dataProtectionProvider, JWTHelper jWTHelper,MailHelper mailHelper) : IEmployeeService + public class EmployeeService(GenericRepository workerRepository, GenericRepository educationRepository, GenericRepository nationRepository, GenericRepository deptRepository, GenericRepository positionRepository, GenericRepository passportTypeRepository, IDataProtectionProvider dataProtectionProvider, JWTHelper jWTHelper, MailHelper mailHelper) : IEmployeeService { /// /// 员工信息 @@ -310,7 +303,7 @@ namespace EOM.TSHotelManagement.Application var listSource = EntityMapper.MapList(employees); - return new ListOutputDto { listSource = listSource,total = count }; + return new ListOutputDto { listSource = listSource, total = count }; } /// @@ -372,7 +365,7 @@ namespace EOM.TSHotelManagement.Application var source = EntityMapper.Map(w); - return new SingleOutputDto { Source = source}; + return new SingleOutputDto { Source = source }; } /// @@ -405,7 +398,7 @@ namespace EOM.TSHotelManagement.Application if (dbPwd != readEmployeeInputDto.Password) { w = null; - return new SingleOutputDto { Source = EntityMapper.Map(w) }; + return new SingleOutputDto { Source = EntityMapper.Map(w) }; } w.Password = ""; //性别类型 @@ -470,11 +463,15 @@ namespace EOM.TSHotelManagement.Application if (employeeMailAddress.IsNullOrEmpty()) { - return new BaseOutputDto() { Message = LocalizationHelper.GetLocalizedString("No bound email address was found for the employee. Password reset cannot be completed." - , "未找到员工绑定的电子邮箱，无法重置密码。"),StatusCode = StatusCodeConstants.InternalServerError}; + return new BaseOutputDto() + { + Message = LocalizationHelper.GetLocalizedString("No bound email address was found for the employee. Password reset cannot be completed." + , "未找到员工绑定的电子邮箱，无法重置密码。"), + StatusCode = StatusCodeConstants.InternalServerError + }; } - var Subject = LocalizationHelper.GetLocalizedString("Reset Password Notice","重置密码通知"); + var Subject = LocalizationHelper.GetLocalizedString("Reset Password Notice", "重置密码通知"); var Body = $@"

{LocalizationHelper.GetLocalizedString("Dear User,", "尊敬的用户：")}

{LocalizationHelper.GetLocalizedString( $"Your password was reset at {DateTime.Now:yyyy/MM/dd}. New password:", diff --git a/EOM.TSHotelManagement.Application/Employee/IEmployeeService.cs b/EOM.TSHotelManagement.Application/Employee/IEmployeeService.cs index 5b6c797..f819c25 100644 --- a/EOM.TSHotelManagement.Application/Employee/IEmployeeService.cs +++ b/EOM.TSHotelManagement.Application/Employee/IEmployeeService.cs @@ -22,7 +22,6 @@ * */ using EOM.TSHotelManagement.Common.Contract; -using EOM.TSHotelManagement.Common.Core; namespace EOM.TSHotelManagement.Application { diff --git a/EOM.TSHotelManagement.Application/Employee/Photo/EmployeePhotoService.cs b/EOM.TSHotelManagement.Application/Employee/Photo/EmployeePhotoService.cs index 63f15a3..f75c0e2 100644 --- a/EOM.TSHotelManagement.Application/Employee/Photo/EmployeePhotoService.cs +++ b/EOM.TSHotelManagement.Application/Employee/Photo/EmployeePhotoService.cs @@ -2,10 +2,8 @@ using EOM.TSHotelManagement.Common.Core; using EOM.TSHotelManagement.Common.Util; using EOM.TSHotelManagement.EntityFramework; -using jvncorelib.EncryptorLib; using jvncorelib.EntityLib; using Microsoft.AspNetCore.Http; -using System.Drawing; namespace EOM.TSHotelManagement.Application { @@ -76,7 +74,7 @@ namespace EOM.TSHotelManagement.Application { if (file == null || file.Length == 0) { - return new SingleOutputDto { Message = LocalizationHelper.GetLocalizedString("File cannot null","文件不能为空"), StatusCode = StatusCodeConstants.BadRequest }; + return new SingleOutputDto { Message = LocalizationHelper.GetLocalizedString("File cannot null", "文件不能为空"), StatusCode = StatusCodeConstants.BadRequest }; } if (file.Length > 1048576) @@ -87,7 +85,7 @@ namespace EOM.TSHotelManagement.Application StatusCode = StatusCodeConstants.BadRequest }; } - if (file.ContentType != "image/jpeg" && file.ContentType != "image/png") + if (file.ContentType != "image/jpeg" && file.ContentType != "image/png") { return new SingleOutputDto { diff --git a/EOM.TSHotelManagement.Application/Employee/Photo/IEmployeePhotoService.cs b/EOM.TSHotelManagement.Application/Employee/Photo/IEmployeePhotoService.cs index c6dc8b0..c521cfc 100644 --- a/EOM.TSHotelManagement.Application/Employee/Photo/IEmployeePhotoService.cs +++ b/EOM.TSHotelManagement.Application/Employee/Photo/IEmployeePhotoService.cs @@ -1,6 +1,5 @@ using EOM.TSHotelManagement.Common.Contract; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Internal; namespace EOM.TSHotelManagement.Application { @@ -21,7 +20,7 @@ namespace EOM.TSHotelManagement.Application /// /// /// - SingleOutputDto InsertWorkerPhoto(CreateEmployeePhotoInputDto createEmployeePhotoInputDto,IFormFile formFile); + SingleOutputDto InsertWorkerPhoto(CreateEmployeePhotoInputDto createEmployeePhotoInputDto, IFormFile formFile); ///

/// 删除员工照片 /// diff --git a/EOM.TSHotelManagement.Application/Sys/NavBar/INavBarService.cs b/EOM.TSHotelManagement.Application/Sys/NavBar/INavBarService.cs index f3c95ef..8bb4838 100644 --- a/EOM.TSHotelManagement.Application/Sys/NavBar/INavBarService.cs +++ b/EOM.TSHotelManagement.Application/Sys/NavBar/INavBarService.cs @@ -1,5 +1,4 @@ using EOM.TSHotelManagement.Common.Contract; -using EOM.TSHotelManagement.Common.Core; namespace EOM.TSHotelManagement.Application { diff --git a/EOM.TSHotelManagement.Application/SystemManagement/Administrator/AdminService.cs b/EOM.TSHotelManagement.Application/SystemManagement/Administrator/AdminService.cs index 7521d1c..ff6e9b2 100644 --- a/EOM.TSHotelManagement.Application/SystemManagement/Administrator/AdminService.cs +++ b/EOM.TSHotelManagement.Application/SystemManagement/Administrator/AdminService.cs @@ -25,16 +25,11 @@ using EOM.TSHotelManagement.Common.Contract; using EOM.TSHotelManagement.Common.Core; using EOM.TSHotelManagement.Common.Util; using EOM.TSHotelManagement.EntityFramework; -using EOM.TSHotelManagement.Shared; using jvncorelib.EncryptorLib; using jvncorelib.EntityLib; using Microsoft.AspNetCore.DataProtection; -using Microsoft.IdentityModel.Tokens; using SqlSugar; -using System.ComponentModel; -using System.IdentityModel.Tokens.Jwt; using System.Security.Claims; -using System.Text; namespace EOM.TSHotelManagement.Application { diff --git a/EOM.TSHotelManagement.Application/SystemManagement/Base/BaseService.cs b/EOM.TSHotelManagement.Application/SystemManagement/Base/BaseService.cs index ddec7a0..062d087 100644 --- a/EOM.TSHotelManagement.Application/SystemManagement/Base/BaseService.cs +++ b/EOM.TSHotelManagement.Application/SystemManagement/Base/BaseService.cs @@ -21,18 +21,13 @@ *SOFTWARE. * */ -using EOM.TSHotelManagement.Common; using EOM.TSHotelManagement.Common.Contract; using EOM.TSHotelManagement.Common.Core; using EOM.TSHotelManagement.Common.Util; using EOM.TSHotelManagement.EntityFramework; using EOM.TSHotelManagement.Shared; using jvncorelib.EntityLib; -using Microsoft.Extensions.Options; using SqlSugar; -using System; -using System.ComponentModel; -using System.Reflection; namespace EOM.TSHotelManagement.Application { diff --git a/EOM.TSHotelManagement.Application/SystemManagement/Base/IBaseService.cs b/EOM.TSHotelManagement.Application/SystemManagement/Base/IBaseService.cs index 6067d96..3ee2485 100644 --- a/EOM.TSHotelManagement.Application/SystemManagement/Base/IBaseService.cs +++ b/EOM.TSHotelManagement.Application/SystemManagement/Base/IBaseService.cs @@ -21,9 +21,7 @@ *SOFTWARE. * */ -using EOM.TSHotelManagement.Common; using EOM.TSHotelManagement.Common.Contract; -using EOM.TSHotelManagement.Common.Core; namespace EOM.TSHotelManagement.Application { diff --git a/EOM.TSHotelManagement.Application/SystemManagement/Notice/INoticeService.cs b/EOM.TSHotelManagement.Application/SystemManagement/Notice/INoticeService.cs index c38abc0..4b374c2 100644 --- a/EOM.TSHotelManagement.Application/SystemManagement/Notice/INoticeService.cs +++ b/EOM.TSHotelManagement.Application/SystemManagement/Notice/INoticeService.cs @@ -22,7 +22,6 @@ * */ using EOM.TSHotelManagement.Common.Contract; -using EOM.TSHotelManagement.Common.Core; namespace EOM.TSHotelManagement.Application { diff --git a/EOM.TSHotelManagement.Application/SystemManagement/Role/IRoleAppService.cs b/EOM.TSHotelManagement.Application/SystemManagement/Role/IRoleAppService.cs index 57c84b2..cd24178 100644 --- a/EOM.TSHotelManagement.Application/SystemManagement/Role/IRoleAppService.cs +++ b/EOM.TSHotelManagement.Application/SystemManagement/Role/IRoleAppService.cs @@ -1,9 +1,4 @@ using EOM.TSHotelManagement.Common.Contract; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace EOM.TSHotelManagement.Application { diff --git a/EOM.TSHotelManagement.Application/SystemManagement/Role/RoleAppService.cs b/EOM.TSHotelManagement.Application/SystemManagement/Role/RoleAppService.cs index a1d8887..3c7a148 100644 --- a/EOM.TSHotelManagement.Application/SystemManagement/Role/RoleAppService.cs +++ b/EOM.TSHotelManagement.Application/SystemManagement/Role/RoleAppService.cs @@ -4,11 +4,6 @@ using EOM.TSHotelManagement.Common.Util; using EOM.TSHotelManagement.EntityFramework; using jvncorelib.EntityLib; using SqlSugar; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace EOM.TSHotelManagement.Application { @@ -41,7 +36,7 @@ namespace EOM.TSHotelManagement.Application { try { - roleRepository.Delete(EntityMapper.Map(deleteRoleInputDto)); + roleRepository.Delete(EntityMapper.Map(deleteRoleInputDto)); } catch (Exception) { diff --git a/EOM.TSHotelManagement.Application/SystemManagement/SupervisionStatistics/ISupervisionStatisticsService.cs b/EOM.TSHotelManagement.Application/SystemManagement/SupervisionStatistics/ISupervisionStatisticsService.cs index 1b8c02f..85bc35e 100644 --- a/EOM.TSHotelManagement.Application/SystemManagement/SupervisionStatistics/ISupervisionStatisticsService.cs +++ b/EOM.TSHotelManagement.Application/SystemManagement/SupervisionStatistics/ISupervisionStatisticsService.cs @@ -22,7 +22,6 @@ * */ using EOM.TSHotelManagement.Common.Contract; -using EOM.TSHotelManagement.Common.Core; namespace EOM.TSHotelManagement.Application { diff --git a/EOM.TSHotelManagement.Application/SystemManagement/VipRule/IVipRuleAppService.cs b/EOM.TSHotelManagement.Application/SystemManagement/VipRule/IVipRuleAppService.cs index 96deb61..be70198 100644 --- a/EOM.TSHotelManagement.Application/SystemManagement/VipRule/IVipRuleAppService.cs +++ b/EOM.TSHotelManagement.Application/SystemManagement/VipRule/IVipRuleAppService.cs @@ -23,7 +23,6 @@ *模块说明：会员等级规则功能模块接口 */ using EOM.TSHotelManagement.Common.Contract; -using EOM.TSHotelManagement.Common.Core; namespace EOM.TSHotelManagement.Application { diff --git a/EOM.TSHotelManagement.Application/Util/IUtilService.cs b/EOM.TSHotelManagement.Application/Util/IUtilService.cs index c6e79a7..5b67667 100644 --- a/EOM.TSHotelManagement.Application/Util/IUtilService.cs +++ b/EOM.TSHotelManagement.Application/Util/IUtilService.cs @@ -1,5 +1,4 @@ using EOM.TSHotelManagement.Common.Contract; -using EOM.TSHotelManagement.Common.Core; namespace EOM.TSHotelManagement.Application { diff --git a/EOM.TSHotelManagement.Application/Util/UtilService.cs b/EOM.TSHotelManagement.Application/Util/UtilService.cs index 522a2c5..2a393ea 100644 --- a/EOM.TSHotelManagement.Application/Util/UtilService.cs +++ b/EOM.TSHotelManagement.Application/Util/UtilService.cs @@ -63,7 +63,7 @@ namespace EOM.TSHotelManagement.Application /// public ReadApplicationVersionOutputDto CheckBaseVersion() { - var source = EntityMapper.Map(applicationRepository.GetSingle(a => a.ApplicationVersionId == 1)); + var source = EntityMapper.Map(applicationRepository.GetSingle(a => a.ApplicationVersionId == 1)); return source; } @@ -77,7 +77,7 @@ namespace EOM.TSHotelManagement.Application { try { - operationLogRepository.Insert(EntityMapper.Map(opr)); + operationLogRepository.Insert(EntityMapper.Map(opr)); } catch (Exception ex) { @@ -120,7 +120,7 @@ namespace EOM.TSHotelManagement.Application operationLogs.ForEach(source => { - source.LogLevelName = source.LogLevel == LogLevel.Normal ? LocalizationHelper.GetLocalizedString("INFO","常规操作") : source.LogLevel == LogLevel.Warning ? LocalizationHelper.GetLocalizedString("WARNING","敏感操作") : LocalizationHelper.GetLocalizedString("ERROR","严重操作"); + source.LogLevelName = source.LogLevel == LogLevel.Normal ? LocalizationHelper.GetLocalizedString("INFO", "常规操作") : source.LogLevel == LogLevel.Warning ? LocalizationHelper.GetLocalizedString("WARNING", "敏感操作") : LocalizationHelper.GetLocalizedString("ERROR", "严重操作"); }); var listSource = EntityMapper.MapList(operationLogs); diff --git a/EOM.TSHotelManagement.Common.Contract/BaseDto/BaseDto.cs b/EOM.TSHotelManagement.Common.Contract/BaseDto/BaseDto.cs index d1afb15..ee5b8c2 100644 --- a/EOM.TSHotelManagement.Common.Contract/BaseDto/BaseDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/BaseDto/BaseDto.cs @@ -1,6 +1,4 @@ -using System; - -namespace EOM.TSHotelManagement.Common.Contract +namespace EOM.TSHotelManagement.Common.Contract { public class BaseDto { diff --git a/EOM.TSHotelManagement.Common.Contract/BaseDto/BaseInputDto.cs b/EOM.TSHotelManagement.Common.Contract/BaseDto/BaseInputDto.cs index ff04582..fea47ad 100644 --- a/EOM.TSHotelManagement.Common.Contract/BaseDto/BaseInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/BaseDto/BaseInputDto.cs @@ -1,12 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace EOM.TSHotelManagement.Common.Contract +namespace EOM.TSHotelManagement.Common.Contract { - public class BaseInputDto: BaseDto + public class BaseInputDto : BaseDto { public int Id { get; set; } /// diff --git a/EOM.TSHotelManagement.Common.Contract/BaseDto/BaseOutputDto.cs b/EOM.TSHotelManagement.Common.Contract/BaseDto/BaseOutputDto.cs index 7d1a380..be52c5c 100644 --- a/EOM.TSHotelManagement.Common.Contract/BaseDto/BaseOutputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/BaseDto/BaseOutputDto.cs @@ -1,9 +1,4 @@ using EOM.TSHotelManagement.Common.Util; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace EOM.TSHotelManagement.Common.Contract { @@ -17,7 +12,7 @@ namespace EOM.TSHotelManagement.Common.Contract /// /// 返回消息，用于描述请求结果 /// - public string Message { get; set; } = LocalizationHelper.GetLocalizedString("Success","成功"); + public string Message { get; set; } = LocalizationHelper.GetLocalizedString("Success", "成功"); /// /// diff --git a/EOM.TSHotelManagement.Common.Contract/BaseDto/ListInputDto.cs b/EOM.TSHotelManagement.Common.Contract/BaseDto/ListInputDto.cs index 7fb4d65..b535ed3 100644 --- a/EOM.TSHotelManagement.Common.Contract/BaseDto/ListInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/BaseDto/ListInputDto.cs @@ -1,12 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace EOM.TSHotelManagement.Common.Contract +namespace EOM.TSHotelManagement.Common.Contract { - public class ListInputDto:BaseInputDto + public class ListInputDto : BaseInputDto { /// /// 页数 diff --git a/EOM.TSHotelManagement.Common.Contract/BaseDto/ListOutputDto.cs b/EOM.TSHotelManagement.Common.Contract/BaseDto/ListOutputDto.cs index 28f017b..4455a60 100644 --- a/EOM.TSHotelManagement.Common.Contract/BaseDto/ListOutputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/BaseDto/ListOutputDto.cs @@ -21,8 +21,6 @@ *SOFTWARE. * */ -using System.Collections.Generic; - namespace EOM.TSHotelManagement.Common.Contract { /// diff --git a/EOM.TSHotelManagement.Common.Contract/BaseDto/SingleOutputDto.cs b/EOM.TSHotelManagement.Common.Contract/BaseDto/SingleOutputDto.cs index fa49ea7..ce2acaa 100644 --- a/EOM.TSHotelManagement.Common.Contract/BaseDto/SingleOutputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/BaseDto/SingleOutputDto.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace EOM.TSHotelManagement.Common.Contract +namespace EOM.TSHotelManagement.Common.Contract { public class SingleOutputDto : BaseOutputDto { diff --git a/EOM.TSHotelManagement.Common.Contract/BaseDto/StatusCodeConstants.cs b/EOM.TSHotelManagement.Common.Contract/BaseDto/StatusCodeConstants.cs index 0310ee8..8357e27 100644 --- a/EOM.TSHotelManagement.Common.Contract/BaseDto/StatusCodeConstants.cs +++ b/EOM.TSHotelManagement.Common.Contract/BaseDto/StatusCodeConstants.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace EOM.TSHotelManagement.Common.Contract +namespace EOM.TSHotelManagement.Common.Contract { public static class StatusCodeConstants { diff --git a/EOM.TSHotelManagement.Common.Contract/Business/Asset/Dto/Asset/CreateAssetInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Business/Asset/Dto/Asset/CreateAssetInputDto.cs index 18ad7f1..bd654d1 100644 --- a/EOM.TSHotelManagement.Common.Contract/Business/Asset/Dto/Asset/CreateAssetInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Business/Asset/Dto/Asset/CreateAssetInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class CreateAssetInputDto:BaseInputDto + public class CreateAssetInputDto : BaseInputDto { public string AssetNumber { get; set; } public string AssetName { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Business/Asset/Dto/Asset/DeleteAssetInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Business/Asset/Dto/Asset/DeleteAssetInputDto.cs index 9bd786c..f9a7b9c 100644 --- a/EOM.TSHotelManagement.Common.Contract/Business/Asset/Dto/Asset/DeleteAssetInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Business/Asset/Dto/Asset/DeleteAssetInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class DeleteAssetInputDto: BaseInputDto + public class DeleteAssetInputDto : BaseInputDto { public string AssetNumber { get; set; } } diff --git a/EOM.TSHotelManagement.Common.Contract/Business/Asset/Dto/Asset/ReadAssetInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Business/Asset/Dto/Asset/ReadAssetInputDto.cs index cf8ffc9..2d3c6f1 100644 --- a/EOM.TSHotelManagement.Common.Contract/Business/Asset/Dto/Asset/ReadAssetInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Business/Asset/Dto/Asset/ReadAssetInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class ReadAssetInputDto: ListInputDto + public class ReadAssetInputDto : ListInputDto { public string AssetNumber { get; set; } } diff --git a/EOM.TSHotelManagement.Common.Contract/Business/Asset/Dto/Asset/UpdateAssetInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Business/Asset/Dto/Asset/UpdateAssetInputDto.cs index 55b8f9d..bfa40d9 100644 --- a/EOM.TSHotelManagement.Common.Contract/Business/Asset/Dto/Asset/UpdateAssetInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Business/Asset/Dto/Asset/UpdateAssetInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class UpdateAssetInputDto: BaseInputDto + public class UpdateAssetInputDto : BaseInputDto { public string AssetNumber { get; set; } public string AssetName { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/CustoType/CreateCustoTypeInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/CustoType/CreateCustoTypeInputDto.cs index 18d3b31..49ca22c 100644 --- a/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/CustoType/CreateCustoTypeInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/CustoType/CreateCustoTypeInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class CreateCustoTypeInputDto: BaseInputDto + public class CreateCustoTypeInputDto : BaseInputDto { /// /// ͻ (Customer Type) diff --git a/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/CustoType/DeleteCustoTypeInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/CustoType/DeleteCustoTypeInputDto.cs index 3eed652..34e834c 100644 --- a/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/CustoType/DeleteCustoTypeInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/CustoType/DeleteCustoTypeInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class DeleteCustoTypeInputDto: BaseInputDto + public class DeleteCustoTypeInputDto : BaseInputDto { public int CustomerType { get; set; } } diff --git a/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/CustoType/ReadCustoTypeInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/CustoType/ReadCustoTypeInputDto.cs index a51fad3..5fd5575 100644 --- a/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/CustoType/ReadCustoTypeInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/CustoType/ReadCustoTypeInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class ReadCustoTypeInputDto:ListInputDto + public class ReadCustoTypeInputDto : ListInputDto { public int CustomerType { get; set; } } diff --git a/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/CustoType/UpdateCustoTypeInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/CustoType/UpdateCustoTypeInputDto.cs index 41caac0..4420fec 100644 --- a/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/CustoType/UpdateCustoTypeInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/CustoType/UpdateCustoTypeInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class UpdateCustoTypeInputDto: BaseInputDto + public class UpdateCustoTypeInputDto : BaseInputDto { public int CustomerType { get; set; } public string CustomerTypeName { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/Customer/CreateCustomerInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/Customer/CreateCustomerInputDto.cs index ca56c28..992a607 100644 --- a/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/Customer/CreateCustomerInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/Customer/CreateCustomerInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class CreateCustomerInputDto:BaseInputDto + public class CreateCustomerInputDto : BaseInputDto { public string CustomerNumber { get; set; } public string CustomerName { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/Customer/DeleteCustomerInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/Customer/DeleteCustomerInputDto.cs index c78cf70..e0f07b4 100644 --- a/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/Customer/DeleteCustomerInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/Customer/DeleteCustomerInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class DeleteCustomerInputDto:BaseInputDto + public class DeleteCustomerInputDto : BaseInputDto { public string CustomerNumber { get; set; } } diff --git a/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/Customer/ReadCustomerInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/Customer/ReadCustomerInputDto.cs index b22fe56..ccbba1c 100644 --- a/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/Customer/ReadCustomerInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/Customer/ReadCustomerInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class ReadCustomerInputDto:ListInputDto + public class ReadCustomerInputDto : ListInputDto { public string CustomerName { get; set; } public string CustomerNumber { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/Customer/UpdateCustomerInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/Customer/UpdateCustomerInputDto.cs index c87a5da..f733cc7 100644 --- a/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/Customer/UpdateCustomerInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/Customer/UpdateCustomerInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class UpdateCustomerInputDto: BaseInputDto + public class UpdateCustomerInputDto : BaseInputDto { public string CustomerNumber { get; set; } public string CustomerName { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/GenderType/CreateGenderTypeInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/GenderType/CreateGenderTypeInputDto.cs index 9315a2a..48a48a1 100644 --- a/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/GenderType/CreateGenderTypeInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/GenderType/CreateGenderTypeInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class CreateGenderTypeInputDto: BaseInputDto + public class CreateGenderTypeInputDto : BaseInputDto { public string GenderName { get; set; } } diff --git a/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/GenderType/DeleteGenderTypeInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/GenderType/DeleteGenderTypeInputDto.cs index 1805d1c..0f478a9 100644 --- a/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/GenderType/DeleteGenderTypeInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/GenderType/DeleteGenderTypeInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class DeleteGenderTypeInputDto: BaseInputDto + public class DeleteGenderTypeInputDto : BaseInputDto { public int GenderId { get; set; } } diff --git a/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/GenderType/ReadGenderTypeInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/GenderType/ReadGenderTypeInputDto.cs index ad8dfb5..9ad19ea 100644 --- a/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/GenderType/ReadGenderTypeInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/GenderType/ReadGenderTypeInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class ReadGenderTypeInputDto:ListInputDto + public class ReadGenderTypeInputDto : ListInputDto { public int GenderId { get; set; } public string GenderName { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/GenderType/UpdateGenderTypeInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/GenderType/UpdateGenderTypeInputDto.cs index eb173c9..fe5925f 100644 --- a/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/GenderType/UpdateGenderTypeInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/GenderType/UpdateGenderTypeInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class UpdateGenderTypeInputDto: BaseInputDto + public class UpdateGenderTypeInputDto : BaseInputDto { public int GenderId { get; set; } public string GenderName { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/PassportType/CreatePassportTypeInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/PassportType/CreatePassportTypeInputDto.cs index df95dd1..2c3bf67 100644 --- a/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/PassportType/CreatePassportTypeInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/PassportType/CreatePassportTypeInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class CreatePassportTypeInputDto: BaseInputDto + public class CreatePassportTypeInputDto : BaseInputDto { public int PassportId { get; set; } public string PassportName { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/PassportType/DeletePassportTypeInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/PassportType/DeletePassportTypeInputDto.cs index f62c6fd..bfe418b 100644 --- a/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/PassportType/DeletePassportTypeInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/PassportType/DeletePassportTypeInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class DeletePassportTypeInputDto: BaseInputDto + public class DeletePassportTypeInputDto : BaseInputDto { public int PassportId { get; set; } } diff --git a/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/PassportType/ReadPassportTypeInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/PassportType/ReadPassportTypeInputDto.cs index f10f8fd..6270796 100644 --- a/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/PassportType/ReadPassportTypeInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/PassportType/ReadPassportTypeInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class ReadPassportTypeInputDto:ListInputDto + public class ReadPassportTypeInputDto : ListInputDto { public int PassportId { get; set; } } diff --git a/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/PassportType/UpdatePassportTypeInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/PassportType/UpdatePassportTypeInputDto.cs index b027d5d..8783e48 100644 --- a/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/PassportType/UpdatePassportTypeInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Business/Customer/Dto/PassportType/UpdatePassportTypeInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class UpdatePassportTypeInputDto: BaseInputDto + public class UpdatePassportTypeInputDto : BaseInputDto { public int PassportId { get; set; } public string PassportName { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Business/EnergyManagement/Dto/DeleteEnergyManagementInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Business/EnergyManagement/Dto/DeleteEnergyManagementInputDto.cs index 85c2de8..ec8564d 100644 --- a/EOM.TSHotelManagement.Common.Contract/Business/EnergyManagement/Dto/DeleteEnergyManagementInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Business/EnergyManagement/Dto/DeleteEnergyManagementInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class DeleteEnergyManagementInputDto: BaseInputDto + public class DeleteEnergyManagementInputDto : BaseInputDto { public int InformationId { get; set; } } diff --git a/EOM.TSHotelManagement.Common.Contract/Business/EnergyManagement/Dto/ReadEnergyManagementInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Business/EnergyManagement/Dto/ReadEnergyManagementInputDto.cs index 0254587..fd4c952 100644 --- a/EOM.TSHotelManagement.Common.Contract/Business/EnergyManagement/Dto/ReadEnergyManagementInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Business/EnergyManagement/Dto/ReadEnergyManagementInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class ReadEnergyManagementInputDto:ListInputDto + public class ReadEnergyManagementInputDto : ListInputDto { public int InformationId { get; set; } public string RoomNo { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Business/EnergyManagement/Dto/UpdateEnergyManagementInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Business/EnergyManagement/Dto/UpdateEnergyManagementInputDto.cs index 171add6..c3750c6 100644 --- a/EOM.TSHotelManagement.Common.Contract/Business/EnergyManagement/Dto/UpdateEnergyManagementInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Business/EnergyManagement/Dto/UpdateEnergyManagementInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class UpdateEnergyManagementInputDto: BaseInputDto + public class UpdateEnergyManagementInputDto : BaseInputDto { public int InformationId { get; set; } public string RoomNumber { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Business/PromotionContent/Dto/CreatePromotionContentInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Business/PromotionContent/Dto/CreatePromotionContentInputDto.cs index f911e22..c4ab6e5 100644 --- a/EOM.TSHotelManagement.Common.Contract/Business/PromotionContent/Dto/CreatePromotionContentInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Business/PromotionContent/Dto/CreatePromotionContentInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class CreatePromotionContentInputDto: BaseInputDto + public class CreatePromotionContentInputDto : BaseInputDto { public string PromotionTitle { get; set; } public string PromotionContent { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Business/PromotionContent/Dto/DeletePromotionContentInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Business/PromotionContent/Dto/DeletePromotionContentInputDto.cs index 2a91259..91209fb 100644 --- a/EOM.TSHotelManagement.Common.Contract/Business/PromotionContent/Dto/DeletePromotionContentInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Business/PromotionContent/Dto/DeletePromotionContentInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class DeletePromotionContentInputDto: BaseInputDto + public class DeletePromotionContentInputDto : BaseInputDto { public int PromotionId { get; set; } } diff --git a/EOM.TSHotelManagement.Common.Contract/Business/PromotionContent/Dto/ReadPromotionContentInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Business/PromotionContent/Dto/ReadPromotionContentInputDto.cs index 8d89226..0ec70e0 100644 --- a/EOM.TSHotelManagement.Common.Contract/Business/PromotionContent/Dto/ReadPromotionContentInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Business/PromotionContent/Dto/ReadPromotionContentInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class ReadPromotionContentInputDto:ListInputDto + public class ReadPromotionContentInputDto : ListInputDto { public int PromotionId { get; set; } } diff --git a/EOM.TSHotelManagement.Common.Contract/Business/PromotionContent/Dto/UpdatePromotionContentInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Business/PromotionContent/Dto/UpdatePromotionContentInputDto.cs index 327a636..972d280 100644 --- a/EOM.TSHotelManagement.Common.Contract/Business/PromotionContent/Dto/UpdatePromotionContentInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Business/PromotionContent/Dto/UpdatePromotionContentInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class UpdatePromotionContentInputDto: BaseInputDto + public class UpdatePromotionContentInputDto : BaseInputDto { public int PromotionId { get; set; } public string PromotionTitle { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Business/Reser/Dto/CreateReserInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Business/Reser/Dto/CreateReserInputDto.cs index 9a78cbd..9bfa66b 100644 --- a/EOM.TSHotelManagement.Common.Contract/Business/Reser/Dto/CreateReserInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Business/Reser/Dto/CreateReserInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class CreateReserInputDto: BaseInputDto + public class CreateReserInputDto : BaseInputDto { public string ReservationId { get; set; } public string CustomerName { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Business/Reser/Dto/DeleteReserInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Business/Reser/Dto/DeleteReserInputDto.cs index 9e01050..43b7094 100644 --- a/EOM.TSHotelManagement.Common.Contract/Business/Reser/Dto/DeleteReserInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Business/Reser/Dto/DeleteReserInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class DeleteReserInputDto:BaseInputDto + public class DeleteReserInputDto : BaseInputDto { public string ReservationId { get; set; } } diff --git a/EOM.TSHotelManagement.Common.Contract/Business/Reser/Dto/ReadReserInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Business/Reser/Dto/ReadReserInputDto.cs index aed513f..c03af87 100644 --- a/EOM.TSHotelManagement.Common.Contract/Business/Reser/Dto/ReadReserInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Business/Reser/Dto/ReadReserInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class ReadReserInputDto:ListInputDto + public class ReadReserInputDto : ListInputDto { public string ReservationId { get; set; } public string CustomerName { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Business/Reser/Dto/UpdateReserInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Business/Reser/Dto/UpdateReserInputDto.cs index 92a2d7e..1566947 100644 --- a/EOM.TSHotelManagement.Common.Contract/Business/Reser/Dto/UpdateReserInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Business/Reser/Dto/UpdateReserInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class UpdateReserInputDto: BaseInputDto + public class UpdateReserInputDto : BaseInputDto { public string ReservationId { get; set; } public string CustomerName { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Business/Room/Dto/RoomState/CreateRoomStateInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Business/Room/Dto/RoomState/CreateRoomStateInputDto.cs index 67b3ef0..e0e9972 100644 --- a/EOM.TSHotelManagement.Common.Contract/Business/Room/Dto/RoomState/CreateRoomStateInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Business/Room/Dto/RoomState/CreateRoomStateInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class CreateRoomStateInputDto: BaseInputDto + public class CreateRoomStateInputDto : BaseInputDto { public string RoomStateName { get; set; } } diff --git a/EOM.TSHotelManagement.Common.Contract/Business/Room/Dto/RoomState/DeleteRoomStateInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Business/Room/Dto/RoomState/DeleteRoomStateInputDto.cs index 5d0d46f..c32cc97 100644 --- a/EOM.TSHotelManagement.Common.Contract/Business/Room/Dto/RoomState/DeleteRoomStateInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Business/Room/Dto/RoomState/DeleteRoomStateInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class DeleteRoomStateInputDto: BaseInputDto + public class DeleteRoomStateInputDto : BaseInputDto { public int RoomStateId { get; set; } } diff --git a/EOM.TSHotelManagement.Common.Contract/Business/Room/Dto/RoomState/ReadRoomStateInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Business/Room/Dto/RoomState/ReadRoomStateInputDto.cs index 0c192f5..85f2fb2 100644 --- a/EOM.TSHotelManagement.Common.Contract/Business/Room/Dto/RoomState/ReadRoomStateInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Business/Room/Dto/RoomState/ReadRoomStateInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class ReadRoomStateInputDto:ListInputDto + public class ReadRoomStateInputDto : ListInputDto { public int RoomStateId { get; set; } } diff --git a/EOM.TSHotelManagement.Common.Contract/Business/Room/Dto/RoomState/UpdateRoomStateInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Business/Room/Dto/RoomState/UpdateRoomStateInputDto.cs index a48eea3..b939ca6 100644 --- a/EOM.TSHotelManagement.Common.Contract/Business/Room/Dto/RoomState/UpdateRoomStateInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Business/Room/Dto/RoomState/UpdateRoomStateInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class UpdateRoomStateInputDto: BaseInputDto + public class UpdateRoomStateInputDto : BaseInputDto { public int RoomStateId { get; set; } public string RoomStateName { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Business/Room/Dto/RoomType/CreateRoomTypeInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Business/Room/Dto/RoomType/CreateRoomTypeInputDto.cs index 52d6783..013104f 100644 --- a/EOM.TSHotelManagement.Common.Contract/Business/Room/Dto/RoomType/CreateRoomTypeInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Business/Room/Dto/RoomType/CreateRoomTypeInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class CreateRoomTypeInputDto: BaseInputDto + public class CreateRoomTypeInputDto : BaseInputDto { public int RoomTypeId { get; set; } public string RoomTypeName { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Business/Room/Dto/RoomType/DeleteRoomTypeInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Business/Room/Dto/RoomType/DeleteRoomTypeInputDto.cs index 046819c..f872871 100644 --- a/EOM.TSHotelManagement.Common.Contract/Business/Room/Dto/RoomType/DeleteRoomTypeInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Business/Room/Dto/RoomType/DeleteRoomTypeInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class DeleteRoomTypeInputDto: BaseInputDto + public class DeleteRoomTypeInputDto : BaseInputDto { public int RoomTypeId { get; set; } } diff --git a/EOM.TSHotelManagement.Common.Contract/Business/Room/Dto/RoomType/ReadRoomTypeInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Business/Room/Dto/RoomType/ReadRoomTypeInputDto.cs index e7fc121..372e766 100644 --- a/EOM.TSHotelManagement.Common.Contract/Business/Room/Dto/RoomType/ReadRoomTypeInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Business/Room/Dto/RoomType/ReadRoomTypeInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class ReadRoomTypeInputDto:ListInputDto + public class ReadRoomTypeInputDto : ListInputDto { public string RoomNumber { get; set; } public int RoomTypeId { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Business/Room/Dto/RoomType/UpdateRoomTypeInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Business/Room/Dto/RoomType/UpdateRoomTypeInputDto.cs index 96165ce..8a69121 100644 --- a/EOM.TSHotelManagement.Common.Contract/Business/Room/Dto/RoomType/UpdateRoomTypeInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Business/Room/Dto/RoomType/UpdateRoomTypeInputDto.cs @@ -1,9 +1,6 @@ -using EOM.TSHotelManagement.Common.Util; -using SqlSugar; - namespace EOM.TSHotelManagement.Common.Contract { - public class UpdateRoomTypeInputDto: BaseInputDto + public class UpdateRoomTypeInputDto : BaseInputDto { public int RoomTypeId { get; set; } public string RoomTypeName { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Business/Sellthing/Dto/CreateSellThingInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Business/Sellthing/Dto/CreateSellThingInputDto.cs index 6ee8f74..5e08c59 100644 --- a/EOM.TSHotelManagement.Common.Contract/Business/Sellthing/Dto/CreateSellThingInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Business/Sellthing/Dto/CreateSellThingInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class CreateSellThingInputDto: BaseInputDto + public class CreateSellThingInputDto : BaseInputDto { public string ProductNumber { get; set; } public string ProductName { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Business/Sellthing/Dto/DeleteSellThingInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Business/Sellthing/Dto/DeleteSellThingInputDto.cs index dc47ed7..24b5e59 100644 --- a/EOM.TSHotelManagement.Common.Contract/Business/Sellthing/Dto/DeleteSellThingInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Business/Sellthing/Dto/DeleteSellThingInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class DeleteSellThingInputDto: BaseInputDto + public class DeleteSellThingInputDto : BaseInputDto { public string RoomNumber { get; set; } public string CustomerNumber { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Business/Sellthing/Dto/ReadSellThingInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Business/Sellthing/Dto/ReadSellThingInputDto.cs index 4d58b83..aee16ab 100644 --- a/EOM.TSHotelManagement.Common.Contract/Business/Sellthing/Dto/ReadSellThingInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Business/Sellthing/Dto/ReadSellThingInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class ReadSellThingInputDto:ListInputDto + public class ReadSellThingInputDto : ListInputDto { public string ProductNumber { get; set; } public string ProductName { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Business/Sellthing/Dto/UpdateSellThingInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Business/Sellthing/Dto/UpdateSellThingInputDto.cs index 6d824dd..35ec42a 100644 --- a/EOM.TSHotelManagement.Common.Contract/Business/Sellthing/Dto/UpdateSellThingInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Business/Sellthing/Dto/UpdateSellThingInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class UpdateSellThingInputDto: BaseInputDto + public class UpdateSellThingInputDto : BaseInputDto { public string ProductNumber { get; set; } public string ProductName { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Business/Spend/Dto/Spend/CreateSpendInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Business/Spend/Dto/Spend/CreateSpendInputDto.cs index 66a6913..ecaed44 100644 --- a/EOM.TSHotelManagement.Common.Contract/Business/Spend/Dto/Spend/CreateSpendInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Business/Spend/Dto/Spend/CreateSpendInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class CreateSpendInputDto: BaseInputDto + public class CreateSpendInputDto : BaseInputDto { public string SpendNumber { get; set; } public string RoomNumber { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Business/Spend/Dto/Spend/DeleteSpendInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Business/Spend/Dto/Spend/DeleteSpendInputDto.cs index adcf726..c283bbc 100644 --- a/EOM.TSHotelManagement.Common.Contract/Business/Spend/Dto/Spend/DeleteSpendInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Business/Spend/Dto/Spend/DeleteSpendInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class DeleteSpendInputDto: BaseInputDto + public class DeleteSpendInputDto : BaseInputDto { public string RoomNumber { get; set; } public string CustomerNumber { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Business/Spend/Dto/Spend/ReadSpendInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Business/Spend/Dto/Spend/ReadSpendInputDto.cs index cf392ea..d1c3e19 100644 --- a/EOM.TSHotelManagement.Common.Contract/Business/Spend/Dto/Spend/ReadSpendInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Business/Spend/Dto/Spend/ReadSpendInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class ReadSpendInputDto:ListInputDto + public class ReadSpendInputDto : ListInputDto { public string SpendNumber { get; set; } public string RoomNumber { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Business/Spend/Dto/Spend/ReadSpendOutputDto.cs b/EOM.TSHotelManagement.Common.Contract/Business/Spend/Dto/Spend/ReadSpendOutputDto.cs index 59f64f9..280038c 100644 --- a/EOM.TSHotelManagement.Common.Contract/Business/Spend/Dto/Spend/ReadSpendOutputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Business/Spend/Dto/Spend/ReadSpendOutputDto.cs @@ -10,7 +10,7 @@ namespace EOM.TSHotelManagement.Common.Contract public string RoomNumber { get; set; } [UIDisplay("ͻ")] public string CustomerNumber { get; set; } - [UIDisplay("Ʒ",false,false)] + [UIDisplay("Ʒ", false, false)] public string ProductNumber { get; set; } [UIDisplay("Ʒ")] public string ProductName { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Business/Spend/Dto/Spend/UpdateSpendInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Business/Spend/Dto/Spend/UpdateSpendInputDto.cs index a43b9ab..d8c6b40 100644 --- a/EOM.TSHotelManagement.Common.Contract/Business/Spend/Dto/Spend/UpdateSpendInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Business/Spend/Dto/Spend/UpdateSpendInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class UpdateSpendInputDto: BaseInputDto + public class UpdateSpendInputDto : BaseInputDto { public string SpendNumber { get; set; } public string RoomNumber { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Employee/Dto/Employee/CreateEmployeeInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Employee/Dto/Employee/CreateEmployeeInputDto.cs index 45a3ff3..629e964 100644 --- a/EOM.TSHotelManagement.Common.Contract/Employee/Dto/Employee/CreateEmployeeInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Employee/Dto/Employee/CreateEmployeeInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class CreateEmployeeInputDto: BaseInputDto + public class CreateEmployeeInputDto : BaseInputDto { public string EmployeeId { get; set; } public string EmployeeName { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Employee/Dto/Employee/DeleteEmployeeInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Employee/Dto/Employee/DeleteEmployeeInputDto.cs index 8e55f70..6734d23 100644 --- a/EOM.TSHotelManagement.Common.Contract/Employee/Dto/Employee/DeleteEmployeeInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Employee/Dto/Employee/DeleteEmployeeInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class DeleteEmployeeInputDto: BaseInputDto + public class DeleteEmployeeInputDto : BaseInputDto { public string EmployeeId { get; set; } } diff --git a/EOM.TSHotelManagement.Common.Contract/Employee/Dto/Employee/ReadEmployeeInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Employee/Dto/Employee/ReadEmployeeInputDto.cs index bc63002..bc10e79 100644 --- a/EOM.TSHotelManagement.Common.Contract/Employee/Dto/Employee/ReadEmployeeInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Employee/Dto/Employee/ReadEmployeeInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class ReadEmployeeInputDto:ListInputDto + public class ReadEmployeeInputDto : ListInputDto { public string EmployeeId { get; set; } public string EmployeeName { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Employee/Dto/Employee/ReadEmployeeOutputDto.cs b/EOM.TSHotelManagement.Common.Contract/Employee/Dto/Employee/ReadEmployeeOutputDto.cs index fcf1062..1b7972b 100644 --- a/EOM.TSHotelManagement.Common.Contract/Employee/Dto/Employee/ReadEmployeeOutputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Employee/Dto/Employee/ReadEmployeeOutputDto.cs @@ -1,7 +1,7 @@  namespace EOM.TSHotelManagement.Common.Contract { - public class ReadEmployeeOutputDto:BaseDto + public class ReadEmployeeOutputDto : BaseDto { public string EmployeeId { get; set; } public string EmployeeName { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Employee/Dto/Employee/UpdateEmployeeInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Employee/Dto/Employee/UpdateEmployeeInputDto.cs index 7c5bc98..c8d9b90 100644 --- a/EOM.TSHotelManagement.Common.Contract/Employee/Dto/Employee/UpdateEmployeeInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Employee/Dto/Employee/UpdateEmployeeInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class UpdateEmployeeInputDto: BaseInputDto + public class UpdateEmployeeInputDto : BaseInputDto { public string EmployeeId { get; set; } public string EmployeeName { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeeCheck/CreateEmployeeCheckInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeeCheck/CreateEmployeeCheckInputDto.cs index edb42b0..98cf3aa 100644 --- a/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeeCheck/CreateEmployeeCheckInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeeCheck/CreateEmployeeCheckInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class CreateEmployeeCheckInputDto: BaseInputDto + public class CreateEmployeeCheckInputDto : BaseInputDto { /// /// 򿨱 (Check-in/Check-out Number) diff --git a/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeeCheck/DeleteEmployeeCheckInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeeCheck/DeleteEmployeeCheckInputDto.cs index 86924e6..773f12d 100644 --- a/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeeCheck/DeleteEmployeeCheckInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeeCheck/DeleteEmployeeCheckInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class DeleteEmployeeCheckInputDto: BaseInputDto + public class DeleteEmployeeCheckInputDto : BaseInputDto { public int CheckId { get; set; } } diff --git a/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeeCheck/ReadEmployeeCheckInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeeCheck/ReadEmployeeCheckInputDto.cs index ac32f7e..83e9f6d 100644 --- a/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeeCheck/ReadEmployeeCheckInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeeCheck/ReadEmployeeCheckInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class ReadEmployeeCheckInputDto:ListInputDto + public class ReadEmployeeCheckInputDto : ListInputDto { public int CheckId { get; set; } public string EmployeeId { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeeCheck/UpdateEmployeeCheckInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeeCheck/UpdateEmployeeCheckInputDto.cs index 2ffb398..1f30efa 100644 --- a/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeeCheck/UpdateEmployeeCheckInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeeCheck/UpdateEmployeeCheckInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class UpdateEmployeeCheckInputDto: BaseInputDto + public class UpdateEmployeeCheckInputDto : BaseInputDto { public int CheckId { get; set; } public string EmployeeId { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeeHistory/CreateEmployeeHistoryInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeeHistory/CreateEmployeeHistoryInputDto.cs index d3e2aa6..cb5ff08 100644 --- a/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeeHistory/CreateEmployeeHistoryInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeeHistory/CreateEmployeeHistoryInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class CreateEmployeeHistoryInputDto: BaseInputDto + public class CreateEmployeeHistoryInputDto : BaseInputDto { public string EmployeeId { get; set; } public DateTime ChangeDate { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeeHistory/DeleteEmployeeHistoryInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeeHistory/DeleteEmployeeHistoryInputDto.cs index efe9170..7908c23 100644 --- a/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeeHistory/DeleteEmployeeHistoryInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeeHistory/DeleteEmployeeHistoryInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class DeleteEmployeeHistoryInputDto: BaseInputDto + public class DeleteEmployeeHistoryInputDto : BaseInputDto { public int HistoryId { get; set; } } diff --git a/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeeHistory/ReadEmployeeHistoryInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeeHistory/ReadEmployeeHistoryInputDto.cs index 85fb3d9..19921f5 100644 --- a/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeeHistory/ReadEmployeeHistoryInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeeHistory/ReadEmployeeHistoryInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class ReadEmployeeHistoryInputDto:ListInputDto + public class ReadEmployeeHistoryInputDto : ListInputDto { public int HistoryId { get; set; } public string EmployeeId { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeeHistory/UpdateEmployeeHistoryInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeeHistory/UpdateEmployeeHistoryInputDto.cs index b8fb583..77d4349 100644 --- a/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeeHistory/UpdateEmployeeHistoryInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeeHistory/UpdateEmployeeHistoryInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class UpdateEmployeeHistoryInputDto: BaseInputDto + public class UpdateEmployeeHistoryInputDto : BaseInputDto { public int HistoryId { get; set; } public string EmployeeId { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeePhoto/CreateEmployeePhotoInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeePhoto/CreateEmployeePhotoInputDto.cs index c92e2b0..af0b543 100644 --- a/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeePhoto/CreateEmployeePhotoInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeePhoto/CreateEmployeePhotoInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class CreateEmployeePhotoInputDto: BaseInputDto + public class CreateEmployeePhotoInputDto : BaseInputDto { public string EmployeeId { get; set; } public string PhotoUrl { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeePhoto/DeleteEmployeePhotoInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeePhoto/DeleteEmployeePhotoInputDto.cs index 37c2545..4e888b1 100644 --- a/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeePhoto/DeleteEmployeePhotoInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeePhoto/DeleteEmployeePhotoInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class DeleteEmployeePhotoInputDto:ListInputDto + public class DeleteEmployeePhotoInputDto : ListInputDto { public int PhotoId { get; set; } public string EmployeeId { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeePhoto/ReadEmployeePhotoInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeePhoto/ReadEmployeePhotoInputDto.cs index d8a3823..2c799b3 100644 --- a/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeePhoto/ReadEmployeePhotoInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeePhoto/ReadEmployeePhotoInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class ReadEmployeePhotoInputDto:ListInputDto + public class ReadEmployeePhotoInputDto : ListInputDto { public int PhotoId { get; set; } public string EmployeeId { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeePhoto/UpdateEmployeePhotoInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeePhoto/UpdateEmployeePhotoInputDto.cs index 63674ec..19999ff 100644 --- a/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeePhoto/UpdateEmployeePhotoInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeePhoto/UpdateEmployeePhotoInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class UpdateEmployeePhotoInputDto: BaseInputDto + public class UpdateEmployeePhotoInputDto : BaseInputDto { public int PhotoId { get; set; } public string EmployeeId { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeeRewardPunishment/CreateEmployeeRewardPunishmentInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeeRewardPunishment/CreateEmployeeRewardPunishmentInputDto.cs index f6142c2..0a4ad80 100644 --- a/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeeRewardPunishment/CreateEmployeeRewardPunishmentInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeeRewardPunishment/CreateEmployeeRewardPunishmentInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class CreateEmployeeRewardPunishmentInputDto: BaseInputDto + public class CreateEmployeeRewardPunishmentInputDto : BaseInputDto { public string EmployeeId { get; set; } public DateTime RewardPunishmentDate { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeeRewardPunishment/DeleteEmployeeRewardPunishmentInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeeRewardPunishment/DeleteEmployeeRewardPunishmentInputDto.cs index 3c2c937..7bcd361 100644 --- a/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeeRewardPunishment/DeleteEmployeeRewardPunishmentInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeeRewardPunishment/DeleteEmployeeRewardPunishmentInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class DeleteEmployeeRewardPunishmentInputDto: BaseInputDto + public class DeleteEmployeeRewardPunishmentInputDto : BaseInputDto { public int RewardPunishmentId { get; set; } } diff --git a/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeeRewardPunishment/ReadEmployeeRewardPunishmentInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeeRewardPunishment/ReadEmployeeRewardPunishmentInputDto.cs index 9a58abc..4cddcc6 100644 --- a/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeeRewardPunishment/ReadEmployeeRewardPunishmentInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeeRewardPunishment/ReadEmployeeRewardPunishmentInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class ReadEmployeeRewardPunishmentInputDto:ListInputDto + public class ReadEmployeeRewardPunishmentInputDto : ListInputDto { public int RewardPunishmentId { get; set; } public string EmployeeId { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeeRewardPunishment/UpdateEmployeeRewardPunishmentInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeeRewardPunishment/UpdateEmployeeRewardPunishmentInputDto.cs index 6300a4f..2b1426f 100644 --- a/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeeRewardPunishment/UpdateEmployeeRewardPunishmentInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Employee/Dto/EmployeeRewardPunishment/UpdateEmployeeRewardPunishmentInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class UpdateEmployeeRewardPunishmentInputDto: BaseInputDto + public class UpdateEmployeeRewardPunishmentInputDto : BaseInputDto { public int RewardPunishmentId { get; set; } public string EmployeeId { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Sys/NavBar/Dto/CreateNavBarInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Sys/NavBar/Dto/CreateNavBarInputDto.cs index ddf66db..8033167 100644 --- a/EOM.TSHotelManagement.Common.Contract/Sys/NavBar/Dto/CreateNavBarInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Sys/NavBar/Dto/CreateNavBarInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class CreateNavBarInputDto: BaseInputDto + public class CreateNavBarInputDto : BaseInputDto { public string NavigationBarName { get; set; } public int NavigationBarOrder { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Sys/NavBar/Dto/DeleteNavBarInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Sys/NavBar/Dto/DeleteNavBarInputDto.cs index d3fd5f9..2b38dfc 100644 --- a/EOM.TSHotelManagement.Common.Contract/Sys/NavBar/Dto/DeleteNavBarInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Sys/NavBar/Dto/DeleteNavBarInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class DeleteNavBarInputDto: BaseInputDto + public class DeleteNavBarInputDto : BaseInputDto { public int NavigationBarId { get; set; } } diff --git a/EOM.TSHotelManagement.Common.Contract/Sys/NavBar/Dto/ReadNavBarInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Sys/NavBar/Dto/ReadNavBarInputDto.cs index 2188ae5..ad486ee 100644 --- a/EOM.TSHotelManagement.Common.Contract/Sys/NavBar/Dto/ReadNavBarInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Sys/NavBar/Dto/ReadNavBarInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class ReadNavBarInputDto:ListInputDto + public class ReadNavBarInputDto : ListInputDto { public int NavigationBarId { get; set; } } diff --git a/EOM.TSHotelManagement.Common.Contract/Sys/NavBar/Dto/UpdateNavBarInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Sys/NavBar/Dto/UpdateNavBarInputDto.cs index 94ebad3..2b74d9d 100644 --- a/EOM.TSHotelManagement.Common.Contract/Sys/NavBar/Dto/UpdateNavBarInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Sys/NavBar/Dto/UpdateNavBarInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class UpdateNavBarInputDto: BaseInputDto + public class UpdateNavBarInputDto : BaseInputDto { public int NavigationBarId { get; set; } public string NavigationBarName { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Administrator/CreateAdministratorInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Administrator/CreateAdministratorInputDto.cs index 32821e2..0a25e3d 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Administrator/CreateAdministratorInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Administrator/CreateAdministratorInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class CreateAdministratorInputDto: BaseInputDto + public class CreateAdministratorInputDto : BaseInputDto { public string Number { get; set; } public string Account { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Administrator/DeleteAdministratorInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Administrator/DeleteAdministratorInputDto.cs index c95c66e..978f3d1 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Administrator/DeleteAdministratorInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Administrator/DeleteAdministratorInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class DeleteAdministratorInputDto: BaseInputDto + public class DeleteAdministratorInputDto : BaseInputDto { public string Number { get; set; } } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Administrator/ReadAdministratorInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Administrator/ReadAdministratorInputDto.cs index 99482d8..40bd550 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Administrator/ReadAdministratorInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Administrator/ReadAdministratorInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class ReadAdministratorInputDto:ListInputDto + public class ReadAdministratorInputDto : ListInputDto { public int Id { get; set; } public string Account { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Administrator/ReadAdministratorOutputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Administrator/ReadAdministratorOutputDto.cs index 4125a45..e85cf4c 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Administrator/ReadAdministratorOutputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Administrator/ReadAdministratorOutputDto.cs @@ -1,8 +1,6 @@ -using SqlSugar; - namespace EOM.TSHotelManagement.Common.Contract { - public class ReadAdministratorOutputDto:BaseDto + public class ReadAdministratorOutputDto : BaseDto { public string Number { get; set; } public string Account { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Administrator/UpdateAdministratorInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Administrator/UpdateAdministratorInputDto.cs index dad9a56..e0eb0ff 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Administrator/UpdateAdministratorInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Administrator/UpdateAdministratorInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class UpdateAdministratorInputDto: BaseInputDto + public class UpdateAdministratorInputDto : BaseInputDto { public string Number { get; set; } public string Account { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/AdministratorType/CreateAdministratorTypeInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/AdministratorType/CreateAdministratorTypeInputDto.cs index 7721184..7984fc3 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/AdministratorType/CreateAdministratorTypeInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/AdministratorType/CreateAdministratorTypeInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class CreateAdministratorTypeInputDto: BaseInputDto + public class CreateAdministratorTypeInputDto : BaseInputDto { public string TypeId { get; set; } public string TypeName { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/AdministratorType/DeleteAdministratorTypeInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/AdministratorType/DeleteAdministratorTypeInputDto.cs index 8242519..381cdc1 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/AdministratorType/DeleteAdministratorTypeInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/AdministratorType/DeleteAdministratorTypeInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class DeleteAdministratorTypeInputDto: BaseInputDto + public class DeleteAdministratorTypeInputDto : BaseInputDto { public int Id { get; set; } } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/AdministratorType/ReadAdministratorTypeInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/AdministratorType/ReadAdministratorTypeInputDto.cs index 28dd5e6..8c5413b 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/AdministratorType/ReadAdministratorTypeInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/AdministratorType/ReadAdministratorTypeInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class ReadAdministratorTypeInputDto:ListInputDto + public class ReadAdministratorTypeInputDto : ListInputDto { public int Id { get; set; } } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/AdministratorType/UpdateAdministratorTypeInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/AdministratorType/UpdateAdministratorTypeInputDto.cs index 0714a4d..bdbb5ff 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/AdministratorType/UpdateAdministratorTypeInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/AdministratorType/UpdateAdministratorTypeInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class UpdateAdministratorTypeInputDto: BaseInputDto + public class UpdateAdministratorTypeInputDto : BaseInputDto { public int Id { get; set; } public string TypeId { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/AppointmentNotice/CreateAppointmentNoticeInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/AppointmentNotice/CreateAppointmentNoticeInputDto.cs index fcfc952..a0fb2fd 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/AppointmentNotice/CreateAppointmentNoticeInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/AppointmentNotice/CreateAppointmentNoticeInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class CreateAppointmentNoticeInputDto: BaseInputDto + public class CreateAppointmentNoticeInputDto : BaseInputDto { public string NoticeId { get; set; } public string NoticeTheme { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/AppointmentNotice/DeleteAppointmentNoticeInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/AppointmentNotice/DeleteAppointmentNoticeInputDto.cs index 5eaafae..07d311e 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/AppointmentNotice/DeleteAppointmentNoticeInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/AppointmentNotice/DeleteAppointmentNoticeInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class DeleteAppointmentNoticeInputDto: BaseInputDto + public class DeleteAppointmentNoticeInputDto : BaseInputDto { public string NoticeId { get; set; } } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/AppointmentNotice/ReadAppointmentNoticeInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/AppointmentNotice/ReadAppointmentNoticeInputDto.cs index 90c995b..f523284 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/AppointmentNotice/ReadAppointmentNoticeInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/AppointmentNotice/ReadAppointmentNoticeInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class ReadAppointmentNoticeInputDto:ListInputDto + public class ReadAppointmentNoticeInputDto : ListInputDto { public string NoticeId { get; set; } public string NoticeTheme { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/AppointmentNotice/UpdateAppointmentNoticeInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/AppointmentNotice/UpdateAppointmentNoticeInputDto.cs index 930e121..e9d62cd 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/AppointmentNotice/UpdateAppointmentNoticeInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/AppointmentNotice/UpdateAppointmentNoticeInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class UpdateAppointmentNoticeInputDto: BaseInputDto + public class UpdateAppointmentNoticeInputDto : BaseInputDto { public string NoticeId { get; set; } public string NoticeTitle { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Department/CreateDepartmentInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Department/CreateDepartmentInputDto.cs index e3faadf..d7137b4 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Department/CreateDepartmentInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Department/CreateDepartmentInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class CreateDepartmentInputDto: BaseInputDto + public class CreateDepartmentInputDto : BaseInputDto { public int Id { get; set; } public string DepartmentNumber { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Department/DeleteDepartmentInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Department/DeleteDepartmentInputDto.cs index 8be620d..0f98c55 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Department/DeleteDepartmentInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Department/DeleteDepartmentInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class DeleteDepartmentInputDto: BaseInputDto + public class DeleteDepartmentInputDto : BaseInputDto { public int Id { get; set; } public string DepartmentNumber { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Department/ReadDepartmentInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Department/ReadDepartmentInputDto.cs index 5d773b3..165bc30 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Department/ReadDepartmentInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Department/ReadDepartmentInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class ReadDepartmentInputDto:ListInputDto + public class ReadDepartmentInputDto : ListInputDto { public int Id { get; set; } public string DepartmentNumber { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Department/UpdateDepartmentInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Department/UpdateDepartmentInputDto.cs index 26d6f1e..599c29a 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Department/UpdateDepartmentInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Department/UpdateDepartmentInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class UpdateDepartmentInputDto: BaseInputDto + public class UpdateDepartmentInputDto : BaseInputDto { public int Id { get; set; } public string DepartmentNumber { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/EnumDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/EnumDto.cs index d40158b..25b7ae0 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/EnumDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/EnumDto.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace EOM.TSHotelManagement.Common.Contract +namespace EOM.TSHotelManagement.Common.Contract { public class EnumDto { diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Menu/CreateMenuInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Menu/CreateMenuInputDto.cs index 98fdefa..e212c54 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Menu/CreateMenuInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Menu/CreateMenuInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class CreateMenuInputDto: BaseInputDto + public class CreateMenuInputDto : BaseInputDto { public string Key { get; set; } public string Title { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Menu/DeleteMenuInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Menu/DeleteMenuInputDto.cs index cd22ae2..b235025 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Menu/DeleteMenuInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Menu/DeleteMenuInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class DeleteMenuInputDto: BaseInputDto + public class DeleteMenuInputDto : BaseInputDto { public string Key { get; set; } public string Title { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Menu/MenuViewModel.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Menu/MenuViewModel.cs index d5c5bb9..5ad6cff 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Menu/MenuViewModel.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Menu/MenuViewModel.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace EOM.TSHotelManagement.Common.Contract.Menu +namespace EOM.TSHotelManagement.Common.Contract.Menu { /// /// 菜单视图模型 (Menu View Model) diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Menu/ReadMenuInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Menu/ReadMenuInputDto.cs index 8b37af2..673e649 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Menu/ReadMenuInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Menu/ReadMenuInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class ReadMenuInputDto:ListInputDto + public class ReadMenuInputDto : ListInputDto { public int Id { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Menu/UpdateMenuInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Menu/UpdateMenuInputDto.cs index 839950e..bfb5dac 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Menu/UpdateMenuInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Menu/UpdateMenuInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class UpdateMenuInputDto: BaseInputDto + public class UpdateMenuInputDto : BaseInputDto { public string Key { get; set; } public string Title { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Module/CreateModuleInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Module/CreateModuleInputDto.cs index 634950e..a057872 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Module/CreateModuleInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Module/CreateModuleInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class CreateModuleInputDto: BaseInputDto + public class CreateModuleInputDto : BaseInputDto { public string ModuleName { get; set; } public string ModuleDescription { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Module/DeleteModuleInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Module/DeleteModuleInputDto.cs index a3e3381..6c7514d 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Module/DeleteModuleInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Module/DeleteModuleInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class DeleteModuleInputDto: BaseInputDto + public class DeleteModuleInputDto : BaseInputDto { public int ModuleId { get; set; } } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Module/ReadModuleInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Module/ReadModuleInputDto.cs index f96c696..023e4a6 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Module/ReadModuleInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Module/ReadModuleInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class ReadModuleInputDto:ListInputDto + public class ReadModuleInputDto : ListInputDto { public int ModuleId { get; set; } } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Module/UpdateModuleInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Module/UpdateModuleInputDto.cs index 1e69b29..8a7210a 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Module/UpdateModuleInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Module/UpdateModuleInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class UpdateModuleInputDto: BaseInputDto + public class UpdateModuleInputDto : BaseInputDto { public int ModuleId { get; set; } public string ModuleName { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/ModulePermission/CreateModulePermissionInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/ModulePermission/CreateModulePermissionInputDto.cs index 6798706..8e64ba6 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/ModulePermission/CreateModulePermissionInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/ModulePermission/CreateModulePermissionInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class CreateModulePermissionInputDto: BaseInputDto + public class CreateModulePermissionInputDto : BaseInputDto { public int ModuleId { get; set; } public string PermissionName { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/ModulePermission/DeleteModulePermissionInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/ModulePermission/DeleteModulePermissionInputDto.cs index 188e220..d43fc6f 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/ModulePermission/DeleteModulePermissionInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/ModulePermission/DeleteModulePermissionInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class DeleteModulePermissionInputDto: BaseInputDto + public class DeleteModulePermissionInputDto : BaseInputDto { public int PermissionId { get; set; } public string AdministratorAccount { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/ModulePermission/ReadModulePermissionInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/ModulePermission/ReadModulePermissionInputDto.cs index 3074989..81cb27f 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/ModulePermission/ReadModulePermissionInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/ModulePermission/ReadModulePermissionInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class ReadModulePermissionInputDto:ListInputDto + public class ReadModulePermissionInputDto : ListInputDto { public int PermissionId { get; set; } public string Account { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/ModulePermission/ReadModulePermissionOutputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/ModulePermission/ReadModulePermissionOutputDto.cs index 4e97fcc..99ea8ae 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/ModulePermission/ReadModulePermissionOutputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/ModulePermission/ReadModulePermissionOutputDto.cs @@ -1,5 +1,3 @@ -using SqlSugar; - namespace EOM.TSHotelManagement.Common.Contract { public class ReadModulePermissionOutputDto diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/ModulePermission/UpdateModulePermissionInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/ModulePermission/UpdateModulePermissionInputDto.cs index c306b90..439b75b 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/ModulePermission/UpdateModulePermissionInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/ModulePermission/UpdateModulePermissionInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class UpdateModulePermissionInputDto: BaseInputDto + public class UpdateModulePermissionInputDto : BaseInputDto { public int PermissionId { get; set; } public int ModuleId { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Nation/CreateNationInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Nation/CreateNationInputDto.cs index 1ff8441..5f67972 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Nation/CreateNationInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Nation/CreateNationInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class CreateNationInputDto: BaseInputDto + public class CreateNationInputDto : BaseInputDto { public string NationNumber { get; set; } public string NationName { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Nation/DeleteNationInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Nation/DeleteNationInputDto.cs index 7063535..6f8e626 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Nation/DeleteNationInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Nation/DeleteNationInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class DeleteNationInputDto: BaseInputDto + public class DeleteNationInputDto : BaseInputDto { public int NationId { get; set; } public string NationNumber { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Nation/ReadNationInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Nation/ReadNationInputDto.cs index 61e0b14..741a8fa 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Nation/ReadNationInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Nation/ReadNationInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class ReadNationInputDto:ListInputDto + public class ReadNationInputDto : ListInputDto { public int NationId { get; set; } } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Nation/UpdateNationInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Nation/UpdateNationInputDto.cs index 3d194d5..58badd9 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Nation/UpdateNationInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Nation/UpdateNationInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class UpdateNationInputDto: BaseInputDto + public class UpdateNationInputDto : BaseInputDto { public string NationNumber { get; set; } public string NationName { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Position/CreatePositionInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Position/CreatePositionInputDto.cs index c270309..54e65ca 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Position/CreatePositionInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Position/CreatePositionInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class CreatePositionInputDto: BaseInputDto + public class CreatePositionInputDto : BaseInputDto { public string PositionNumber { get; set; } public string PositionName { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Position/DeletePositionInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Position/DeletePositionInputDto.cs index c805267..53428be 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Position/DeletePositionInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Position/DeletePositionInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class DeletePositionInputDto: BaseInputDto + public class DeletePositionInputDto : BaseInputDto { public string PositionNumber { get; set; } } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Position/ReadPositionInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Position/ReadPositionInputDto.cs index 938b699..a2c3a62 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Position/ReadPositionInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Position/ReadPositionInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class ReadPositionInputDto:ListInputDto + public class ReadPositionInputDto : ListInputDto { public int PositionId { get; set; } public string PositionName { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Position/UpdatePositionInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Position/UpdatePositionInputDto.cs index c8c9f05..98fc2d5 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Position/UpdatePositionInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Position/UpdatePositionInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class UpdatePositionInputDto: BaseInputDto + public class UpdatePositionInputDto : BaseInputDto { public int PositionId { get; set; } public string PositionNumber { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Qualification/CreateEducationInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Qualification/CreateEducationInputDto.cs index e63d249..edb2d51 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Qualification/CreateEducationInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Qualification/CreateEducationInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class CreateEducationInputDto: BaseInputDto + public class CreateEducationInputDto : BaseInputDto { public string EducationNumber { get; set; } public string EducationName { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Qualification/DeleteEducationInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Qualification/DeleteEducationInputDto.cs index f04a770..ce86d27 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Qualification/DeleteEducationInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Qualification/DeleteEducationInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class DeleteEducationInputDto: BaseInputDto + public class DeleteEducationInputDto : BaseInputDto { public string EducationNumber { get; set; } } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Qualification/ReadEducationInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Qualification/ReadEducationInputDto.cs index 9341c90..0c9754e 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Qualification/ReadEducationInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Qualification/ReadEducationInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class ReadEducationInputDto:ListInputDto + public class ReadEducationInputDto : ListInputDto { public string EducationNumber { get; set; } } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Qualification/UpdateEducationInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Qualification/UpdateEducationInputDto.cs index c25e952..347c9aa 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Qualification/UpdateEducationInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Qualification/UpdateEducationInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class UpdateEducationInputDto: BaseInputDto + public class UpdateEducationInputDto : BaseInputDto { public string EducationNumber { get; set; } public string EducationName { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Role/CreateRoleInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Role/CreateRoleInputDto.cs index 413ebf5..761488d 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Role/CreateRoleInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Role/CreateRoleInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class CreateRoleInputDto: BaseInputDto + public class CreateRoleInputDto : BaseInputDto { /// /// ע:ɫ diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Role/DeleteRoleInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Role/DeleteRoleInputDto.cs index 7193760..63174f6 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Role/DeleteRoleInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Role/DeleteRoleInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class DeleteRoleInputDto: BaseInputDto + public class DeleteRoleInputDto : BaseInputDto { /// /// ע:ɫ diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Role/ReadRoleInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Role/ReadRoleInputDto.cs index b697ab3..6a7bba9 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Role/ReadRoleInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Role/ReadRoleInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class ReadRoleInputDto:ListInputDto + public class ReadRoleInputDto : ListInputDto { /// /// ע:ɫ diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Role/UpdateRoleInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Role/UpdateRoleInputDto.cs index 2666f63..e34795c 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Role/UpdateRoleInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/Role/UpdateRoleInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class UpdateRoleInputDto: BaseInputDto + public class UpdateRoleInputDto : BaseInputDto { /// /// ע:ɫ diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/SupervisionStatistics/CreateSupervisionStatisticsInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/SupervisionStatistics/CreateSupervisionStatisticsInputDto.cs index e002b46..5670609 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/SupervisionStatistics/CreateSupervisionStatisticsInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/SupervisionStatistics/CreateSupervisionStatisticsInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class CreateSupervisionStatisticsInputDto: BaseInputDto + public class CreateSupervisionStatisticsInputDto : BaseInputDto { public string StatisticsNumber { get; set; } public string SupervisingDepartment { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/SupervisionStatistics/DeleteSupervisionStatisticsInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/SupervisionStatistics/DeleteSupervisionStatisticsInputDto.cs index 1a3cad4..516fcb8 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/SupervisionStatistics/DeleteSupervisionStatisticsInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/SupervisionStatistics/DeleteSupervisionStatisticsInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class DeleteSupervisionStatisticsInputDto: BaseInputDto + public class DeleteSupervisionStatisticsInputDto : BaseInputDto { public string StatisticsNumber { get; set; } public string SupervisingDepartment { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/SupervisionStatistics/ReadSupervisionStatisticsInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/SupervisionStatistics/ReadSupervisionStatisticsInputDto.cs index 2879ef8..371789a 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/SupervisionStatistics/ReadSupervisionStatisticsInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/SupervisionStatistics/ReadSupervisionStatisticsInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class ReadSupervisionStatisticsInputDto:ListInputDto + public class ReadSupervisionStatisticsInputDto : ListInputDto { public string StatisticsNumber { get; set; } public string SupervisingDepartment { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/SupervisionStatistics/UpdateSupervisionStatisticsInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/SupervisionStatistics/UpdateSupervisionStatisticsInputDto.cs index 5edc406..0bdde34 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/SupervisionStatistics/UpdateSupervisionStatisticsInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/SupervisionStatistics/UpdateSupervisionStatisticsInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class UpdateSupervisionStatisticsInputDto: BaseInputDto + public class UpdateSupervisionStatisticsInputDto : BaseInputDto { public string StatisticsNumber { get; set; } public string SupervisingDepartment { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/SystemInformation/CreateSystemInformationInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/SystemInformation/CreateSystemInformationInputDto.cs index 9cbc093..9c0b760 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/SystemInformation/CreateSystemInformationInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/SystemInformation/CreateSystemInformationInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class CreateSystemInformationInputDto: BaseInputDto + public class CreateSystemInformationInputDto : BaseInputDto { public string InformationTitle { get; set; } public string InformationContent { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/SystemInformation/DeleteSystemInformationInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/SystemInformation/DeleteSystemInformationInputDto.cs index 41f466b..ff0c488 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/SystemInformation/DeleteSystemInformationInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/SystemInformation/DeleteSystemInformationInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class DeleteSystemInformationInputDto: BaseInputDto + public class DeleteSystemInformationInputDto : BaseInputDto { public int InformationId { get; set; } } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/SystemInformation/ReadSystemInformationInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/SystemInformation/ReadSystemInformationInputDto.cs index 59c9316..aca3569 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/SystemInformation/ReadSystemInformationInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/SystemInformation/ReadSystemInformationInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class ReadSystemInformationInputDto:ListInputDto + public class ReadSystemInformationInputDto : ListInputDto { public int InformationId { get; set; } } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/SystemInformation/UpdateSystemInformationInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/SystemInformation/UpdateSystemInformationInputDto.cs index 2c98104..534ccd0 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/SystemInformation/UpdateSystemInformationInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/SystemInformation/UpdateSystemInformationInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class UpdateSystemInformationInputDto: BaseInputDto + public class UpdateSystemInformationInputDto : BaseInputDto { public int InformationId { get; set; } public string InformationTitle { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/VipLevelRule/CreateVipLevelRuleInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/VipLevelRule/CreateVipLevelRuleInputDto.cs index 8d74740..dc91fc6 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/VipLevelRule/CreateVipLevelRuleInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/VipLevelRule/CreateVipLevelRuleInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class CreateVipLevelRuleInputDto: BaseInputDto + public class CreateVipLevelRuleInputDto : BaseInputDto { public int Id { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/VipLevelRule/DeleteVipLevelRuleInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/VipLevelRule/DeleteVipLevelRuleInputDto.cs index 690ff80..44187cf 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/VipLevelRule/DeleteVipLevelRuleInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/VipLevelRule/DeleteVipLevelRuleInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class DeleteVipLevelRuleInputDto: BaseInputDto + public class DeleteVipLevelRuleInputDto : BaseInputDto { public int Id { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/VipLevelRule/ReadVipLevelRuleInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/VipLevelRule/ReadVipLevelRuleInputDto.cs index f1b4556..306aa32 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/VipLevelRule/ReadVipLevelRuleInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/VipLevelRule/ReadVipLevelRuleInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class ReadVipLevelRuleInputDto:ListInputDto + public class ReadVipLevelRuleInputDto : ListInputDto { public int RuleId { get; set; } public string RuleSerialNumber { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/VipLevelRule/ReadVipLevelRuleOutputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/VipLevelRule/ReadVipLevelRuleOutputDto.cs index 71e98a1..1f3a26a 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/VipLevelRule/ReadVipLevelRuleOutputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/VipLevelRule/ReadVipLevelRuleOutputDto.cs @@ -1,8 +1,6 @@ -using SqlSugar; - namespace EOM.TSHotelManagement.Common.Contract { - public class ReadVipLevelRuleOutputDto:BaseOutputDto + public class ReadVipLevelRuleOutputDto : BaseOutputDto { public int Id { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/VipLevelRule/UpdateVipLevelRuleInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/VipLevelRule/UpdateVipLevelRuleInputDto.cs index 88f0164..9174513 100644 --- a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/VipLevelRule/UpdateVipLevelRuleInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/VipLevelRule/UpdateVipLevelRuleInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class UpdateVipLevelRuleInputDto: BaseInputDto + public class UpdateVipLevelRuleInputDto : BaseInputDto { public int Id { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Util/Dto/ApplicationVersion/CreateApplicationVersionInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Util/Dto/ApplicationVersion/CreateApplicationVersionInputDto.cs index fadba28..0fecea3 100644 --- a/EOM.TSHotelManagement.Common.Contract/Util/Dto/ApplicationVersion/CreateApplicationVersionInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Util/Dto/ApplicationVersion/CreateApplicationVersionInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class CreateApplicationVersionInputDto: BaseInputDto + public class CreateApplicationVersionInputDto : BaseInputDto { public string VersionNumber { get; set; } public string VersionDescription { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Util/Dto/ApplicationVersion/DeleteApplicationVersionInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Util/Dto/ApplicationVersion/DeleteApplicationVersionInputDto.cs index 123f57a..67839e4 100644 --- a/EOM.TSHotelManagement.Common.Contract/Util/Dto/ApplicationVersion/DeleteApplicationVersionInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Util/Dto/ApplicationVersion/DeleteApplicationVersionInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class DeleteApplicationVersionInputDto: BaseInputDto + public class DeleteApplicationVersionInputDto : BaseInputDto { public int VersionId { get; set; } } diff --git a/EOM.TSHotelManagement.Common.Contract/Util/Dto/ApplicationVersion/ReadApplicationVersionInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Util/Dto/ApplicationVersion/ReadApplicationVersionInputDto.cs index 50812a3..88cd83e 100644 --- a/EOM.TSHotelManagement.Common.Contract/Util/Dto/ApplicationVersion/ReadApplicationVersionInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Util/Dto/ApplicationVersion/ReadApplicationVersionInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class ReadApplicationVersionInputDto:ListInputDto + public class ReadApplicationVersionInputDto : ListInputDto { public int VersionId { get; set; } } diff --git a/EOM.TSHotelManagement.Common.Contract/Util/Dto/ApplicationVersion/UpdateApplicationVersionInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Util/Dto/ApplicationVersion/UpdateApplicationVersionInputDto.cs index d3c7ce9..8034fc8 100644 --- a/EOM.TSHotelManagement.Common.Contract/Util/Dto/ApplicationVersion/UpdateApplicationVersionInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Util/Dto/ApplicationVersion/UpdateApplicationVersionInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class UpdateApplicationVersionInputDto: BaseInputDto + public class UpdateApplicationVersionInputDto : BaseInputDto { public int VersionId { get; set; } public string VersionNumber { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Util/Dto/CardCode/CreateCardCodeInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Util/Dto/CardCode/CreateCardCodeInputDto.cs index ac5a8cc..53debea 100644 --- a/EOM.TSHotelManagement.Common.Contract/Util/Dto/CardCode/CreateCardCodeInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Util/Dto/CardCode/CreateCardCodeInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class CreateCardCodeInputDto:BaseInputDto + public class CreateCardCodeInputDto : BaseInputDto { public long Id { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Util/Dto/CardCode/DeleteCardCodeInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Util/Dto/CardCode/DeleteCardCodeInputDto.cs index e134e62..6e11185 100644 --- a/EOM.TSHotelManagement.Common.Contract/Util/Dto/CardCode/DeleteCardCodeInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Util/Dto/CardCode/DeleteCardCodeInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class DeleteCardCodeInputDto: BaseInputDto + public class DeleteCardCodeInputDto : BaseInputDto { public long Id { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Util/Dto/CardCode/ReadCardCodeInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Util/Dto/CardCode/ReadCardCodeInputDto.cs index 987a745..acc9f67 100644 --- a/EOM.TSHotelManagement.Common.Contract/Util/Dto/CardCode/ReadCardCodeInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Util/Dto/CardCode/ReadCardCodeInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class ReadCardCodeInputDto:ListInputDto + public class ReadCardCodeInputDto : ListInputDto { public long Id { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Util/Dto/CardCode/UpdateCardCodeInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Util/Dto/CardCode/UpdateCardCodeInputDto.cs index 8959e9c..424c8f9 100644 --- a/EOM.TSHotelManagement.Common.Contract/Util/Dto/CardCode/UpdateCardCodeInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Util/Dto/CardCode/UpdateCardCodeInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class UpdateCardCodeInputDto: BaseInputDto + public class UpdateCardCodeInputDto : BaseInputDto { public long Id { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Util/Dto/OperationLog/CreateOperationLogInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Util/Dto/OperationLog/CreateOperationLogInputDto.cs index e97dcaf..7ec26aa 100644 --- a/EOM.TSHotelManagement.Common.Contract/Util/Dto/OperationLog/CreateOperationLogInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Util/Dto/OperationLog/CreateOperationLogInputDto.cs @@ -2,7 +2,7 @@ using EOM.TSHotelManagement.Common.Core; namespace EOM.TSHotelManagement.Common.Contract { - public class CreateOperationLogInputDto: BaseInputDto + public class CreateOperationLogInputDto : BaseInputDto { public DateTime OperationTime { get; set; } public string LogContent { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Util/Dto/OperationLog/DeleteOperationLogInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Util/Dto/OperationLog/DeleteOperationLogInputDto.cs index b84346e..2b542ca 100644 --- a/EOM.TSHotelManagement.Common.Contract/Util/Dto/OperationLog/DeleteOperationLogInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Util/Dto/OperationLog/DeleteOperationLogInputDto.cs @@ -1,6 +1,6 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class DeleteOperationLogInputDto: BaseInputDto + public class DeleteOperationLogInputDto : BaseInputDto { public string OperationId { get; set; } } diff --git a/EOM.TSHotelManagement.Common.Contract/Util/Dto/OperationLog/ReadOperationLogInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Util/Dto/OperationLog/ReadOperationLogInputDto.cs index ff3a926..2494471 100644 --- a/EOM.TSHotelManagement.Common.Contract/Util/Dto/OperationLog/ReadOperationLogInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Util/Dto/OperationLog/ReadOperationLogInputDto.cs @@ -1,7 +1,7 @@ namespace EOM.TSHotelManagement.Common.Contract { - public class ReadOperationLogInputDto:ListInputDto + public class ReadOperationLogInputDto : ListInputDto { public string OperationId { get; set; } public int? LogLevel { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Util/Dto/OperationLog/ReadOperationLogOutputDto.cs b/EOM.TSHotelManagement.Common.Contract/Util/Dto/OperationLog/ReadOperationLogOutputDto.cs index 9118475..d10db6a 100644 --- a/EOM.TSHotelManagement.Common.Contract/Util/Dto/OperationLog/ReadOperationLogOutputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Util/Dto/OperationLog/ReadOperationLogOutputDto.cs @@ -1,5 +1,4 @@ using EOM.TSHotelManagement.Common.Core; -using SqlSugar; namespace EOM.TSHotelManagement.Common.Contract { diff --git a/EOM.TSHotelManagement.Common.Contract/Util/Dto/OperationLog/UpdateOperationLogInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Util/Dto/OperationLog/UpdateOperationLogInputDto.cs index 29e0fff..f443e81 100644 --- a/EOM.TSHotelManagement.Common.Contract/Util/Dto/OperationLog/UpdateOperationLogInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Util/Dto/OperationLog/UpdateOperationLogInputDto.cs @@ -2,7 +2,7 @@ using EOM.TSHotelManagement.Common.Core; namespace EOM.TSHotelManagement.Common.Contract { - public class UpdateOperationLogInputDto: BaseInputDto + public class UpdateOperationLogInputDto : BaseInputDto { public int OperationId { get; set; } public DateTime OperationTime { get; set; } diff --git a/EOM.TSHotelManagement.Common.Core/Business/Asset/Asset.cs b/EOM.TSHotelManagement.Common.Core/Business/Asset/Asset.cs index a390af3..57f1d76 100644 --- a/EOM.TSHotelManagement.Common.Core/Business/Asset/Asset.cs +++ b/EOM.TSHotelManagement.Common.Core/Business/Asset/Asset.cs @@ -35,7 +35,7 @@ namespace EOM.TSHotelManagement.Common.Core /// /// 资产编号 (Asset Number) /// - [SqlSugar.SugarColumn(ColumnName = "asset_number",IsPrimaryKey = true)] + [SqlSugar.SugarColumn(ColumnName = "asset_number", IsPrimaryKey = true)] [NeedValid] public string AssetNumber { get; set; } diff --git a/EOM.TSHotelManagement.Common.Core/Business/Room/RoomState.cs b/EOM.TSHotelManagement.Common.Core/Business/Room/RoomState.cs index 1e727c3..91937ff 100644 --- a/EOM.TSHotelManagement.Common.Core/Business/Room/RoomState.cs +++ b/EOM.TSHotelManagement.Common.Core/Business/Room/RoomState.cs @@ -22,7 +22,6 @@ * *模块说明：房间状态类 */ -using SqlSugar; using System.ComponentModel; namespace EOM.TSHotelManagement.Common.Core diff --git a/EOM.TSHotelManagement.Common.Core/Business/Sellthing/SellThing.cs b/EOM.TSHotelManagement.Common.Core/Business/Sellthing/SellThing.cs index d3718a9..b2eaf53 100644 --- a/EOM.TSHotelManagement.Common.Core/Business/Sellthing/SellThing.cs +++ b/EOM.TSHotelManagement.Common.Core/Business/Sellthing/SellThing.cs @@ -24,7 +24,6 @@ */ //using System.ComponentModel.DataAnnotations.Schema; -using EOM.TSHotelManagement.Common.Util; using SqlSugar; namespace EOM.TSHotelManagement.Common.Core diff --git a/EOM.TSHotelManagement.Common.Core/Business/Spend/Spend.cs b/EOM.TSHotelManagement.Common.Core/Business/Spend/Spend.cs index 13bdb35..c200fd2 100644 --- a/EOM.TSHotelManagement.Common.Core/Business/Spend/Spend.cs +++ b/EOM.TSHotelManagement.Common.Core/Business/Spend/Spend.cs @@ -22,9 +22,8 @@ * *模块说明：消费信息类 */ -using EOM.TSHotelManagement.Common.Util; -using System; using SqlSugar; +using System; namespace EOM.TSHotelManagement.Common.Core { diff --git a/EOM.TSHotelManagement.Common.Core/SystemManagement/Menu.cs b/EOM.TSHotelManagement.Common.Core/SystemManagement/Menu.cs index 9b95319..eb8e4f4 100644 --- a/EOM.TSHotelManagement.Common.Core/SystemManagement/Menu.cs +++ b/EOM.TSHotelManagement.Common.Core/SystemManagement/Menu.cs @@ -22,9 +22,6 @@ * *模块说明：菜单表 */ -using System; -using System.Collections.Generic; -using System.Linq; using SqlSugar; namespace EOM.TSHotelManagement.Common.Core { @@ -34,7 +31,7 @@ namespace EOM.TSHotelManagement.Common.Core [SugarTable("menu")] public class Menu : BaseEntity { - [SugarColumn(ColumnName = "id",IsPrimaryKey = true,IsIdentity = true)] + [SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsIdentity = true)] public new int Id { get; set; } /// /// 备 注:菜单键 (Menu Key) diff --git a/EOM.TSHotelManagement.Common.Core/SystemManagement/MenuViewModel.cs b/EOM.TSHotelManagement.Common.Core/SystemManagement/MenuViewModel.cs index dee1fd8..fac79c6 100644 --- a/EOM.TSHotelManagement.Common.Core/SystemManagement/MenuViewModel.cs +++ b/EOM.TSHotelManagement.Common.Core/SystemManagement/MenuViewModel.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.Generic; namespace EOM.TSHotelManagement.Common.Core { diff --git a/EOM.TSHotelManagement.Common.Core/SystemManagement/PoliticalAffiliation.cs b/EOM.TSHotelManagement.Common.Core/SystemManagement/PoliticalAffiliation.cs index 290cc0d..94fbaa1 100644 --- a/EOM.TSHotelManagement.Common.Core/SystemManagement/PoliticalAffiliation.cs +++ b/EOM.TSHotelManagement.Common.Core/SystemManagement/PoliticalAffiliation.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.ComponentModel; namespace EOM.TSHotelManagement.Common.Core { diff --git a/EOM.TSHotelManagement.Common.Core/SystemManagement/Role.cs b/EOM.TSHotelManagement.Common.Core/SystemManagement/Role.cs index ea7c0cb..e09c453 100644 --- a/EOM.TSHotelManagement.Common.Core/SystemManagement/Role.cs +++ b/EOM.TSHotelManagement.Common.Core/SystemManagement/Role.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using SqlSugar; +using SqlSugar; namespace EOM.TSHotelManagement.Common.Core { /// @@ -31,5 +28,5 @@ namespace EOM.TSHotelManagement.Common.Core [SugarColumn(ColumnName = "role_description")] public string? RoleDescription { get; set; } } - + } \ No newline at end of file diff --git a/EOM.TSHotelManagement.Common.Core/SystemManagement/RolePermission.cs b/EOM.TSHotelManagement.Common.Core/SystemManagement/RolePermission.cs index e781256..eee6849 100644 --- a/EOM.TSHotelManagement.Common.Core/SystemManagement/RolePermission.cs +++ b/EOM.TSHotelManagement.Common.Core/SystemManagement/RolePermission.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using SqlSugar; +using SqlSugar; namespace EOM.TSHotelManagement.Common.Core { /// diff --git a/EOM.TSHotelManagement.Common.Core/SystemManagement/UserRole.cs b/EOM.TSHotelManagement.Common.Core/SystemManagement/UserRole.cs index 728a068..a0f6ba3 100644 --- a/EOM.TSHotelManagement.Common.Core/SystemManagement/UserRole.cs +++ b/EOM.TSHotelManagement.Common.Core/SystemManagement/UserRole.cs @@ -1,28 +1,25 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using SqlSugar; +using SqlSugar; namespace EOM.TSHotelManagement.Common.Core { /// /// 用户角色关联表 /// [SugarTable("user_role")] - public class UserRole:BaseEntity + public class UserRole : BaseEntity { /// /// 备 注:角色编码 /// 默认值: /// - [SugarColumn(ColumnName="role_number" ) ] - public string RoleNumber { get; set; } = null!; - + [SugarColumn(ColumnName = "role_number")] + public string RoleNumber { get; set; } = null!; + /// /// 备 注:用户编码 /// 默认值: /// - [SugarColumn(ColumnName="user_number" ) ] - public string UserNumber { get; set; } = null!; + [SugarColumn(ColumnName = "user_number")] + public string UserNumber { get; set; } = null!; } - + } \ No newline at end of file diff --git a/EOM.TSHotelManagement.Common.Core/Util/OperationLog.cs b/EOM.TSHotelManagement.Common.Core/Util/OperationLog.cs index 9b75877..9eb3b76 100644 --- a/EOM.TSHotelManagement.Common.Core/Util/OperationLog.cs +++ b/EOM.TSHotelManagement.Common.Core/Util/OperationLog.cs @@ -57,7 +57,7 @@ namespace EOM.TSHotelManagement.Common.Core /// /// 日志ID (Log ID) /// - [SugarColumn(ColumnName = "operation_number",IsPrimaryKey = true)] + [SugarColumn(ColumnName = "operation_number", IsPrimaryKey = true)] public string OperationId { get; set; } /// diff --git a/EOM.TSHotelManagement.Common.Util/GenerateJWT/JWTHelper.cs b/EOM.TSHotelManagement.Common.Util/GenerateJWT/JWTHelper.cs index 2b8c10a..6622659 100644 --- a/EOM.TSHotelManagement.Common.Util/GenerateJWT/JWTHelper.cs +++ b/EOM.TSHotelManagement.Common.Util/GenerateJWT/JWTHelper.cs @@ -3,10 +3,8 @@ using Microsoft.IdentityModel.Tokens; using System; using System.Collections.Generic; using System.IdentityModel.Tokens.Jwt; -using System.Linq; using System.Security.Claims; using System.Text; -using System.Threading.Tasks; namespace EOM.TSHotelManagement.Common.Util { diff --git a/EOM.TSHotelManagement.Common.Util/Helper/LskyHelper.cs b/EOM.TSHotelManagement.Common.Util/Helper/LskyHelper.cs index 3bba4f0..3bfa342 100644 --- a/EOM.TSHotelManagement.Common.Util/Helper/LskyHelper.cs +++ b/EOM.TSHotelManagement.Common.Util/Helper/LskyHelper.cs @@ -1,13 +1,10 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Net.Http.Headers; +using EOM.TSHotelManagement.Shared; +using System; +using System.IO; using System.Net.Http; -using System.Text; -using System.Threading.Tasks; +using System.Net.Http.Headers; using System.Net.Http.Json; -using EOM.TSHotelManagement.Shared; -using System.IO; +using System.Threading.Tasks; namespace EOM.TSHotelManagement.Common.Util { @@ -47,7 +44,7 @@ namespace EOM.TSHotelManagement.Common.Util try { if (fileStream == null || fileStream.Length == 0) - throw new ArgumentException(LocalizationHelper.GetLocalizedString("File stream cannot be empty","文件流不能为空")); + throw new ArgumentException(LocalizationHelper.GetLocalizedString("File stream cannot be empty", "文件流不能为空")); if (string.IsNullOrWhiteSpace(fileName)) throw new ArgumentException(LocalizationHelper.GetLocalizedString("File name cannot be empty", "文件名不能为空")); @@ -75,7 +72,7 @@ namespace EOM.TSHotelManagement.Common.Util httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); var response = await httpClient.PostAsync( - $"{lskConfig.BaseAddress}{lskConfig.UploadApi}", + $"{lskConfig.BaseAddress}{lskConfig.UploadApi}", content ); @@ -88,7 +85,7 @@ namespace EOM.TSHotelManagement.Common.Util var result = await response.Content.ReadFromJsonAsync(); return result?.Data?.Links?.Url ?? throw new Exception("响应中未包含有效URL"); } - catch (Exception ex) + catch (Exception) { throw; } diff --git a/EOM.TSHotelManagement.Common.Util/Helper/MailHelper.cs b/EOM.TSHotelManagement.Common.Util/Helper/MailHelper.cs index be10022..9a8eeb1 100644 --- a/EOM.TSHotelManagement.Common.Util/Helper/MailHelper.cs +++ b/EOM.TSHotelManagement.Common.Util/Helper/MailHelper.cs @@ -1,11 +1,11 @@ -using MimeKit; +using EOM.TSHotelManagement.Shared; using MailKit.Net.Smtp; using MailKit.Security; +using MimeKit; using System; using System.Collections.Generic; using System.IO; using System.Linq; -using EOM.TSHotelManagement.Shared; using System.Net.Mime; namespace EOM.TSHotelManagement.Common.Util diff --git a/EOM.TSHotelManagement.Common.Util/Helper/RandomStringGenerator.cs b/EOM.TSHotelManagement.Common.Util/Helper/RandomStringGenerator.cs index e0ab59f..91a7451 100644 --- a/EOM.TSHotelManagement.Common.Util/Helper/RandomStringGenerator.cs +++ b/EOM.TSHotelManagement.Common.Util/Helper/RandomStringGenerator.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Security.Cryptography; -using System.Text; -using System.Threading.Tasks; +using System.Security.Cryptography; namespace EOM.TSHotelManagement.Common.Util { diff --git a/EOM.TSHotelManagement.Common.Util/Validator/UIDisplayAttribute.cs b/EOM.TSHotelManagement.Common.Util/Validator/UIDisplayAttribute.cs index 093a648..adbbca2 100644 --- a/EOM.TSHotelManagement.Common.Util/Validator/UIDisplayAttribute.cs +++ b/EOM.TSHotelManagement.Common.Util/Validator/UIDisplayAttribute.cs @@ -11,7 +11,7 @@ namespace EOM.TSHotelManagement.Common.Util public bool IsVisible { get; set; } = true; - public UIDisplayAttribute(string displayName,bool isNumber = false,bool isVisible = true) + public UIDisplayAttribute(string displayName, bool isNumber = false, bool isVisible = true) { DisplayName = displayName; IsNumber = isNumber; diff --git a/EOM.TSHotelManagement.EntityFramework/Repository/GenericRepository.cs b/EOM.TSHotelManagement.EntityFramework/Repository/GenericRepository.cs index 58c9247..01a9fe4 100644 --- a/EOM.TSHotelManagement.EntityFramework/Repository/GenericRepository.cs +++ b/EOM.TSHotelManagement.EntityFramework/Repository/GenericRepository.cs @@ -6,7 +6,7 @@ namespace EOM.TSHotelManagement.EntityFramework { public GenericRepository(ISqlSugarClient client) : base(client) { - base.Context.Aop.OnError = (ex) => {}; + base.Context.Aop.OnError = (ex) => { }; } } } diff --git a/EOM.TSHotelManagement.Shared/BrotliHelper.cs b/EOM.TSHotelManagement.Shared/BrotliHelper.cs index 6bf31d8..dfc510d 100644 --- a/EOM.TSHotelManagement.Shared/BrotliHelper.cs +++ b/EOM.TSHotelManagement.Shared/BrotliHelper.cs @@ -1,10 +1,5 @@ -using System; -using System.Buffers; -using System.Collections.Generic; -using System.IO.Compression; -using System.Linq; +using System.IO.Compression; using System.Text; -using System.Threading.Tasks; namespace EOM.TSHotelManagement.Shared { diff --git a/EOM.TSHotelManagement.Shared/EnumHelper.cs b/EOM.TSHotelManagement.Shared/EnumHelper.cs index aee8ccf..453693c 100644 --- a/EOM.TSHotelManagement.Shared/EnumHelper.cs +++ b/EOM.TSHotelManagement.Shared/EnumHelper.cs @@ -1,10 +1,5 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Linq; +using System.ComponentModel; using System.Reflection; -using System.Text; -using System.Threading.Tasks; namespace EOM.TSHotelManagement.Shared { diff --git a/EOM.TSHotelManagement.Shared/Interfaces/ILskyConfigFactory.cs b/EOM.TSHotelManagement.Shared/Interfaces/ILskyConfigFactory.cs index 86a5210..eeb55e8 100644 --- a/EOM.TSHotelManagement.Shared/Interfaces/ILskyConfigFactory.cs +++ b/EOM.TSHotelManagement.Shared/Interfaces/ILskyConfigFactory.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace EOM.TSHotelManagement.Shared +namespace EOM.TSHotelManagement.Shared { public interface ILskyConfigFactory { diff --git a/EOM.TSHotelManagement.Shared/Interfaces/IMailConfigFactory.cs b/EOM.TSHotelManagement.Shared/Interfaces/IMailConfigFactory.cs index 35af71d..c78f76d 100644 --- a/EOM.TSHotelManagement.Shared/Interfaces/IMailConfigFactory.cs +++ b/EOM.TSHotelManagement.Shared/Interfaces/IMailConfigFactory.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace EOM.TSHotelManagement.Shared +namespace EOM.TSHotelManagement.Shared { public interface IMailConfigFactory { diff --git a/EOM.TSHotelManagement.Shared/Interfaces/LskyConfig.cs b/EOM.TSHotelManagement.Shared/Interfaces/LskyConfig.cs index 219396c..61ef6be 100644 --- a/EOM.TSHotelManagement.Shared/Interfaces/LskyConfig.cs +++ b/EOM.TSHotelManagement.Shared/Interfaces/LskyConfig.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace EOM.TSHotelManagement.Shared +namespace EOM.TSHotelManagement.Shared { public class LskyConfig { diff --git a/EOM.TSHotelManagement.Shared/MailConfig.cs b/EOM.TSHotelManagement.Shared/MailConfig.cs index 4fa7523..290e38c 100644 --- a/EOM.TSHotelManagement.Shared/MailConfig.cs +++ b/EOM.TSHotelManagement.Shared/MailConfig.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace EOM.TSHotelManagement.Shared +namespace EOM.TSHotelManagement.Shared { public class MailConfig { diff --git a/EOM.TSHotelManagement.WebApi/Controllers/Business/Asset/AssetController.cs b/EOM.TSHotelManagement.WebApi/Controllers/Business/Asset/AssetController.cs index 09f059f..0022e1f 100644 --- a/EOM.TSHotelManagement.WebApi/Controllers/Business/Asset/AssetController.cs +++ b/EOM.TSHotelManagement.WebApi/Controllers/Business/Asset/AssetController.cs @@ -1,8 +1,6 @@ using EOM.TSHotelManagement.Application; using EOM.TSHotelManagement.Common.Contract; -using EOM.TSHotelManagement.Common.Core; using Microsoft.AspNetCore.Mvc; -using System.Collections.Generic; namespace EOM.TSHotelManagement.WebApi.Controllers { @@ -52,7 +50,7 @@ namespace EOM.TSHotelManagement.WebApi.Controllers /// /// [HttpPost] - public BaseOutputDto UpdAssetInfo([FromBody]UpdateAssetInputDto asset) + public BaseOutputDto UpdAssetInfo([FromBody] UpdateAssetInputDto asset) { return assetService.UpdAssetInfo(asset); } @@ -63,7 +61,7 @@ namespace EOM.TSHotelManagement.WebApi.Controllers /// /// [HttpPost] - public BaseOutputDto DelAssetInfo([FromBody]DeleteAssetInputDto asset) + public BaseOutputDto DelAssetInfo([FromBody] DeleteAssetInputDto asset) { return assetService.DelAssetInfo(asset); } diff --git a/EOM.TSHotelManagement.WebApi/Controllers/Business/Customer/CustomerController.cs b/EOM.TSHotelManagement.WebApi/Controllers/Business/Customer/CustomerController.cs index e89d6ee..b9a3e05 100644 --- a/EOM.TSHotelManagement.WebApi/Controllers/Business/Customer/CustomerController.cs +++ b/EOM.TSHotelManagement.WebApi/Controllers/Business/Customer/CustomerController.cs @@ -64,7 +64,7 @@ namespace EOM.TSHotelManagement.WebApi.Controllers /// /// [HttpPost] - public BaseOutputDto UpdCustomerTypeByCustoNo([FromBody]UpdateCustomerInputDto updateCustomerInputDto) + public BaseOutputDto UpdCustomerTypeByCustoNo([FromBody] UpdateCustomerInputDto updateCustomerInputDto) { return customerService.UpdCustomerTypeByCustoNo(updateCustomerInputDto); } diff --git a/EOM.TSHotelManagement.WebApi/Controllers/Business/EnergyManagement/EnergyManagementController.cs b/EOM.TSHotelManagement.WebApi/Controllers/Business/EnergyManagement/EnergyManagementController.cs index e92dd00..2af8bad 100644 --- a/EOM.TSHotelManagement.WebApi/Controllers/Business/EnergyManagement/EnergyManagementController.cs +++ b/EOM.TSHotelManagement.WebApi/Controllers/Business/EnergyManagement/EnergyManagementController.cs @@ -1,9 +1,5 @@ -using EOM.TSHotelManagement.Application; -using EOM.TSHotelManagement.Common.Contract; -using EOM.TSHotelManagement.Common.Core; +using EOM.TSHotelManagement.Common.Contract; using Microsoft.AspNetCore.Mvc; -using System; -using System.Collections.Generic; namespace EOM.TSHotelManagement.WebApi.Controllers { @@ -33,7 +29,7 @@ namespace EOM.TSHotelManagement.WebApi.Controllers /// Dto /// 符合条件的水电费信息列表 [HttpGet] - public ListOutputDto SelectEnergyManagementInfo([FromQuery]ReadEnergyManagementInputDto readEnergyManagementInputDto) + public ListOutputDto SelectEnergyManagementInfo([FromQuery] ReadEnergyManagementInputDto readEnergyManagementInputDto) { return this.hydroelectricPowerService.SelectEnergyManagementInfo(readEnergyManagementInputDto); } diff --git a/EOM.TSHotelManagement.WebApi/Controllers/Business/PromotionContent/FontsController.cs b/EOM.TSHotelManagement.WebApi/Controllers/Business/PromotionContent/FontsController.cs index f1bfc6b..66a2343 100644 --- a/EOM.TSHotelManagement.WebApi/Controllers/Business/PromotionContent/FontsController.cs +++ b/EOM.TSHotelManagement.WebApi/Controllers/Business/PromotionContent/FontsController.cs @@ -1,9 +1,6 @@ using EOM.TSHotelManagement.Application; using EOM.TSHotelManagement.Common.Contract; -using EOM.TSHotelManagement.Common.Core; -using EOM.TSHotelManagement.Common.Util; using Microsoft.AspNetCore.Mvc; -using System.Collections.Generic; namespace EOM.TSHotelManagement.WebApi.Controllers { @@ -31,7 +28,7 @@ namespace EOM.TSHotelManagement.WebApi.Controllers /// /// [HttpGet] - public ListOutputDto SelectPromotionContentAll([FromQuery]ReadPromotionContentInputDto readPromotionContentInputDto) + public ListOutputDto SelectPromotionContentAll([FromQuery] ReadPromotionContentInputDto readPromotionContentInputDto) { return fontsService.SelectPromotionContentAll(readPromotionContentInputDto); } diff --git a/EOM.TSHotelManagement.WebApi/Controllers/Business/Reser/ReserController.cs b/EOM.TSHotelManagement.WebApi/Controllers/Business/Reser/ReserController.cs index 59cb87f..f65a5fd 100644 --- a/EOM.TSHotelManagement.WebApi/Controllers/Business/Reser/ReserController.cs +++ b/EOM.TSHotelManagement.WebApi/Controllers/Business/Reser/ReserController.cs @@ -1,8 +1,6 @@ using EOM.TSHotelManagement.Application; using EOM.TSHotelManagement.Common.Contract; -using EOM.TSHotelManagement.Common.Core; using Microsoft.AspNetCore.Mvc; -using System.Collections.Generic; namespace EOM.TSHotelManagement.WebApi.Controllers { diff --git a/EOM.TSHotelManagement.WebApi/Controllers/Business/Room/RoomController.cs b/EOM.TSHotelManagement.WebApi/Controllers/Business/Room/RoomController.cs index 740f78b..3ceba7b 100644 --- a/EOM.TSHotelManagement.WebApi/Controllers/Business/Room/RoomController.cs +++ b/EOM.TSHotelManagement.WebApi/Controllers/Business/Room/RoomController.cs @@ -1,8 +1,6 @@ using EOM.TSHotelManagement.Application; -using EOM.TSHotelManagement.Common.Core; using EOM.TSHotelManagement.Common.Contract; using Microsoft.AspNetCore.Mvc; -using System.Collections.Generic; namespace EOM.TSHotelManagement.WebApi.Controllers { @@ -44,7 +42,7 @@ namespace EOM.TSHotelManagement.WebApi.Controllers /// /// [HttpGet] - public ListOutputDto SelectRoomAll([FromQuery]ReadRoomInputDto readRoomInputDto) + public ListOutputDto SelectRoomAll([FromQuery] ReadRoomInputDto readRoomInputDto) { return roomService.SelectRoomAll(readRoomInputDto); } diff --git a/EOM.TSHotelManagement.WebApi/Controllers/Business/Room/RoomTypeController.cs b/EOM.TSHotelManagement.WebApi/Controllers/Business/Room/RoomTypeController.cs index bbb3283..a4a1e7c 100644 --- a/EOM.TSHotelManagement.WebApi/Controllers/Business/Room/RoomTypeController.cs +++ b/EOM.TSHotelManagement.WebApi/Controllers/Business/Room/RoomTypeController.cs @@ -1,8 +1,6 @@ using EOM.TSHotelManagement.Application; -using EOM.TSHotelManagement.Common.Core; using EOM.TSHotelManagement.Common.Contract; using Microsoft.AspNetCore.Mvc; -using System.Collections.Generic; namespace EOM.TSHotelManagement.WebApi.Controllers { diff --git a/EOM.TSHotelManagement.WebApi/Controllers/Business/Sellthing/SellthingController.cs b/EOM.TSHotelManagement.WebApi/Controllers/Business/Sellthing/SellthingController.cs index f5652b0..94eceac 100644 --- a/EOM.TSHotelManagement.WebApi/Controllers/Business/Sellthing/SellthingController.cs +++ b/EOM.TSHotelManagement.WebApi/Controllers/Business/Sellthing/SellthingController.cs @@ -1,8 +1,6 @@ using EOM.TSHotelManagement.Application; -using EOM.TSHotelManagement.Common.Core; using EOM.TSHotelManagement.Common.Contract; using Microsoft.AspNetCore.Mvc; -using System.Collections.Generic; namespace EOM.TSHotelManagement.WebApi.Controllers { diff --git a/EOM.TSHotelManagement.WebApi/Controllers/Business/Spend/SpendController.cs b/EOM.TSHotelManagement.WebApi/Controllers/Business/Spend/SpendController.cs index f7c4ced..a68c322 100644 --- a/EOM.TSHotelManagement.WebApi/Controllers/Business/Spend/SpendController.cs +++ b/EOM.TSHotelManagement.WebApi/Controllers/Business/Spend/SpendController.cs @@ -1,11 +1,6 @@ using EOM.TSHotelManagement.Application; -using EOM.TSHotelManagement.Common.Core; using EOM.TSHotelManagement.Common.Contract; using Microsoft.AspNetCore.Mvc; -using System.Collections.Generic; -using System; -using EOM.TSHotelManagement.Common.Util; -using Microsoft.AspNetCore.Components.Forms; namespace EOM.TSHotelManagement.WebApi.Controllers { @@ -70,7 +65,7 @@ namespace EOM.TSHotelManagement.WebApi.Controllers /// /// [HttpGet] - public ListOutputDto SelectSpendInfoAll([FromQuery]ReadSpendInputDto readSpendInputDto) + public ListOutputDto SelectSpendInfoAll([FromQuery] ReadSpendInputDto readSpendInputDto) { return spendService.SelectSpendInfoAll(readSpendInputDto); } diff --git a/EOM.TSHotelManagement.WebApi/Controllers/Employee/Check/EmployeeCheckController.cs b/EOM.TSHotelManagement.WebApi/Controllers/Employee/Check/EmployeeCheckController.cs index 97c491d..6686a29 100644 --- a/EOM.TSHotelManagement.WebApi/Controllers/Employee/Check/EmployeeCheckController.cs +++ b/EOM.TSHotelManagement.WebApi/Controllers/Employee/Check/EmployeeCheckController.cs @@ -1,8 +1,6 @@ using EOM.TSHotelManagement.Application; -using EOM.TSHotelManagement.Common.Core; using EOM.TSHotelManagement.Common.Contract; using Microsoft.AspNetCore.Mvc; -using System.Collections.Generic; namespace EOM.TSHotelManagement.WebApi.Controllers { diff --git a/EOM.TSHotelManagement.WebApi/Controllers/Employee/EmployeeController.cs b/EOM.TSHotelManagement.WebApi/Controllers/Employee/EmployeeController.cs index 4bbeb0a..87fc04b 100644 --- a/EOM.TSHotelManagement.WebApi/Controllers/Employee/EmployeeController.cs +++ b/EOM.TSHotelManagement.WebApi/Controllers/Employee/EmployeeController.cs @@ -1,10 +1,7 @@ using EOM.TSHotelManagement.Application; -using EOM.TSHotelManagement.Common.Core; using EOM.TSHotelManagement.Common.Contract; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using System.Collections.Generic; -using SqlSugar.DistributedSystem.Snowflake; namespace EOM.TSHotelManagement.WebApi.Controllers { diff --git a/EOM.TSHotelManagement.WebApi/Controllers/Employee/History/EmployeeHistoryController.cs b/EOM.TSHotelManagement.WebApi/Controllers/Employee/History/EmployeeHistoryController.cs index 1278dba..af883fa 100644 --- a/EOM.TSHotelManagement.WebApi/Controllers/Employee/History/EmployeeHistoryController.cs +++ b/EOM.TSHotelManagement.WebApi/Controllers/Employee/History/EmployeeHistoryController.cs @@ -1,8 +1,6 @@ using EOM.TSHotelManagement.Application; -using EOM.TSHotelManagement.Common.Core; using EOM.TSHotelManagement.Common.Contract; using Microsoft.AspNetCore.Mvc; -using System.Collections.Generic; namespace EOM.TSHotelManagement.WebApi.Controllers { diff --git a/EOM.TSHotelManagement.WebApi/Controllers/Employee/Photo/EmployeePhotoController.cs b/EOM.TSHotelManagement.WebApi/Controllers/Employee/Photo/EmployeePhotoController.cs index c5ac280..0465696 100644 --- a/EOM.TSHotelManagement.WebApi/Controllers/Employee/Photo/EmployeePhotoController.cs +++ b/EOM.TSHotelManagement.WebApi/Controllers/Employee/Photo/EmployeePhotoController.cs @@ -1,8 +1,7 @@ using EOM.TSHotelManagement.Application; -using EOM.TSHotelManagement.Common.Core; using EOM.TSHotelManagement.Common.Contract; -using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; namespace EOM.TSHotelManagement.WebApi.Controllers { @@ -38,7 +37,7 @@ namespace EOM.TSHotelManagement.WebApi.Controllers [HttpPost] public SingleOutputDto InsertWorkerPhoto([FromForm] CreateEmployeePhotoInputDto inputDto, IFormFile file) { - return workerPicService.InsertWorkerPhoto(inputDto,file); + return workerPicService.InsertWorkerPhoto(inputDto, file); } /// diff --git a/EOM.TSHotelManagement.WebApi/Controllers/Employee/RewardPunishment/RewardPunishmentController.cs b/EOM.TSHotelManagement.WebApi/Controllers/Employee/RewardPunishment/RewardPunishmentController.cs index b5810ab..4148dca 100644 --- a/EOM.TSHotelManagement.WebApi/Controllers/Employee/RewardPunishment/RewardPunishmentController.cs +++ b/EOM.TSHotelManagement.WebApi/Controllers/Employee/RewardPunishment/RewardPunishmentController.cs @@ -1,8 +1,6 @@ using EOM.TSHotelManagement.Application; using EOM.TSHotelManagement.Common.Contract; -using EOM.TSHotelManagement.Common.Core; using Microsoft.AspNetCore.Mvc; -using System.Collections.Generic; namespace EOM.TSHotelManagement.WebApi.Controllers { diff --git a/EOM.TSHotelManagement.WebApi/Controllers/Sys/NavBar/NavBarController.cs b/EOM.TSHotelManagement.WebApi/Controllers/Sys/NavBar/NavBarController.cs index 613d7fa..6fdefc3 100644 --- a/EOM.TSHotelManagement.WebApi/Controllers/Sys/NavBar/NavBarController.cs +++ b/EOM.TSHotelManagement.WebApi/Controllers/Sys/NavBar/NavBarController.cs @@ -1,8 +1,6 @@ using EOM.TSHotelManagement.Application; using EOM.TSHotelManagement.Common.Contract; -using EOM.TSHotelManagement.Common.Core; using Microsoft.AspNetCore.Mvc; -using System.Collections.Generic; namespace EOM.TSHotelManagement.WebApi.Controllers { diff --git a/EOM.TSHotelManagement.WebApi/Controllers/SystemManagement/Administrator/AdminController.cs b/EOM.TSHotelManagement.WebApi/Controllers/SystemManagement/Administrator/AdminController.cs index aa4e9fc..b4d143b 100644 --- a/EOM.TSHotelManagement.WebApi/Controllers/SystemManagement/Administrator/AdminController.cs +++ b/EOM.TSHotelManagement.WebApi/Controllers/SystemManagement/Administrator/AdminController.cs @@ -1,11 +1,7 @@ using EOM.TSHotelManagement.Application; using EOM.TSHotelManagement.Common.Contract; -using EOM.TSHotelManagement.Common.Core; -using EOM.TSHotelManagement.Common.Util; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using System; -using System.Collections.Generic; namespace EOM.TSHotelManagement.WebApi.Controllers { @@ -144,7 +140,7 @@ namespace EOM.TSHotelManagement.WebApi.Controllers /// /// [HttpPost] - public BaseOutputDto AddAdminType([FromBody]CreateAdministratorTypeInputDto createAdministratorTypeInputDto) + public BaseOutputDto AddAdminType([FromBody] CreateAdministratorTypeInputDto createAdministratorTypeInputDto) { return adminService.AddAdminType(createAdministratorTypeInputDto); } diff --git a/EOM.TSHotelManagement.WebApi/Controllers/SystemManagement/Base/BaseController.cs b/EOM.TSHotelManagement.WebApi/Controllers/SystemManagement/Base/BaseController.cs index 392869a..c4abc0c 100644 --- a/EOM.TSHotelManagement.WebApi/Controllers/SystemManagement/Base/BaseController.cs +++ b/EOM.TSHotelManagement.WebApi/Controllers/SystemManagement/Base/BaseController.cs @@ -1,11 +1,6 @@ using EOM.TSHotelManagement.Application; -using EOM.TSHotelManagement.Common; using EOM.TSHotelManagement.Common.Contract; -using EOM.TSHotelManagement.Common.Core; using Microsoft.AspNetCore.Mvc; -using System; -using System.Collections.Generic; -using System.Linq; namespace EOM.TSHotelManagement.WebApi.Controllers { @@ -167,7 +162,7 @@ namespace EOM.TSHotelManagement.WebApi.Controllers } [HttpGet] - public ListOutputDto SelectDeptAll([FromQuery]ReadDepartmentInputDto readDepartmentInputDto) + public ListOutputDto SelectDeptAll([FromQuery] ReadDepartmentInputDto readDepartmentInputDto) { return baseService.SelectDeptAll(readDepartmentInputDto); } @@ -207,7 +202,7 @@ namespace EOM.TSHotelManagement.WebApi.Controllers } [HttpGet] - public ListOutputDto SelectCustoTypeAll([FromQuery]ReadCustoTypeInputDto readCustoTypeInputDto) + public ListOutputDto SelectCustoTypeAll([FromQuery] ReadCustoTypeInputDto readCustoTypeInputDto) { return baseService.SelectCustoTypeAll(readCustoTypeInputDto); } @@ -247,7 +242,7 @@ namespace EOM.TSHotelManagement.WebApi.Controllers } [HttpGet] - public ListOutputDto SelectPassPortTypeAll([FromQuery]ReadPassportTypeInputDto readPassportTypeInputDto) + public ListOutputDto SelectPassPortTypeAll([FromQuery] ReadPassportTypeInputDto readPassportTypeInputDto) { return baseService.SelectPassPortTypeAll(readPassportTypeInputDto); } @@ -287,7 +282,7 @@ namespace EOM.TSHotelManagement.WebApi.Controllers } [HttpGet] - public ListOutputDto SelectRewardPunishmentTypeAll([FromQuery]ReadRewardPunishmentTypeInputDto readRewardPunishmentTypeInputDto) + public ListOutputDto SelectRewardPunishmentTypeAll([FromQuery] ReadRewardPunishmentTypeInputDto readRewardPunishmentTypeInputDto) { return baseService.SelectRewardPunishmentTypeAll(readRewardPunishmentTypeInputDto); } diff --git a/EOM.TSHotelManagement.WebApi/Controllers/SystemManagement/Menu/MenuController.cs b/EOM.TSHotelManagement.WebApi/Controllers/SystemManagement/Menu/MenuController.cs index 15f8791..55f7544 100644 --- a/EOM.TSHotelManagement.WebApi/Controllers/SystemManagement/Menu/MenuController.cs +++ b/EOM.TSHotelManagement.WebApi/Controllers/SystemManagement/Menu/MenuController.cs @@ -1,8 +1,6 @@ using EOM.TSHotelManagement.Application; using EOM.TSHotelManagement.Common.Contract; using EOM.TSHotelManagement.Common.Core; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using System.Collections.Generic; @@ -35,7 +33,7 @@ namespace EOM.TSHotelManagement.WebApi.Controllers /// /// [HttpPost] - public List BuildMenuAll([FromBody]BaseInputDto baseInputDto) + public List BuildMenuAll([FromBody] BaseInputDto baseInputDto) { return menuService.BuildMenuAll(baseInputDto); } @@ -46,7 +44,7 @@ namespace EOM.TSHotelManagement.WebApi.Controllers /// /// [HttpPost] - public BaseOutputDto InsertMenu([FromBody]CreateMenuInputDto menu) + public BaseOutputDto InsertMenu([FromBody] CreateMenuInputDto menu) { return menuService.InsertMenu(menu); } diff --git a/EOM.TSHotelManagement.WebApi/Controllers/SystemManagement/Notice/NoticeController.cs b/EOM.TSHotelManagement.WebApi/Controllers/SystemManagement/Notice/NoticeController.cs index 6f2711d..ed31874 100644 --- a/EOM.TSHotelManagement.WebApi/Controllers/SystemManagement/Notice/NoticeController.cs +++ b/EOM.TSHotelManagement.WebApi/Controllers/SystemManagement/Notice/NoticeController.cs @@ -1,8 +1,6 @@ -using EOM.TSHotelManagement.Common.Core; +using EOM.TSHotelManagement.Application; using EOM.TSHotelManagement.Common.Contract; using Microsoft.AspNetCore.Mvc; -using System.Collections.Generic; -using EOM.TSHotelManagement.Application; namespace EOM.TSHotelManagement.WebApi.Controllers { diff --git a/EOM.TSHotelManagement.WebApi/Controllers/SystemManagement/Role/RoleController.cs b/EOM.TSHotelManagement.WebApi/Controllers/SystemManagement/Role/RoleController.cs index c1562f6..17e3989 100644 --- a/EOM.TSHotelManagement.WebApi/Controllers/SystemManagement/Role/RoleController.cs +++ b/EOM.TSHotelManagement.WebApi/Controllers/SystemManagement/Role/RoleController.cs @@ -1,6 +1,5 @@ using EOM.TSHotelManagement.Application; using EOM.TSHotelManagement.Common.Contract; -using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; namespace EOM.TSHotelManagement.WebApi.Controllers @@ -20,7 +19,7 @@ namespace EOM.TSHotelManagement.WebApi.Controllers /// /// [HttpGet] - public ListOutputDto SelectRoleList([FromQuery]ReadRoleInputDto readRoleInputDto) + public ListOutputDto SelectRoleList([FromQuery] ReadRoleInputDto readRoleInputDto) { return _roleAppService.SelectRoleList(readRoleInputDto); } @@ -31,7 +30,7 @@ namespace EOM.TSHotelManagement.WebApi.Controllers /// /// [HttpPost] - public BaseOutputDto InsertRole([FromBody]CreateRoleInputDto createRoleInputDto) + public BaseOutputDto InsertRole([FromBody] CreateRoleInputDto createRoleInputDto) { return _roleAppService.InsertRole(createRoleInputDto); } diff --git a/EOM.TSHotelManagement.WebApi/Controllers/SystemManagement/SupervisionStatistics/SupervisionStatisticsController.cs b/EOM.TSHotelManagement.WebApi/Controllers/SystemManagement/SupervisionStatistics/SupervisionStatisticsController.cs index 19db8ca..00e4808 100644 --- a/EOM.TSHotelManagement.WebApi/Controllers/SystemManagement/SupervisionStatistics/SupervisionStatisticsController.cs +++ b/EOM.TSHotelManagement.WebApi/Controllers/SystemManagement/SupervisionStatistics/SupervisionStatisticsController.cs @@ -1,8 +1,6 @@ -using EOM.TSHotelManagement.Common.Core; +using EOM.TSHotelManagement.Application; using EOM.TSHotelManagement.Common.Contract; using Microsoft.AspNetCore.Mvc; -using System.Collections.Generic; -using EOM.TSHotelManagement.Application; namespace EOM.TSHotelManagement.WebApi.Controllers { diff --git a/EOM.TSHotelManagement.WebApi/Controllers/SystemManagement/VipRule/VipRuleController.cs b/EOM.TSHotelManagement.WebApi/Controllers/SystemManagement/VipRule/VipRuleController.cs index 31ce6f6..0d8f600 100644 --- a/EOM.TSHotelManagement.WebApi/Controllers/SystemManagement/VipRule/VipRuleController.cs +++ b/EOM.TSHotelManagement.WebApi/Controllers/SystemManagement/VipRule/VipRuleController.cs @@ -1,8 +1,6 @@ -using EOM.TSHotelManagement.Common.Core; +using EOM.TSHotelManagement.Application; using EOM.TSHotelManagement.Common.Contract; using Microsoft.AspNetCore.Mvc; -using System.Collections.Generic; -using EOM.TSHotelManagement.Application; namespace EOM.TSHotelManagement.WebApi.Controllers { diff --git a/EOM.TSHotelManagement.WebApi/Controllers/Util/UtilityController.cs b/EOM.TSHotelManagement.WebApi/Controllers/Util/UtilityController.cs index 181e58a..8b5a64b 100644 --- a/EOM.TSHotelManagement.WebApi/Controllers/Util/UtilityController.cs +++ b/EOM.TSHotelManagement.WebApi/Controllers/Util/UtilityController.cs @@ -1,6 +1,5 @@ using EOM.TSHotelManagement.Application; using EOM.TSHotelManagement.Common.Contract; -using EOM.TSHotelManagement.Common.Core; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; @@ -67,7 +66,7 @@ namespace EOM.TSHotelManagement.WebApi.Controllers /// /// [HttpPost] - public BaseOutputDto DeleteOperationlogByRange([FromBody]ReadOperationLogInputDto readOperationLogInputDto) + public BaseOutputDto DeleteOperationlogByRange([FromBody] ReadOperationLogInputDto readOperationLogInputDto) { return utilService.DeleteOperationlogByRange(readOperationLogInputDto); } diff --git a/EOM.TSHotelManagement.WebApi/Factory/LskyConfigFactory.cs b/EOM.TSHotelManagement.WebApi/Factory/LskyConfigFactory.cs index fed7874..794efc5 100644 --- a/EOM.TSHotelManagement.WebApi/Factory/LskyConfigFactory.cs +++ b/EOM.TSHotelManagement.WebApi/Factory/LskyConfigFactory.cs @@ -3,7 +3,7 @@ using Microsoft.Extensions.Configuration; namespace EOM.TSHotelManagement.WebApi { - public class LskyConfigFactory:ILskyConfigFactory + public class LskyConfigFactory : ILskyConfigFactory { private readonly IConfiguration _configuration; diff --git a/EOM.TSHotelManagement.WebApi/Filter/RequestLoggingMiddleware.cs b/EOM.TSHotelManagement.WebApi/Filter/RequestLoggingMiddleware.cs index 352e765..76ac7b1 100644 --- a/EOM.TSHotelManagement.WebApi/Filter/RequestLoggingMiddleware.cs +++ b/EOM.TSHotelManagement.WebApi/Filter/RequestLoggingMiddleware.cs @@ -1,16 +1,13 @@ -using System; -using System.Diagnostics; -using System.IO; -using System.Text; -using System.Threading.Tasks; -using EOM.TSHotelManagement.Common.Core; +using EOM.TSHotelManagement.Common.Core; using EOM.TSHotelManagement.EntityFramework; -using EOM.TSHotelManagement.Shared; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using SqlSugar; +using System; +using System.Diagnostics; +using System.IO; +using System.Threading.Tasks; public class RequestLoggingMiddleware { -- Gitee From 5521a4d148946478b6d48cba34a6cdd497f9c170 Mon Sep 17 00:00:00 2001 From: ck_yeun9 Date: Sat, 26 Apr 2025 17:25:19 +0800 Subject: [PATCH 2/5] Add DBMigration Layer. support initialization database when first launch application(based on SQLSugar). --- .../BaseEntity.cs | 16 +- .../Business/Asset/Asset.cs | 21 +- .../Business/Customer/CustoType.cs | 12 +- .../Business/Customer/Customer.cs | 27 +- .../EnergyManagement/EnergyManagement.cs | 23 +- .../PromotionContent/PromotionContent.cs | 22 +- .../Business/Reser/Reser.cs | 81 ++- .../Business/Room/Room.cs | 85 ++- .../Business/Room/RoomType.cs | 45 +- .../Business/Sellthing/SellThing.cs | 52 +- .../Employee/Employee.cs | 46 +- .../Employee/EmployeeCheck.cs | 18 +- .../Employee/EmployeeHistory.cs | 22 +- .../Employee/EmployeePhoto.cs | 14 +- .../Employee/EmployeeRewardPunishment.cs | 23 +- .../Employee/RewardPunishmentType.cs | 25 +- .../Sys/NavBar/NavBar.cs | 45 +- .../SystemManagement/Administrator.cs | 21 +- .../SystemManagement/AdministratorType.cs | 12 +- .../SystemManagement/AppointmentNotice.cs | 18 +- .../SystemManagement/Department.cs | 18 +- .../SystemManagement/Education.cs | 12 +- .../SystemManagement/Menu.cs | 20 +- .../SystemManagement/Nation.cs | 23 +- .../SystemManagement/Position.cs | 25 +- .../SystemManagement/Role.cs | 49 +- .../SystemManagement/RolePermission.cs | 40 +- .../SystemManagement/SupervisionStatistics.cs | 96 +++- .../SystemManagement/SystemInformation.cs | 12 +- .../SystemManagement/UserRole.cs | 42 +- .../SystemManagement/VipLevelRule.cs | 44 +- .../Util/ApplicationVersion.cs | 6 +- .../Util/CardCode.cs | 23 +- .../Util/OperationLog.cs | 118 +++- .../EOM.TSHotelManagement.Migration.csproj | 17 + .../EntityBuilder.cs | 530 ++++++++++++++++++ EOM.TSHotelManagement.Web.sln | 6 + .../EOM.TSHotelManagement.WebApi.csproj | 1 + .../Factory/SqlSugarClientFactory.cs | 2 +- .../MigrationConfig/InitializeConfig.cs | 115 ++++ EOM.TSHotelManagement.WebApi/Startup.cs | 7 + 41 files changed, 1536 insertions(+), 298 deletions(-) create mode 100644 EOM.TSHotelManagement.Migration/EOM.TSHotelManagement.Migration.csproj create mode 100644 EOM.TSHotelManagement.Migration/EntityBuilder.cs create mode 100644 EOM.TSHotelManagement.WebApi/MigrationConfig/InitializeConfig.cs diff --git a/EOM.TSHotelManagement.Common.Core/BaseEntity.cs b/EOM.TSHotelManagement.Common.Core/BaseEntity.cs index 1e7c46b..520bf9d 100644 --- a/EOM.TSHotelManagement.Common.Core/BaseEntity.cs +++ b/EOM.TSHotelManagement.Common.Core/BaseEntity.cs @@ -1,39 +1,35 @@ using SqlSugar; using System; +using System.Security.Principal; namespace EOM.TSHotelManagement.Common.Core { public class BaseEntity { - /// - /// 编号 (ID) - /// - [SugarColumn(ColumnName = "id", IsIdentity = true)] - public int Id { get; set; } /// /// 删除标识 /// - [SqlSugar.SugarColumn(ColumnName = "delete_mk")] + [SqlSugar.SugarColumn(ColumnName = "delete_mk", Length = 11, IsNullable = false, DefaultValue = "0")] public int? IsDelete { get; set; } = 0; /// /// 资料创建人 /// - [SqlSugar.SugarColumn(ColumnName = "datains_usr", IsOnlyIgnoreUpdate = true)] + [SqlSugar.SugarColumn(ColumnName = "datains_usr", Length = 128, IsOnlyIgnoreUpdate = true, IsNullable = true)] public string DataInsUsr { get; set; } /// /// 资料创建时间 /// - [SqlSugar.SugarColumn(ColumnName = "datains_date", IsOnlyIgnoreUpdate = true)] + [SqlSugar.SugarColumn(ColumnName = "datains_date", IsOnlyIgnoreUpdate = true, InsertServerTime = true, IsNullable = true)] public DateTime? DataInsDate { get; set; } /// /// 资料更新人 /// - [SqlSugar.SugarColumn(ColumnName = "datachg_usr", IsOnlyIgnoreInsert = true)] + [SqlSugar.SugarColumn(ColumnName = "datachg_usr", Length = 128, IsOnlyIgnoreInsert = true, IsNullable = true)] public string DataChgUsr { get; set; } /// /// 资料更新时间 /// - [SqlSugar.SugarColumn(ColumnName = "datachg_date", IsOnlyIgnoreInsert = true)] + [SqlSugar.SugarColumn(ColumnName = "datachg_date", IsOnlyIgnoreInsert = true, InsertServerTime = true, IsNullable = true)] public DateTime? DataChgDate { get; set; } /// /// Token diff --git a/EOM.TSHotelManagement.Common.Core/Business/Asset/Asset.cs b/EOM.TSHotelManagement.Common.Core/Business/Asset/Asset.cs index 57f1d76..317618b 100644 --- a/EOM.TSHotelManagement.Common.Core/Business/Asset/Asset.cs +++ b/EOM.TSHotelManagement.Common.Core/Business/Asset/Asset.cs @@ -23,6 +23,7 @@ *模块说明：资产类 */ using EOM.TSHotelManagement.Common.Util; +using SqlSugar; using System; namespace EOM.TSHotelManagement.Common.Core { @@ -32,24 +33,30 @@ namespace EOM.TSHotelManagement.Common.Core [SqlSugar.SugarTable("asset")] public class Asset : BaseEntity { + /// + /// 编号 (ID) + /// + [SugarColumn(ColumnName = "id", IsIdentity = true, IsPrimaryKey = true, IsNullable = false, ColumnDescription = "编号 (ID)")] + public int Id { get; set; } + /// /// 资产编号 (Asset Number) /// - [SqlSugar.SugarColumn(ColumnName = "asset_number", IsPrimaryKey = true)] + [SqlSugar.SugarColumn(ColumnName = "asset_number", IsNullable = false, IsPrimaryKey = true, Length = 128, ColumnDescription = "资产编号")] [NeedValid] public string AssetNumber { get; set; } /// /// 资产名称 (Asset Name) /// - [SqlSugar.SugarColumn(ColumnName = "asset_name")] + [SqlSugar.SugarColumn(ColumnName = "asset_name", IsNullable = false, Length = 200, ColumnDescription = "资产名称")] [NeedValid] public string AssetName { get; set; } /// /// 资产总值 (Asset Value) /// - [SqlSugar.SugarColumn(ColumnName = "asset_value")] + [SqlSugar.SugarColumn(ColumnName = "asset_value", IsNullable = false, DecimalDigits = 2, Length = 18, ColumnDescription = "资产名称")] [NeedValid] public decimal AssetValue { get; set; } @@ -63,7 +70,7 @@ namespace EOM.TSHotelManagement.Common.Core /// /// 所属部门代码 (Department Code) /// - [SqlSugar.SugarColumn(ColumnName = "department_code")] + [SqlSugar.SugarColumn(ColumnName = "department_code", IsNullable = false, Length = 128, ColumnDescription = "所属部门代码 (Department Code)")] [NeedValid] public string DepartmentCode { get; set; } @@ -76,21 +83,21 @@ namespace EOM.TSHotelManagement.Common.Core /// /// 入库时间 (购置日期) (Acquisition Date) /// - [SqlSugar.SugarColumn(ColumnName = "acquisition_date")] + [SqlSugar.SugarColumn(ColumnName = "acquisition_date", IsNullable = false, ColumnDescription = "入库时间 (购置日期) (Acquisition Date)")] [NeedValid] public DateTime AcquisitionDate { get; set; } /// /// 资产来源 (Asset Source) /// - [SqlSugar.SugarColumn(ColumnName = "asset_source")] + [SqlSugar.SugarColumn(ColumnName = "asset_source", IsNullable = false, Length = 500, ColumnDescription = "资产来源 (Asset Source)")] [NeedValid] public string AssetSource { get; set; } /// /// 资产经办人 (员工ID) (Acquired By - Employee ID) /// - [SqlSugar.SugarColumn(ColumnName = "acquired_by_employee")] + [SqlSugar.SugarColumn(ColumnName = "acquired_by_employee", IsNullable = false, Length = 128, ColumnDescription = "资产经办人 (员工ID) (Acquired By - Employee ID)")] [NeedValid] public string AcquiredByEmployeeId { get; set; } diff --git a/EOM.TSHotelManagement.Common.Core/Business/Customer/CustoType.cs b/EOM.TSHotelManagement.Common.Core/Business/Customer/CustoType.cs index 5008523..d3d4989 100644 --- a/EOM.TSHotelManagement.Common.Core/Business/Customer/CustoType.cs +++ b/EOM.TSHotelManagement.Common.Core/Business/Customer/CustoType.cs @@ -22,6 +22,8 @@ * *模块说明：客户类型类 */ +using SqlSugar; + namespace EOM.TSHotelManagement.Common.Core { /// @@ -30,16 +32,22 @@ namespace EOM.TSHotelManagement.Common.Core [SqlSugar.SugarTable("custo_type")] public class CustoType : BaseEntity { + /// + /// 编号 (ID) + /// + [SugarColumn(ColumnName = "id", IsIdentity = true, IsPrimaryKey = true, IsNullable = false, ColumnDescription = "编号 (ID)")] + public int Id { get; set; } + /// /// 客户类型 (Customer Type) /// - [SqlSugar.SugarColumn(ColumnName = "custo_type", IsPrimaryKey = true)] + [SqlSugar.SugarColumn(ColumnName = "custo_type", IsPrimaryKey = true, IsNullable = false, ColumnDescription = "客户类型 (Customer Type)")] public int CustomerType { get; set; } /// /// 客户类型名称 (Customer Type Name) /// - [SqlSugar.SugarColumn(ColumnName = "type_name")] + [SqlSugar.SugarColumn(ColumnName = "type_name",IsNullable = false, Length = 256, ColumnDescription = "客户类型名称 (Customer Type Name)")] public string CustomerTypeName { get; set; } } diff --git a/EOM.TSHotelManagement.Common.Core/Business/Customer/Customer.cs b/EOM.TSHotelManagement.Common.Core/Business/Customer/Customer.cs index 33ff9cb..b51d06e 100644 --- a/EOM.TSHotelManagement.Common.Core/Business/Customer/Customer.cs +++ b/EOM.TSHotelManagement.Common.Core/Business/Customer/Customer.cs @@ -22,6 +22,7 @@ * *模块说明：客户信息类 */ +using SqlSugar; using System; namespace EOM.TSHotelManagement.Common.Core @@ -32,28 +33,34 @@ namespace EOM.TSHotelManagement.Common.Core [SqlSugar.SugarTable("customer")] public class Customer : BaseEntity { + /// + /// 编号 (ID) + /// + [SugarColumn(ColumnName = "id", IsIdentity = true, IsPrimaryKey = true, IsNullable = false, ColumnDescription = "编号 (ID)")] + public int Id { get; set; } + /// /// 客户编号 (Customer Number) /// - [SqlSugar.SugarColumn(ColumnName = "custo_no", IsPrimaryKey = true)] + [SqlSugar.SugarColumn(ColumnName = "custo_no", IsPrimaryKey = true, IsNullable = false, Length = 128, ColumnDescription = "客户编号 (Customer Number)")] public string CustomerNumber { get; set; } /// /// 客户名称 (Customer Name) /// - [SqlSugar.SugarColumn(ColumnName = "custo_name", IsNullable = false)] + [SqlSugar.SugarColumn(ColumnName = "custo_name", IsNullable = false, Length = 250, ColumnDescription = "客户名称 (Customer Name)")] public string CustomerName { get; set; } /// /// 客户性别 (Customer Gender) /// - [SqlSugar.SugarColumn(ColumnName = "custo_gender", IsNullable = true)] + [SqlSugar.SugarColumn(ColumnName = "custo_gender", IsNullable = false, ColumnDescription = "客户性别 (Customer Gender)")] public int? CustomerGender { get; set; } /// /// 证件类型 (Passport Type) /// - [SqlSugar.SugarColumn(ColumnName = "passport_type", IsNullable = false)] + [SqlSugar.SugarColumn(ColumnName = "passport_type", IsNullable = false, ColumnDescription = "客户性别 (Customer Gender)")] public int PassportId { get; set; } /// @@ -65,14 +72,14 @@ namespace EOM.TSHotelManagement.Common.Core /// /// 客户电话 (Customer Phone Number) /// - [SqlSugar.SugarColumn(ColumnName = "custo_tel", IsNullable = false)] + [SqlSugar.SugarColumn(ColumnName = "custo_tel", IsNullable = false, Length = 256, ColumnDescription = "客户电话 (Customer Phone Number)")] public string CustomerPhoneNumber { get; set; } /// /// 出生日期 (Date of Birth) /// - [SqlSugar.SugarColumn(ColumnName = "custo_birth", IsNullable = true)] - public DateTime DateOfBirth { get; set; } + [SqlSugar.SugarColumn(ColumnName = "custo_birth", IsNullable = false, ColumnDescription = "出生日期 (Date of Birth)")] + public DateOnly DateOfBirth { get; set; } /// /// 客户类型名称 (Customer Type Name) @@ -89,19 +96,19 @@ namespace EOM.TSHotelManagement.Common.Core /// /// 证件号码 (Passport ID) /// - [SqlSugar.SugarColumn(ColumnName = "passport_id", IsNullable = false)] + [SqlSugar.SugarColumn(ColumnName = "passport_id", IsNullable = false, Length = 256, ColumnDescription = "证件号码 (Passport ID)")] public string IdCardNumber { get; set; } /// /// 居住地址 (Customer Address) /// - [SqlSugar.SugarColumn(ColumnName = "custo_address", IsNullable = true)] + [SqlSugar.SugarColumn(ColumnName = "custo_address", IsNullable = true, Length = 256, ColumnDescription = "居住地址 (Customer Address)")] public string CustomerAddress { get; set; } /// /// 客户类型 (Customer Type) /// - [SqlSugar.SugarColumn(ColumnName = "custo_type", IsNullable = false)] + [SqlSugar.SugarColumn(ColumnName = "custo_type", IsNullable = false, ColumnDescription = "客户类型 (Customer Type)")] public int CustomerType { get; set; } } } diff --git a/EOM.TSHotelManagement.Common.Core/Business/EnergyManagement/EnergyManagement.cs b/EOM.TSHotelManagement.Common.Core/Business/EnergyManagement/EnergyManagement.cs index 2c61939..f4b263a 100644 --- a/EOM.TSHotelManagement.Common.Core/Business/EnergyManagement/EnergyManagement.cs +++ b/EOM.TSHotelManagement.Common.Core/Business/EnergyManagement/EnergyManagement.cs @@ -22,6 +22,7 @@ * *模块说明：水电信息类 */ +using SqlSugar; using System; namespace EOM.TSHotelManagement.Common.Core @@ -29,9 +30,15 @@ namespace EOM.TSHotelManagement.Common.Core /// /// 水电信息 /// - [SqlSugar.SugarTable("energy_management")] + [SqlSugar.SugarTable("energy_management", "水电信息")] public class EnergyManagement : BaseEntity { + /// + /// 编号 (ID) + /// + [SugarColumn(ColumnName = "id", IsIdentity = true, IsPrimaryKey = true, IsNullable = false, ColumnDescription = "编号 (ID)")] + public int Id { get; set; } + /// /// 信息编号 (Information ID) /// @@ -41,43 +48,43 @@ namespace EOM.TSHotelManagement.Common.Core /// /// 房间编号 (Room Number) /// - [SqlSugar.SugarColumn(ColumnName = "room_no")] + [SqlSugar.SugarColumn(ColumnName = "room_no", Length = 128, IsNullable = false, ColumnDescription = "房间编号 (Room Number)")] public string RoomNumber { get; set; } /// /// 开始使用时间 (Start Date) /// - [SqlSugar.SugarColumn(ColumnName = "use_date")] + [SqlSugar.SugarColumn(ColumnName = "use_date", IsNullable = false, ColumnDescription = "开始使用时间 (Start Date)")] public DateTime StartDate { get; set; } /// /// 结束使用时间 (End Date) /// - [SqlSugar.SugarColumn(ColumnName = "end_date")] + [SqlSugar.SugarColumn(ColumnName = "end_date", IsNullable = false, ColumnDescription = "结束使用时间 (End Date)")] public DateTime EndDate { get; set; } /// /// 水费 (Water Usage) /// - [SqlSugar.SugarColumn(ColumnName = "water_use")] + [SqlSugar.SugarColumn(ColumnName = "water_use", IsNullable = false, Length = 18, DecimalDigits = 2, ColumnDescription = "水费 (Water Usage)")] public decimal WaterUsage { get; set; } /// /// 电费 (Power Usage) /// - [SqlSugar.SugarColumn(ColumnName = "power_use")] + [SqlSugar.SugarColumn(ColumnName = "power_use", IsNullable = false, Length = 18, DecimalDigits = 2, ColumnDescription = "电费 (Power Usage)")] public decimal PowerUsage { get; set; } /// /// 记录员 (Recorder) /// - [SqlSugar.SugarColumn(ColumnName = "recorder", DefaultValue = "Administrator")] + [SqlSugar.SugarColumn(ColumnName = "recorder", DefaultValue = "Administrator", IsNullable = false, Length = 150, ColumnDescription = "记录员 (Recorder)")] public string Recorder { get; set; } /// /// 客户编号 (Customer Number) /// - [SqlSugar.SugarColumn(ColumnName = "custo_no")] + [SqlSugar.SugarColumn(ColumnName = "custo_no", IsNullable = false, Length = 128, ColumnDescription = "客户编号 (Customer Number)")] public string CustomerNumber { get; set; } } } diff --git a/EOM.TSHotelManagement.Common.Core/Business/PromotionContent/PromotionContent.cs b/EOM.TSHotelManagement.Common.Core/Business/PromotionContent/PromotionContent.cs index 456dd7f..c17de3b 100644 --- a/EOM.TSHotelManagement.Common.Core/Business/PromotionContent/PromotionContent.cs +++ b/EOM.TSHotelManagement.Common.Core/Business/PromotionContent/PromotionContent.cs @@ -22,25 +22,31 @@ * *模块说明：宣传联动类 */ +using SqlSugar; + namespace EOM.TSHotelManagement.Common.Core { /// - /// 酒店宣传联动内容 + /// APP横幅配置表 (APP Banner Configuration) /// - [SqlSugar.SugarTable("app_banner")] - public class PromotionContent + [SugarTable("app_banner", "APP横幅配置表 (APP Banner Configuration)")] + public class PromotionContent:BaseEntity { /// - /// 宣传内容编号 (Promotion Content ID) + /// 编号 (ID) /// - [SqlSugar.SugarColumn(ColumnName = "banner_number", IsPrimaryKey = true)] - public int PromotionContentId { get; set; } + [SugarColumn(ColumnName = "id", IsIdentity = true, IsPrimaryKey = true, IsNullable = false, ColumnDescription = "编号 (ID)")] + public int Id { get; set; } /// /// 宣传内容 (Promotion Content Message) /// - [SqlSugar.SugarColumn(ColumnName = "banner_content")] + [SugarColumn( + ColumnName = "banner_content", + ColumnDescription = "宣传内容（支持富文本） (Promotion Content with Rich Text)", + IsNullable = false, + Length = 2000 + )] public string PromotionContentMessage { get; set; } - } } diff --git a/EOM.TSHotelManagement.Common.Core/Business/Reser/Reser.cs b/EOM.TSHotelManagement.Common.Core/Business/Reser/Reser.cs index ffc47f6..a0c04a7 100644 --- a/EOM.TSHotelManagement.Common.Core/Business/Reser/Reser.cs +++ b/EOM.TSHotelManagement.Common.Core/Business/Reser/Reser.cs @@ -22,56 +22,119 @@ * *模块说明：预约类 */ +using SqlSugar; using System; namespace EOM.TSHotelManagement.Common.Core { /// - /// 预约列表 + /// 预约信息表 (Reservation Information) /// - [SqlSugar.SugarTable("reser")] + [SugarTable("reser", "预约信息表 (Reservation Information)")] public class Reser : BaseEntity { + /// + /// 编号 (ID) + /// + [SugarColumn(ColumnName = "id", IsIdentity = true, IsPrimaryKey = true, IsNullable = false, ColumnDescription = "编号 (ID)")] + public int Id { get; set; } + /// /// 预约编号 (Reservation ID) /// - [SqlSugar.SugarColumn(ColumnName = "reser_number", IsPrimaryKey = true)] + [SugarColumn( + ColumnName = "reser_number", + IsPrimaryKey = true, + ColumnDescription = "预约唯一编号 (Unique Reservation ID)", + IsNullable = false, + Length = 128 + )] public string ReservationId { get; set; } /// /// 客户名称 (Customer Name) /// - [SqlSugar.SugarColumn(ColumnName = "custo_name")] + [SugarColumn( + ColumnName = "custo_name", + ColumnDescription = "客户姓名 (Customer Full Name)", + IsNullable = false, + Length = 200 + )] public string CustomerName { get; set; } /// /// 预约电话 (Reservation Phone Number) /// - [SqlSugar.SugarColumn(ColumnName = "custo_tel")] + [SugarColumn( + ColumnName = "custo_tel", + ColumnDescription = "客户联系电话 (Contact Phone Number)", + IsNullable = false, + Length = 20 + )] public string ReservationPhoneNumber { get; set; } /// /// 预约渠道 (Reservation Channel) /// - [SqlSugar.SugarColumn(ColumnName = "reser_way")] + [SugarColumn( + ColumnName = "reser_way", + ColumnDescription = "预约来源渠道 (如官网/APP/第三方平台)", + IsNullable = false, + Length = 50 + )] public string ReservationChannel { get; set; } /// /// 预约房号 (Reservation Room Number) /// - [SqlSugar.SugarColumn(ColumnName = "reser_room")] + [SugarColumn( + ColumnName = "reser_room", + ColumnDescription = "预定房间编号 (关联房间表)", + IsNullable = false, + Length = 128, + IndexGroupNameList = new[] { "IX_reser_room" } + )] public string ReservationRoomNumber { get; set; } /// /// 预约起始日期 (Reservation Start Date) /// - [SqlSugar.SugarColumn(ColumnName = "reser_date")] + [SugarColumn( + ColumnName = "reser_date", + ColumnDescription = "入住日期（格式：yyyy-MM-dd） (Check-In Date)", + IsNullable = false + )] public DateTime ReservationStartDate { get; set; } /// /// 预约结束日期 (Reservation End Date) /// - [SqlSugar.SugarColumn(ColumnName = "reser_end_date")] + [SugarColumn( + ColumnName = "reser_end_date", + ColumnDescription = "离店日期（格式：yyyy-MM-dd） (Check-Out Date)", + IsNullable = false + )] public DateTime ReservationEndDate { get; set; } + + /// + /// 预约状态 (Reservation Status) + /// + [SugarColumn( + ColumnName = "reser_status", + ColumnDescription = "预约状态（0-待确认/1-已确认/2-已取消）", + DefaultValue = "0" + )] + public int ReservationStatus { get; set; } + + /// + /// 备注信息 (Remarks) + /// + [SugarColumn( + ColumnName = "remarks", + ColumnDescription = "特殊需求备注 (Special Requests)", + IsNullable = true, + Length = 500 + )] + public string Remarks { get; set; } } } diff --git a/EOM.TSHotelManagement.Common.Core/Business/Room/Room.cs b/EOM.TSHotelManagement.Common.Core/Business/Room/Room.cs index f595f8a..ea5783a 100644 --- a/EOM.TSHotelManagement.Common.Core/Business/Room/Room.cs +++ b/EOM.TSHotelManagement.Common.Core/Business/Room/Room.cs @@ -29,33 +29,54 @@ using System; namespace EOM.TSHotelManagement.Common.Core { /// - /// 房间实体类 (Room Entity) + /// 酒店房间信息表 (Hotel Room Information) /// - [SugarTable("room")] + [SugarTable("room", "酒店房间信息表 (Hotel Room Information)")] public class Room : BaseEntity { + /// + /// 编号 (ID) + /// + [SugarColumn(ColumnName = "id", IsIdentity = true, IsPrimaryKey = true, IsNullable = false, ColumnDescription = "编号 (ID)")] + public int Id { get; set; } + /// /// 房间编号 (Room Number) /// - [SugarColumn(ColumnName = "room_no", IsPrimaryKey = true)] - [NeedValid] + [SugarColumn( + ColumnName = "room_no", + IsPrimaryKey = true, + ColumnDescription = "房间唯一编号 (Unique Room Number)", + IsNullable = false, + Length = 128 + )] + [NeedValid] // 假设此特性用于业务验证 public string RoomNumber { get; set; } /// - /// 房间类型 (Room Type) + /// 房间类型ID (Room Type ID) /// - [SugarColumn(ColumnName = "room_type")] + [SugarColumn( + ColumnName = "room_type", + ColumnDescription = "房间类型ID (关联房间类型表)", + IsNullable = false + )] [NeedValid] public int RoomTypeId { get; set; } /// /// 客户编号 (Customer Number) /// - [SugarColumn(ColumnName = "custo_no")] + [SugarColumn( + ColumnName = "custo_no", + ColumnDescription = "当前入住客户编号 (Linked Customer ID)", + IsNullable = true, + Length = 128 + )] public string CustomerNumber { get; set; } /// - /// 客户姓名 (Customer Name) + /// 客户姓名 (Customer Name)（不存储到数据库） /// [SugarColumn(IsIgnore = true)] public string CustomerName { get; set; } @@ -63,24 +84,36 @@ namespace EOM.TSHotelManagement.Common.Core /// /// 最后一次入住时间 (Last Check-In Time) /// - [SugarColumn(ColumnName = "check_in_time")] + [SugarColumn( + ColumnName = "check_in_time", + ColumnDescription = "最后一次入住时间 (Last Check-In Time)", + IsNullable = true + )] public DateTime? LastCheckInTime { get; set; } /// /// 最后一次退房时间 (Last Check-Out Time) /// - [SugarColumn(ColumnName = "check_out_time")] + [SugarColumn( + ColumnName = "check_out_time", + ColumnDescription = "最后一次退房时间 (Last Check-Out Time)", + IsNullable = true + )] public DateTime? LastCheckOutTime { get; set; } /// /// 房间状态ID (Room State ID) /// - [SugarColumn(ColumnName = "room_state_id")] + [SugarColumn( + ColumnName = "room_state_id", + ColumnDescription = "房间状态ID (如0-空闲/1-已入住)", + IsNullable = false + )] [NeedValid] public int RoomStateId { get; set; } /// - /// 房间状态 (Room State) + /// 房间状态名称 (Room State Name)（不存储到数据库） /// [SugarColumn(IsIgnore = true)] public string RoomState { get; set; } @@ -88,38 +121,54 @@ namespace EOM.TSHotelManagement.Common.Core /// /// 房间单价 (Room Rent) /// - [SugarColumn(ColumnName = "room_rent")] + [SugarColumn( + ColumnName = "room_rent", + ColumnDescription = "房间单价（单位：元） (Price per Night in CNY)", + IsNullable = false, + DecimalDigits = 2 + )] [NeedValid] public decimal RoomRent { get; set; } /// /// 房间押金 (Room Deposit) /// - [SugarColumn(ColumnName = "room_deposit")] + [SugarColumn( + ColumnName = "room_deposit", + ColumnDescription = "房间押金（单位：元） (Deposit Amount in CNY)", + IsNullable = false, + DecimalDigits = 2, + DefaultValue = "0.00" + )] [NeedValid] public decimal RoomDeposit { get; set; } /// /// 房间位置 (Room Location) /// - [SugarColumn(ColumnName = "room_position")] + [SugarColumn( + ColumnName = "room_position", + ColumnDescription = "房间位置描述 (如楼层+门牌号)", + IsNullable = false, + Length = 200 + )] [NeedValid] public string RoomLocation { get; set; } /// - /// 客户类型名称 (Customer Type Name) + /// 客户类型名称 (Customer Type Name)（不存储到数据库） /// [SugarColumn(IsIgnore = true)] public string CustomerTypeName { get; set; } /// - /// 房间名称 (Room Name) + /// 房间名称 (Room Name)（不存储到数据库） /// [SugarColumn(IsIgnore = true)] public string RoomName { get; set; } /// - /// 最后一次入住时间 (格式化后的字符串) (Last Check-In Time Formatted) + /// 最后一次入住时间（格式化字符串） (Last Check-In Time Formatted) /// [SugarColumn(IsIgnore = true)] public string LastCheckInTimeFormatted { get; set; } diff --git a/EOM.TSHotelManagement.Common.Core/Business/Room/RoomType.cs b/EOM.TSHotelManagement.Common.Core/Business/Room/RoomType.cs index d314070..d9c1205 100644 --- a/EOM.TSHotelManagement.Common.Core/Business/Room/RoomType.cs +++ b/EOM.TSHotelManagement.Common.Core/Business/Room/RoomType.cs @@ -28,41 +28,70 @@ using SqlSugar; namespace EOM.TSHotelManagement.Common.Core { /// - /// 房间类型 (Room Type) + /// 房间类型配置表 (Room Type Configuration) /// - [SugarTable("room_type")] + [SugarTable("room_type", "房间类型配置表 (Room Type Configuration)")] public class RoomType : BaseEntity { + /// + /// 编号 (ID) + /// + [SugarColumn(ColumnName = "id", IsIdentity = true, IsPrimaryKey = true, IsNullable = false, ColumnDescription = "编号 (ID)")] + public int Id { get; set; } + /// /// 类型编号 (Room Type ID) /// - [SugarColumn(ColumnName = "room_type", IsPrimaryKey = true)] - [NeedValid] + [SugarColumn( + ColumnName = "room_type", + IsPrimaryKey = true, + ColumnDescription = "房间类型唯一编号 (Unique Room Type ID)", + IsNullable = false + )] + [NeedValid] public int RoomTypeId { get; set; } /// /// 房间类型名称 (Room Type Name) /// - [SugarColumn(ColumnName = "room_name")] + [SugarColumn( + ColumnName = "room_name", + ColumnDescription = "房间类型名称 (如标准间/豪华套房)", + IsNullable = false, + Length = 200 + )] [NeedValid] public string RoomTypeName { get; set; } /// /// 房间租金 (Room Rent) /// - [SugarColumn(ColumnName = "room_rent", ColumnDataType = "decimal")] + [SugarColumn( + ColumnName = "room_rent", + Length = 18, + ColumnDescription = "每日租金（单位：元） (Price per Day in CNY)", + IsNullable = false, + DecimalDigits = 2 + )] [NeedValid] public decimal RoomRent { get; set; } /// /// 房间押金 (Room Deposit) /// - [SugarColumn(ColumnName = "room_deposit")] + [SugarColumn( + ColumnName = "room_deposit", + Length = 18, + ColumnDescription = "入住押金（单位：元） (Deposit Amount in CNY)", + IsNullable = false, + DecimalDigits = 2, + DefaultValue = "0.00" + )] [NeedValid] public decimal RoomDeposit { get; set; } /// - /// 删除标记描述 (Delete Mark Description) + /// 删除标记描述 (Delete Mark Description)（不存储到数据库） /// [SugarColumn(IsIgnore = true)] public string DeleteMarkDescription { get; set; } diff --git a/EOM.TSHotelManagement.Common.Core/Business/Sellthing/SellThing.cs b/EOM.TSHotelManagement.Common.Core/Business/Sellthing/SellThing.cs index b2eaf53..9d40a9a 100644 --- a/EOM.TSHotelManagement.Common.Core/Business/Sellthing/SellThing.cs +++ b/EOM.TSHotelManagement.Common.Core/Business/Sellthing/SellThing.cs @@ -29,31 +29,54 @@ using SqlSugar; namespace EOM.TSHotelManagement.Common.Core { /// - /// 商品信息 (Product Information) + /// 商品信息表 (Product Information) /// - [SugarTable("sellthing")] + [SugarTable("sellthing", "商品信息表 (Product Information)")] public class SellThing : BaseEntity { + /// + /// 编号 (ID) + /// + [SugarColumn(ColumnName = "id", IsIdentity = true, IsPrimaryKey = true, IsNullable = false, ColumnDescription = "编号 (ID)")] + public int Id { get; set; } + /// /// 商品编号 (Product Number) /// - [SugarColumn(ColumnName = "sell_no", IsPrimaryKey = true)] + [SugarColumn( + ColumnName = "sell_no", + IsPrimaryKey = true, + ColumnDescription = "商品唯一编号 (Unique Product ID)", + IsNullable = false, + Length = 128 + )] public string ProductNumber { get; set; } /// /// 商品名称 (Product Name) /// - [SugarColumn(ColumnName = "sell_name")] + [SugarColumn( + ColumnName = "sell_name", + ColumnDescription = "商品名称（如『西湖龙井茶叶500g』）", + IsNullable = false, + Length = 500 + )] public string ProductName { get; set; } /// /// 商品价格 (Product Price) /// - [SugarColumn(ColumnName = "sell_price")] + [SugarColumn( + ColumnName = "sell_price", + Length = 18, + ColumnDescription = "商品单价（单位：元）", + IsNullable = false, + DecimalDigits = 2 + )] public decimal ProductPrice { get; set; } /// - /// 商品价格描述 (Product Price Description - Formatted) + /// 商品价格描述（格式化显示，如￥100.00） (Formatted Price) /// [SugarColumn(IsIgnore = true)] public string ProductPriceFormatted { get; set; } @@ -61,13 +84,24 @@ namespace EOM.TSHotelManagement.Common.Core /// /// 规格型号 (Specification) /// - [SugarColumn(ColumnName = "specification")] + [SugarColumn( + ColumnName = "specification", + ColumnDescription = "规格描述（如『500g/罐，陶瓷包装』）", + IsNullable = true, + Length = 1000 + )] public string Specification { get; set; } /// - /// 库存 (Stock) + /// 库存数量 (Stock Quantity) /// - [SugarColumn(ColumnName = "stock")] + [SugarColumn( + ColumnName = "stock", + ColumnDescription = "当前库存数量（单位：件/个）", + IsNullable = false, + DecimalDigits = 0, + DefaultValue = "0" + )] public decimal Stock { get; set; } } diff --git a/EOM.TSHotelManagement.Common.Core/Employee/Employee.cs b/EOM.TSHotelManagement.Common.Core/Employee/Employee.cs index 32c5f32..012d814 100644 --- a/EOM.TSHotelManagement.Common.Core/Employee/Employee.cs +++ b/EOM.TSHotelManagement.Common.Core/Employee/Employee.cs @@ -33,28 +33,34 @@ namespace EOM.TSHotelManagement.Common.Core [SugarTable("employee")] public class Employee : BaseEntity { + /// + /// 编号 (ID) + /// + [SugarColumn(ColumnName = "id", IsIdentity = true, IsPrimaryKey = true, IsNullable = false, ColumnDescription = "编号 (ID)")] + public int Id { get; set; } + /// /// 员工账号/工号 (Employee Account/ID) /// - [SugarColumn(ColumnName = "employee_number", IsPrimaryKey = true)] + [SugarColumn(ColumnName = "employee_number", IsPrimaryKey = true, IsNullable = false, Length = 128, ColumnDescription = "员工账号/工号 (Employee Account/ID)")] public string EmployeeId { get; set; } /// /// 员工姓名 (Employee Name) /// - [SugarColumn(ColumnName = "employee_name")] + [SugarColumn(ColumnName = "employee_name", IsNullable = false, Length = 250, ColumnDescription = "员工姓名 (Employee Name)")] public string EmployeeName { get; set; } /// /// 出生日期 (Date of Birth) /// - [SugarColumn(ColumnName = "employee_date_of_birth")] - public DateTime DateOfBirth { get; set; } + [SugarColumn(ColumnName = "employee_date_of_birth", IsNullable = false, ColumnDescription = "出生日期 (Date of Birth)")] + public DateOnly DateOfBirth { get; set; } /// /// 员工性别 (Employee Gender) /// - [SugarColumn(ColumnName = "employee_gender")] + [SugarColumn(ColumnName = "employee_gender", IsNullable = false, ColumnDescription = "员工性别 (Employee Gender)")] public int Gender { get; set; } /// @@ -66,7 +72,7 @@ namespace EOM.TSHotelManagement.Common.Core /// /// 民族类型 (Ethnicity) /// - [SugarColumn(ColumnName = "employee_nation")] + [SugarColumn(ColumnName = "employee_nation", IsNullable = false, Length = 128, ColumnDescription = "民族类型 (Ethnicity)")] public string Ethnicity { get; set; } /// @@ -78,13 +84,13 @@ namespace EOM.TSHotelManagement.Common.Core /// /// 员工电话 (Employee Phone Number) /// - [SugarColumn(ColumnName = "employee_tel")] + [SugarColumn(ColumnName = "employee_tel", IsNullable = false, Length = 256, ColumnDescription = "员工电话 (Employee Phone Number)")] public string PhoneNumber { get; set; } /// /// 所属部门 (Department) /// - [SugarColumn(ColumnName = "employee_department")] + [SugarColumn(ColumnName = "employee_department", IsNullable = false, Length = 128, ColumnDescription = "所属部门 (Department)")] public string Department { get; set; } /// @@ -96,13 +102,13 @@ namespace EOM.TSHotelManagement.Common.Core /// /// 居住地址 (Residential Address) /// - [SugarColumn(ColumnName = "employee_address")] + [SugarColumn(ColumnName = "employee_address", IsNullable = true, Length = 500, ColumnDescription = "居住地址 (Residential Address)")] public string Address { get; set; } /// /// 员工职位 (Employee Position) /// - [SugarColumn(ColumnName = "employee_postion")] + [SugarColumn(ColumnName = "employee_postion", IsNullable = false, Length = 128, ColumnDescription = "员工职位 (Employee Position)")] public string Position { get; set; } /// @@ -114,31 +120,31 @@ namespace EOM.TSHotelManagement.Common.Core /// /// 证件类型 (ID Card Type) /// - [SugarColumn(ColumnName = "card_type")] + [SugarColumn(ColumnName = "card_type", IsNullable = false, ColumnDescription = "证件类型 (ID Card Type)")] public int IdCardType { get; set; } /// /// 证件号码 (ID Card Number) /// - [SugarColumn(ColumnName = "card_number")] + [SugarColumn(ColumnName = "card_number", IsNullable = false, Length = 256, ColumnDescription = "证件号码 (ID Card Number)")] public string IdCardNumber { get; set; } /// /// 员工密码 (Employee Password) /// - [SugarColumn(ColumnName = "employee_password")] + [SugarColumn(ColumnName = "employee_password", IsNullable = false, Length = 256, ColumnDescription = "员工密码 (Employee Password)")] public string Password { get; set; } /// /// 员工入职时间 (Hire Date) /// - [SugarColumn(ColumnName = "hire_time")] - public DateTime HireDate { get; set; } + [SugarColumn(ColumnName = "hire_time", IsNullable = false, ColumnDescription = "员工入职时间 (Hire Date)")] + public DateOnly HireDate { get; set; } /// /// 员工面貌 (Political Affiliation) /// - [SugarColumn(ColumnName = "employee_political")] + [SugarColumn(ColumnName = "employee_political", IsNullable = false, Length = 128, ColumnDescription = "员工面貌 (Political Affiliation)")] public string PoliticalAffiliation { get; set; } /// @@ -156,7 +162,7 @@ namespace EOM.TSHotelManagement.Common.Core /// /// 教育程度 (Education Level) /// - [SugarColumn(ColumnName = "employee_quality")] + [SugarColumn(ColumnName = "employee_quality", IsNullable = false, Length = 128, ColumnDescription = "教育程度 (Education Level)")] public string EducationLevel { get; set; } /// @@ -168,13 +174,13 @@ namespace EOM.TSHotelManagement.Common.Core /// /// 禁用标记 /// - [SugarColumn(ColumnName = "enable_mk")] - public int IsEnable { get; set; } + [SugarColumn(ColumnName = "enable_mk", IsNullable = false, ColumnDescription = "禁用标记")] + public int IsEnable { get; set; } = 0; /// /// 邮箱地址 /// - [SugarColumn(ColumnName = "email_address")] + [SugarColumn(ColumnName = "email_address", IsNullable = false, Length = 256, ColumnDescription = "邮箱地址")] public string EmailAddress { get; set; } } } diff --git a/EOM.TSHotelManagement.Common.Core/Employee/EmployeeCheck.cs b/EOM.TSHotelManagement.Common.Core/Employee/EmployeeCheck.cs index 99c76a9..79c3dca 100644 --- a/EOM.TSHotelManagement.Common.Core/Employee/EmployeeCheck.cs +++ b/EOM.TSHotelManagement.Common.Core/Employee/EmployeeCheck.cs @@ -30,36 +30,42 @@ namespace EOM.TSHotelManagement.Common.Core /// /// 员工打卡考勤 (Employee Check-in/Check-out Record) /// - [SugarTable("employee_check")] + [SugarTable("employee_check", "员工打卡考勤 (Employee Check-in/Check-out Record)")] public class EmployeeCheck : BaseEntity { + /// + /// 编号 (ID) + /// + [SugarColumn(ColumnName = "id", IsIdentity = true, IsPrimaryKey = true, IsNullable = false, ColumnDescription = "编号 (ID)")] + public int Id { get; set; } + /// /// 打卡编号 /// - [SugarColumn(ColumnName = "check_number")] + [SugarColumn(ColumnName = "check_number", Length = 128, ColumnDescription = "打卡编号", IsPrimaryKey = true, IsNullable = false)] public string CheckNumber { get; set; } /// /// 员工工号 (Employee ID) /// - [SugarColumn(ColumnName = "employee_number")] + [SugarColumn(ColumnName = "employee_number", Length = 128, ColumnDescription = "员工工号 (Employee ID)", IsNullable = false)] public string EmployeeId { get; set; } /// /// 打卡时间 (Check-in/Check-out Time) /// - [SugarColumn(ColumnName = "check_time")] + [SugarColumn(ColumnName = "check_time", ColumnDescription = "打卡时间 (Check-in/Check-out Time)", IsNullable = false)] public DateTime CheckTime { get; set; } /// /// 打卡方式 (Check-in/Check-out Method) /// - [SugarColumn(ColumnName = "check_way")] + [SugarColumn(ColumnName = "check_way", Length = 128, ColumnDescription = "打卡方式 (Check-in/Check-out Method)", IsNullable = true)] public string CheckMethod { get; set; } /// /// 打卡状态 (Check-in/Check-out Status) /// - [SugarColumn(ColumnName = "check_state")] + [SugarColumn(ColumnName = "check_state", ColumnDescription = "打卡状态 (Check-in/Check-out Status)", IsNullable = false)] public int CheckStatus { get; set; } /// diff --git a/EOM.TSHotelManagement.Common.Core/Employee/EmployeeHistory.cs b/EOM.TSHotelManagement.Common.Core/Employee/EmployeeHistory.cs index 93c49c4..f5ba6fd 100644 --- a/EOM.TSHotelManagement.Common.Core/Employee/EmployeeHistory.cs +++ b/EOM.TSHotelManagement.Common.Core/Employee/EmployeeHistory.cs @@ -33,39 +33,45 @@ namespace EOM.TSHotelManagement.Common.Core [SugarTable("employee_history")] public class EmployeeHistory : BaseEntity { + /// + /// 编号 (ID) + /// + [SugarColumn(ColumnName = "id", IsIdentity = true, IsPrimaryKey = true, IsNullable = false, ColumnDescription = "编号 (ID)")] + public int Id { get; set; } + /// /// 履历编号 /// - [SugarColumn(ColumnName = "history_number")] + [SugarColumn(ColumnName = "history_number", ColumnDescription = "履历编号", Length = 128, IsNullable = false, IsPrimaryKey = true)] public string HistoryNumber { get; set; } /// /// 员工工号 (Employee ID) /// - [SugarColumn(ColumnName = "employee_number")] + [SugarColumn(ColumnName = "employee_number", ColumnDescription = "员工工号 (Employee ID)", Length = 128, IsNullable = false)] public string EmployeeId { get; set; } /// /// 开始时间 (Start Date) /// - [SugarColumn(ColumnName = "start_date")] - public DateTime StartDate { get; set; } + [SugarColumn(ColumnName = "start_date", ColumnDescription = "开始时间 (Start Date)", IsNullable = false)] + public DateOnly StartDate { get; set; } /// /// 结束时间 (End Date) /// - [SugarColumn(ColumnName = "end_date")] - public DateTime EndDate { get; set; } + [SugarColumn(ColumnName = "end_date", ColumnDescription = "结束时间 (End Date)", IsNullable = false)] + public DateOnly EndDate { get; set; } /// /// 职位 (Position) /// - [SugarColumn(ColumnName = "position")] + [SugarColumn(ColumnName = "position", ColumnDescription = "职位 (Position)", Length = 128, IsNullable = true)] public string Position { get; set; } /// /// 公司 (Company) /// - [SugarColumn(ColumnName = "company")] + [SugarColumn(ColumnName = "company", ColumnDescription = "公司 (Company)", Length = 256, IsNullable = true)] public string Company { get; set; } } } diff --git a/EOM.TSHotelManagement.Common.Core/Employee/EmployeePhoto.cs b/EOM.TSHotelManagement.Common.Core/Employee/EmployeePhoto.cs index d5fb746..8bdb765 100644 --- a/EOM.TSHotelManagement.Common.Core/Employee/EmployeePhoto.cs +++ b/EOM.TSHotelManagement.Common.Core/Employee/EmployeePhoto.cs @@ -5,19 +5,25 @@ namespace EOM.TSHotelManagement.Common.Core /// /// 员工照片 (Employee Photo) /// - [SugarTable("employee_pic")] - public class EmployeePhoto + [SugarTable("employee_pic", "员工照片 (Employee Photo)")] + public class EmployeePhoto:BaseEntity { + /// + /// 编号 (ID) + /// + [SugarColumn(ColumnName = "id", IsIdentity = true, IsPrimaryKey = true, IsNullable = false, ColumnDescription = "编号 (ID)")] + public int Id { get; set; } + /// /// 员工工号 (Employee ID) /// - [SugarColumn(ColumnName = "employee_number")] + [SugarColumn(ColumnName = "employee_number", ColumnDescription = "员工工号 (Employee ID)", Length = 128, IsNullable = false, IsPrimaryKey = true)] public string EmployeeId { get; set; } /// /// 照片路径 (Photo Path) /// - [SugarColumn(ColumnName = "pic_url")] + [SugarColumn(ColumnName = "pic_url", ColumnDescription = "照片路径 (Photo Path)", Length = 256, IsNullable = true)] public string PhotoPath { get; set; } } } diff --git a/EOM.TSHotelManagement.Common.Core/Employee/EmployeeRewardPunishment.cs b/EOM.TSHotelManagement.Common.Core/Employee/EmployeeRewardPunishment.cs index 8b9f5b6..cb94fd4 100644 --- a/EOM.TSHotelManagement.Common.Core/Employee/EmployeeRewardPunishment.cs +++ b/EOM.TSHotelManagement.Common.Core/Employee/EmployeeRewardPunishment.cs @@ -30,31 +30,42 @@ namespace EOM.TSHotelManagement.Common.Core /// /// 员工奖惩 (Employee Rewards/Punishments) /// - [SugarTable("reward_punishment")] + [SugarTable("reward_punishment", "员工奖惩 (Employee Rewards/Punishments)")] public class EmployeeRewardPunishment : BaseEntity { + /// + /// 编号 (ID) + /// + [SugarColumn(ColumnName = "id", IsIdentity = true, IsPrimaryKey = true, IsNullable = false, ColumnDescription = "编号 (ID)")] + public int Id { get; set; } + + /// + /// 奖惩编号 (Reward/Punishment ID) + /// + [SugarColumn(ColumnName = "reward_punishment_id", IsPrimaryKey = true, IsNullable = false, Length = 128, ColumnDescription = "奖惩编号 (Reward/Punishment ID)")] + public string RewardPunishmentId { get; set; } /// /// 员工工号 (Employee ID) /// - [SugarColumn(ColumnName = "employee_number")] + [SugarColumn(ColumnName = "employee_number", IsNullable = false, Length = 128, ColumnDescription = "员工工号 (Employee ID)")] public string EmployeeId { get; set; } /// /// 奖惩信息 (Reward/Punishment Information) /// - [SugarColumn(ColumnName = "reward_punishment_information")] + [SugarColumn(ColumnName = "reward_punishment_information", IsNullable = false, Length = 256, ColumnDescription = "奖惩信息 (Reward/Punishment Information)")] public string RewardPunishmentInformation { get; set; } /// /// 奖惩类型 (Reward/Punishment Type) /// - [SugarColumn(ColumnName = "reward_punishment_type")] + [SugarColumn(ColumnName = "reward_punishment_type", IsNullable = false, Length = 128, ColumnDescription = "奖惩类型 (Reward/Punishment Type)")] public string RewardPunishmentType { get; set; } /// /// 奖惩操作人 (Reward/Punishment Operator) /// - [SugarColumn(ColumnName = "reward_punishment_operator")] + [SugarColumn(ColumnName = "reward_punishment_operator", IsNullable = false, Length = 128, ColumnDescription = "奖惩操作人 (Reward/Punishment Operator)")] public string RewardPunishmentOperator { get; set; } /// @@ -66,7 +77,7 @@ namespace EOM.TSHotelManagement.Common.Core /// /// 奖惩时间 (Reward/Punishment Time) /// - [SugarColumn(ColumnName = "reward_punishment_time")] + [SugarColumn(ColumnName = "reward_punishment_time", IsNullable = false, ColumnDescription = "奖惩时间 (Reward/Punishment Time)")] public DateTime RewardPunishmentTime { get; set; } /// diff --git a/EOM.TSHotelManagement.Common.Core/Employee/RewardPunishmentType.cs b/EOM.TSHotelManagement.Common.Core/Employee/RewardPunishmentType.cs index b47b5b5..ccb7107 100644 --- a/EOM.TSHotelManagement.Common.Core/Employee/RewardPunishmentType.cs +++ b/EOM.TSHotelManagement.Common.Core/Employee/RewardPunishmentType.cs @@ -28,21 +28,38 @@ using SqlSugar; namespace EOM.TSHotelManagement.Common.Core { /// - /// 奖惩类型实体类 (Reward/Punishment Type Entity) + /// 奖惩类型配置表 (Reward/Punishment Type Configuration) /// - [SugarTable("reward_punishment_type")] + [SugarTable("reward_punishment_type", "奖惩类型配置表 (Reward/Punishment Type Configuration)")] public class RewardPunishmentType : BaseEntity { + /// + /// 编号 (ID) + /// + [SugarColumn(ColumnName = "id", IsIdentity = true, IsPrimaryKey = true, IsNullable = false, ColumnDescription = "编号 (ID)")] + public int Id { get; set; } + /// /// 奖惩类型编号 (Reward/Punishment Type ID) /// - [SugarColumn(ColumnName = "reward_punishment_type_number", IsPrimaryKey = true)] + [SugarColumn( + ColumnName = "reward_punishment_type_number", + IsPrimaryKey = true, + ColumnDescription = "奖惩类型唯一编号 (Unique Reward/Punishment Type ID)", + IsNullable = false, + Length = 128 + )] public string RewardPunishmentTypeId { get; set; } /// /// 奖惩类型名称 (Reward/Punishment Type Name) /// - [SugarColumn(ColumnName = "reward_punishment_type_name")] + [SugarColumn( + ColumnName = "reward_punishment_type_name", + ColumnDescription = "奖惩类型名称（如优秀员工奖/迟到警告）", + IsNullable = false, + Length = 200 + )] public string RewardPunishmentTypeName { get; set; } } } \ No newline at end of file diff --git a/EOM.TSHotelManagement.Common.Core/Sys/NavBar/NavBar.cs b/EOM.TSHotelManagement.Common.Core/Sys/NavBar/NavBar.cs index c84b61c..cc65499 100644 --- a/EOM.TSHotelManagement.Common.Core/Sys/NavBar/NavBar.cs +++ b/EOM.TSHotelManagement.Common.Core/Sys/NavBar/NavBar.cs @@ -3,45 +3,70 @@ namespace EOM.TSHotelManagement.Common.Core { /// - /// 导航控件实体类 (Navigation Bar Entity) + /// 导航栏配置表 (Navigation Bar Configuration) /// - [SugarTable("nav_bar")] + [SugarTable("nav_bar", "导航栏配置表 (Navigation Bar Configuration)", true)] public class NavBar : BaseEntity { /// - /// 导航控件ID (Navigation Bar ID) + /// 编号 (ID) /// - [SugarColumn(IsIdentity = true, ColumnName = "nav_id", IsPrimaryKey = true)] - public int NavigationBarId { get; set; } + [SugarColumn(ColumnName = "id", IsIdentity = true, IsPrimaryKey = true, IsNullable = false, ColumnDescription = "编号 (ID)")] + public int Id { get; set; } /// /// 导航控件名称 (Navigation Bar Name) /// - [SugarColumn(ColumnName = "nav_name")] + [SugarColumn( + ColumnName = "nav_name", + ColumnDescription = "导航控件名称 (Navigation Bar Name)", + IsNullable = false, + Length = 50 + )] public string NavigationBarName { get; set; } /// /// 导航控件排序 (Navigation Bar Order) /// - [SugarColumn(ColumnName = "nav_or")] + [SugarColumn( + ColumnName = "nav_or", + ColumnDescription = "导航控件排序 (Navigation Bar Order)", + IsNullable = false, + DefaultValue = "0" + )] public int NavigationBarOrder { get; set; } /// /// 导航控件图片 (Navigation Bar Image) /// - [SugarColumn(ColumnName = "nav_pic")] + [SugarColumn( + ColumnName = "nav_pic", + ColumnDescription = "导航控件图片路径 (Navigation Bar Image Path)", + IsNullable = true, + Length = 255 + )] public string NavigationBarImage { get; set; } /// /// 导航控件事件 (Navigation Bar Event) /// - [SugarColumn(ColumnName = "nav_event")] + [SugarColumn( + ColumnName = "nav_event", + ColumnDescription = "导航控件事件标识 (Navigation Bar Event Identifier)", + IsNullable = true, + Length = 200 + )] public string NavigationBarEvent { get; set; } /// /// 导航控件左边距 (Navigation Bar Margin Left) /// - [SugarColumn(ColumnName = "margin_left")] + [SugarColumn( + ColumnName = "margin_left", + ColumnDescription = "导航控件左边距像素值 (Margin Left in Pixels)", + IsNullable = false, + DefaultValue = "0" + )] public int MarginLeft { get; set; } } } diff --git a/EOM.TSHotelManagement.Common.Core/SystemManagement/Administrator.cs b/EOM.TSHotelManagement.Common.Core/SystemManagement/Administrator.cs index 34de428..223d680 100644 --- a/EOM.TSHotelManagement.Common.Core/SystemManagement/Administrator.cs +++ b/EOM.TSHotelManagement.Common.Core/SystemManagement/Administrator.cs @@ -30,21 +30,20 @@ namespace EOM.TSHotelManagement.Common.Core /// /// 管理员实体类 (Administrator Entity) /// - [SugarTable("administrator")] + [SugarTable("administrator", "管理员实体类 (Administrator Entity)", true)] public class Administrator : BaseEntity { /// - /// 构造函数 (Constructor) + /// 编号 (ID) /// - public Administrator() - { - } + [SugarColumn(ColumnName = "id", IsIdentity = true, IsPrimaryKey = true, IsNullable = false, ColumnDescription = "编号 (ID)")] + public int Id { get; set; } /// /// 管理员账号 (Administrator Account) /// [UIDisplay("管理员账号")] - [SugarColumn(ColumnName = "admin_number", IsNullable = false)] + [SugarColumn(ColumnName = "admin_number", IsPrimaryKey = true, IsNullable = false, Length = 128, ColumnDescription = "管理员账号 (Administrator Account)")] [NeedValid] public string Number { get; set; } @@ -52,21 +51,21 @@ namespace EOM.TSHotelManagement.Common.Core /// 管理员账号 (Administrator Account) /// [UIDisplay("管理员账号")] - [SugarColumn(ColumnName = "admin_account", IsNullable = false)] + [SugarColumn(ColumnName = "admin_account", IsNullable = false, Length = 128, ColumnDescription = "管理员名称 (Administrator Name)")] [NeedValid] public string Account { get; set; } /// /// 管理员密码 (Administrator Password) /// - [SugarColumn(ColumnName = "admin_password", IsNullable = false)] + [SugarColumn(ColumnName = "admin_password", IsNullable = false, Length = 256, ColumnDescription = "管理员密码 (Administrator Password)")] [NeedValid] public string Password { get; set; } /// /// 管理员类型 (Administrator Type) /// - [SugarColumn(ColumnName = "admin_type", IsNullable = false)] + [SugarColumn(ColumnName = "admin_type", IsNullable = false, Length = 150, ColumnDescription = "管理员类型 (Administrator Type)")] [NeedValid] public string Type { get; set; } @@ -74,7 +73,7 @@ namespace EOM.TSHotelManagement.Common.Core /// 管理员名称 (Administrator Name) /// [UIDisplay("管理员名称")] - [SugarColumn(ColumnName = "admin_name", IsNullable = false)] + [SugarColumn(ColumnName = "admin_name", IsNullable = false, Length = 200, ColumnDescription = "管理员名称 (Administrator Name)")] [NeedValid] public string Name { get; set; } @@ -82,7 +81,7 @@ namespace EOM.TSHotelManagement.Common.Core /// 是否为超级管理员 (Is Super Administrator) /// [UIDisplay("超级管理员？")] - [SugarColumn(ColumnName = "is_admin")] + [SugarColumn(ColumnName = "is_admin", IsNullable = false, ColumnDescription = "是否为超级管理员 (Is Super Administrator)")] public int IsSuperAdmin { get; set; } /// diff --git a/EOM.TSHotelManagement.Common.Core/SystemManagement/AdministratorType.cs b/EOM.TSHotelManagement.Common.Core/SystemManagement/AdministratorType.cs index 6034ee6..94f0e10 100644 --- a/EOM.TSHotelManagement.Common.Core/SystemManagement/AdministratorType.cs +++ b/EOM.TSHotelManagement.Common.Core/SystemManagement/AdministratorType.cs @@ -29,19 +29,25 @@ namespace EOM.TSHotelManagement.Common.Core /// /// 管理员类型 (Administrator Type) /// - [SugarTable("administrator_type")] + [SugarTable("administrator_type", "管理员类型 (Administrator Type)", true)] public class AdministratorType : BaseEntity { + /// + /// 编号 (ID) + /// + [SugarColumn(ColumnName = "id", IsIdentity = true, IsPrimaryKey = true, IsNullable = false, ColumnDescription = "编号 (ID)")] + public int Id { get; set; } + /// /// 类型编号 (Type ID) /// - [SugarColumn(ColumnName = "type_id")] + [SugarColumn(ColumnName = "type_id", IsPrimaryKey = true, IsNullable = false, Length = 128, ColumnDescription = "类型编号 (Type ID)")] public string TypeId { get; set; } /// /// 类型名称 (Type Name) /// - [SugarColumn(ColumnName = "type_name")] + [SugarColumn(ColumnName = "type_name", Length = 256, IsNullable = false, ColumnDescription = "类型名称 (Type Name)")] public string TypeName { get; set; } } } diff --git a/EOM.TSHotelManagement.Common.Core/SystemManagement/AppointmentNotice.cs b/EOM.TSHotelManagement.Common.Core/SystemManagement/AppointmentNotice.cs index 096b6a6..ea62dc2 100644 --- a/EOM.TSHotelManagement.Common.Core/SystemManagement/AppointmentNotice.cs +++ b/EOM.TSHotelManagement.Common.Core/SystemManagement/AppointmentNotice.cs @@ -33,22 +33,28 @@ namespace EOM.TSHotelManagement.Common.Core [SugarTable("appointment_notice")] public class AppointmentNotice : BaseEntity { + /// + /// 编号 (ID) + /// + [SugarColumn(ColumnName = "id", IsIdentity = true, IsPrimaryKey = true, IsNullable = false, ColumnDescription = "编号 (ID)")] + public int Id { get; set; } + /// /// 公告编号 (AppointmentNotice Number) /// - [SugarColumn(ColumnName = "notice_no", IsPrimaryKey = true)] + [SugarColumn(ColumnName = "notice_no", IsPrimaryKey = true, IsNullable = false, Length = 128, ColumnDescription = "公告编号 (AppointmentNotice Number)")] public string NoticeNumber { get; set; } /// /// 公告主题 (AppointmentNotice Theme) /// - [SugarColumn(ColumnName = "notice_theme")] + [SugarColumn(ColumnName = "notice_theme", IsNullable = false, Length = 256, ColumnDescription = "公告主题 (AppointmentNotice Theme)")] public string NoticeTheme { get; set; } /// /// 公告类型 (AppointmentNotice Type) /// - [SugarColumn(ColumnName = "notice_type")] + [SugarColumn(ColumnName = "notice_type", IsNullable = false, Length = 150, ColumnDescription = "公告类型 (AppointmentNotice Type)")] public string NoticeType { get; set; } /// @@ -60,19 +66,19 @@ namespace EOM.TSHotelManagement.Common.Core /// /// 公告时间 (AppointmentNotice Time) /// - [SugarColumn(ColumnName = "notice_time")] + [SugarColumn(ColumnName = "notice_time", IsNullable = false, ColumnDescription = "公告时间 (AppointmentNotice Time)")] public DateTime NoticeTime { get; set; } /// /// 公告正文 (AppointmentNotice Content) /// - [SugarColumn(ColumnName = "notice_content")] + [SugarColumn(ColumnName = "notice_content", IsNullable = true, ColumnDataType = "text", ColumnDescription = "公告正文 (AppointmentNotice Content)")] public string NoticeContent { get; set; } /// /// 发文部门 (Issuing Department) /// - [SugarColumn(ColumnName = "notice_department")] + [SugarColumn(ColumnName = "notice_department", IsNullable = false, Length = 128, ColumnDescription = "发文部门 (Issuing Department)")] public string IssuingDepartment { get; set; } } } diff --git a/EOM.TSHotelManagement.Common.Core/SystemManagement/Department.cs b/EOM.TSHotelManagement.Common.Core/SystemManagement/Department.cs index 366325d..044321d 100644 --- a/EOM.TSHotelManagement.Common.Core/SystemManagement/Department.cs +++ b/EOM.TSHotelManagement.Common.Core/SystemManagement/Department.cs @@ -33,34 +33,40 @@ namespace EOM.TSHotelManagement.Common.Core [SugarTable("department")] public class Department : BaseEntity { + /// + /// 编号 (ID) + /// + [SugarColumn(ColumnName = "id", IsIdentity = true, IsPrimaryKey = true, IsNullable = false, ColumnDescription = "编号 (ID)")] + public int Id { get; set; } + /// /// 部门编号 (Department Number) /// - [SugarColumn(ColumnName = "dept_no")] + [SugarColumn(ColumnName = "dept_no", IsNullable = false, Length = 128, ColumnDescription = "部门编号 (Department Number)")] public string DepartmentNumber { get; set; } /// /// 部门名称 (Department Name) /// - [SugarColumn(ColumnName = "dept_name")] + [SugarColumn(ColumnName = "dept_name", IsNullable = false, Length = 256, ColumnDescription = "部门名称 (Department Name)")] public string DepartmentName { get; set; } /// /// 部门描述 (Department Description) /// - [SugarColumn(ColumnName = "dept_desc")] + [SugarColumn(ColumnName = "dept_desc", IsNullable = true, Length = 500, ColumnDescription = "部门描述 (Department Description)")] public string DepartmentDescription { get; set; } /// /// 创建时间(部门) (Department Creation Date) /// - [SugarColumn(ColumnName = "dept_date")] + [SugarColumn(ColumnName = "dept_date", IsNullable = true, ColumnDescription = "创建时间(部门) (Department Creation Date)")] public DateTime DepartmentCreationDate { get; set; } /// /// 部门主管 (Department Leader) /// - [SugarColumn(ColumnName = "dept_leader")] + [SugarColumn(ColumnName = "dept_leader", IsNullable = false, Length = 128, ColumnDescription = "部门主管 (Department Leader)")] public string DepartmentLeader { get; set; } /// @@ -72,7 +78,7 @@ namespace EOM.TSHotelManagement.Common.Core /// /// 上级部门编号 (Parent Department Number) /// - [SugarColumn(ColumnName = "dept_parent")] + [SugarColumn(ColumnName = "dept_parent", IsNullable = true, Length = 128, ColumnDescription = "上级部门编号 (Parent Department Number)")] public string ParentDepartmentNumber { get; set; } /// diff --git a/EOM.TSHotelManagement.Common.Core/SystemManagement/Education.cs b/EOM.TSHotelManagement.Common.Core/SystemManagement/Education.cs index fbea359..bb3b1e6 100644 --- a/EOM.TSHotelManagement.Common.Core/SystemManagement/Education.cs +++ b/EOM.TSHotelManagement.Common.Core/SystemManagement/Education.cs @@ -29,19 +29,25 @@ namespace EOM.TSHotelManagement.Common.Core /// /// 学历 (Education) /// - [SugarTable("qualification")] + [SugarTable("qualification", "学历 (Education)")] public class Education : BaseEntity { + /// + /// 编号 (ID) + /// + [SugarColumn(ColumnName = "id", IsIdentity = true, IsPrimaryKey = true, IsNullable = false, ColumnDescription = "编号 (ID)")] + public int Id { get; set; } + /// /// 学历编号 (Education Number) /// - [SugarColumn(ColumnName = "education_no")] + [SugarColumn(ColumnName = "education_no",ColumnDescription = "学历编号 (Education Number)", IsNullable = false, IsPrimaryKey = true, Length = 128)] public string EducationNumber { get; set; } /// /// 学历名称 (Education Name) /// - [SugarColumn(ColumnName = "education_name")] + [SugarColumn(ColumnName = "education_name", ColumnDescription = "学历名称 (Education Name)", IsNullable = false, Length = 200)] public string EducationName { get; set; } } } diff --git a/EOM.TSHotelManagement.Common.Core/SystemManagement/Menu.cs b/EOM.TSHotelManagement.Common.Core/SystemManagement/Menu.cs index eb8e4f4..a46cff1 100644 --- a/EOM.TSHotelManagement.Common.Core/SystemManagement/Menu.cs +++ b/EOM.TSHotelManagement.Common.Core/SystemManagement/Menu.cs @@ -28,43 +28,47 @@ namespace EOM.TSHotelManagement.Common.Core /// /// 菜单表 (Menu Table) /// - [SugarTable("menu")] + [SugarTable("menu", "菜单表 (Menu Table)", true)] public class Menu : BaseEntity { - [SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsIdentity = true)] - public new int Id { get; set; } + /// + /// 编号 (ID) + /// + [SugarColumn(ColumnName = "id", IsIdentity = true, IsPrimaryKey = true, IsNullable = false, ColumnDescription = "编号 (ID)")] + public int Id { get; set; } + /// /// 备 注:菜单键 (Menu Key) /// 默认值: /// - [SugarColumn(ColumnName = "key")] + [SugarColumn(ColumnName = "key", IsNullable = true, ColumnDescription = "菜单键 (Menu Key)", Length = 256)] public string? Key { get; set; } /// /// 备 注:菜单标题 (Menu Title) /// 默认值: /// - [SugarColumn(ColumnName = "title")] + [SugarColumn(ColumnName = "title", IsNullable = false, ColumnDescription = "菜单标题 (Menu Title)", Length = 256)] public string Title { get; set; } = null!; /// /// 备 注:菜单路径 (Menu Path) /// 默认值: /// - [SugarColumn(ColumnName = "path")] + [SugarColumn(ColumnName = "path", IsNullable = false, ColumnDescription = "菜单路径 (Menu Path)", ColumnDataType = "text")] public string? Path { get; set; } /// /// 备 注:父级ID (Parent ID) /// 默认值: /// - [SugarColumn(ColumnName = "parent")] + [SugarColumn(ColumnName = "parent", IsNullable = true, ColumnDescription = "父级ID (Parent ID)")] public int? Parent { get; set; } /// /// 图标 /// - [SugarColumn(ColumnName = "icon")] + [SugarColumn(ColumnName = "icon", IsNullable = true, ColumnDescription = "图标", Length = 256)] public string Icon { get; set; } } diff --git a/EOM.TSHotelManagement.Common.Core/SystemManagement/Nation.cs b/EOM.TSHotelManagement.Common.Core/SystemManagement/Nation.cs index 42a7261..1db5456 100644 --- a/EOM.TSHotelManagement.Common.Core/SystemManagement/Nation.cs +++ b/EOM.TSHotelManagement.Common.Core/SystemManagement/Nation.cs @@ -29,19 +29,36 @@ namespace EOM.TSHotelManagement.Common.Core /// /// 民族 (Nation) /// - [SugarTable("nation")] + [SugarTable("nation", "民族信息表 (Nation Information)")] public class Nation : BaseEntity { + /// + /// 编号 (ID) + /// + [SugarColumn(ColumnName = "id", IsIdentity = true, IsPrimaryKey = true, IsNullable = false, ColumnDescription = "编号 (ID)")] + public int Id { get; set; } + /// /// 民族编号 (Nation Number) /// - [SugarColumn(ColumnName = "nation_no")] + [SugarColumn( + ColumnName = "nation_no", + ColumnDescription = "民族编号 (Nation Number)", + IsNullable = false, + IsPrimaryKey = true, + Length = 128 + )] public string NationNumber { get; set; } /// /// 民族名称 (Nation Name) /// - [SugarColumn(ColumnName = "nation_name")] + [SugarColumn( + ColumnName = "nation_name", + ColumnDescription = "民族名称 (Nation Name)", + IsNullable = false, + Length = 50 + )] public string NationName { get; set; } } } diff --git a/EOM.TSHotelManagement.Common.Core/SystemManagement/Position.cs b/EOM.TSHotelManagement.Common.Core/SystemManagement/Position.cs index ac6c1f5..50a31cd 100644 --- a/EOM.TSHotelManagement.Common.Core/SystemManagement/Position.cs +++ b/EOM.TSHotelManagement.Common.Core/SystemManagement/Position.cs @@ -27,21 +27,38 @@ using SqlSugar; namespace EOM.TSHotelManagement.Common.Core { /// - /// 职位 (Position) + /// 职位信息表 (Position Information) /// - [SugarTable("position")] + [SugarTable("position", "职位信息表 (Position Information)")] public class Position : BaseEntity { + /// + /// 编号 (ID) + /// + [SugarColumn(ColumnName = "id", IsIdentity = true, IsPrimaryKey = true, IsNullable = false, ColumnDescription = "编号 (ID)")] + public int Id { get; set; } + /// /// 职位编号 (Position Number) /// - [SugarColumn(ColumnName = "position_no")] + [SugarColumn( + ColumnName = "position_no", + ColumnDescription = "职位编号 (Position Number)", + IsPrimaryKey = true, + IsNullable = false, + Length = 128 + )] public string PositionNumber { get; set; } /// /// 职位名称 (Position Name) /// - [SugarColumn(ColumnName = "position_name")] + [SugarColumn( + ColumnName = "position_name", + ColumnDescription = "职位名称 (Position Name)", + IsNullable = false, + Length = 200 + )] public string PositionName { get; set; } } } diff --git a/EOM.TSHotelManagement.Common.Core/SystemManagement/Role.cs b/EOM.TSHotelManagement.Common.Core/SystemManagement/Role.cs index e09c453..99d4574 100644 --- a/EOM.TSHotelManagement.Common.Core/SystemManagement/Role.cs +++ b/EOM.TSHotelManagement.Common.Core/SystemManagement/Role.cs @@ -2,30 +2,49 @@ namespace EOM.TSHotelManagement.Common.Core { /// - /// 角色 - /// - [SugarTable("role")] + /// 系统角色配置表 (System Role Configuration) + /// + [SugarTable("role", "系统角色配置表 (System Role Configuration)")] public class Role : BaseEntity { /// - /// 备 注:角色编码 - /// 默认值: - /// - [SugarColumn(ColumnName = "role_number", IsPrimaryKey = true)] + /// 编号 (ID) + /// + [SugarColumn(ColumnName = "id", IsIdentity = true, IsPrimaryKey = true, IsNullable = false, ColumnDescription = "编号 (ID)")] + public int Id { get; set; } + + /// + /// 角色编码 (Role Code) + /// + [SugarColumn( + ColumnName = "role_number", + IsPrimaryKey = true, + ColumnDescription = "角色唯一标识编码 (Unique Role Identifier)", + IsNullable = false, + Length = 128 + )] public string RoleNumber { get; set; } = null!; /// - /// 备 注:角色名字 - /// 默认值: - /// - [SugarColumn(ColumnName = "role_name")] + /// 角色名称 (Role Name) + /// + [SugarColumn( + ColumnName = "role_name", + ColumnDescription = "角色名称（如管理员/前台接待）", + IsNullable = false, + Length = 200 + )] public string RoleName { get; set; } = null!; /// - /// 备 注:角色描述 - /// 默认值: - /// - [SugarColumn(ColumnName = "role_description")] + /// 角色描述 (Role Description) + /// + [SugarColumn( + ColumnName = "role_description", + ColumnDescription = "角色详细权限描述 (Detailed Permissions Description)", + IsNullable = true, + Length = 500 + )] public string? RoleDescription { get; set; } } diff --git a/EOM.TSHotelManagement.Common.Core/SystemManagement/RolePermission.cs b/EOM.TSHotelManagement.Common.Core/SystemManagement/RolePermission.cs index eee6849..bcb13f1 100644 --- a/EOM.TSHotelManagement.Common.Core/SystemManagement/RolePermission.cs +++ b/EOM.TSHotelManagement.Common.Core/SystemManagement/RolePermission.cs @@ -2,23 +2,41 @@ namespace EOM.TSHotelManagement.Common.Core { /// - /// 角色权限关联表 - /// - [SugarTable("role_permission")] + /// 角色权限关联表 (Role-Permission Mapping) + /// + [SugarTable("role_permission", "角色权限关联表 (Role-Permission Mapping)")] public class RolePermission : BaseEntity { /// - /// 备 注:角色编码 - /// 默认值: - /// - [SugarColumn(ColumnName = "role_number")] + /// 编号 (ID) + /// + [SugarColumn(ColumnName = "id", IsIdentity = true, IsPrimaryKey = true, IsNullable = false, ColumnDescription = "编号 (ID)")] + public int Id { get; set; } + + /// + /// 角色编码（关联角色表） (Role Code) + /// + [SugarColumn( + ColumnName = "role_number", + IsPrimaryKey = true, + ColumnDescription = "关联角色编码 (Linked Role Code)", + IsNullable = false, + Length = 128, + IndexGroupNameList = new[] { "IX_role_number" } + )] public string RoleNumber { get; set; } = null!; /// - /// 备 注:权限编码 - /// 默认值: - /// - [SugarColumn(ColumnName = "permission_number")] + /// 权限编码（关联权限表） (Permission Code) + /// + [SugarColumn( + ColumnName = "permission_number", + IsPrimaryKey = true, + ColumnDescription = "关联权限编码 (Linked Permission Code)", + IsNullable = false, + Length = 128, + IndexGroupNameList = new[] { "IX_permission_number" } + )] public string PermissionNumber { get; set; } = null!; } diff --git a/EOM.TSHotelManagement.Common.Core/SystemManagement/SupervisionStatistics.cs b/EOM.TSHotelManagement.Common.Core/SystemManagement/SupervisionStatistics.cs index 6f0355f..23142d6 100644 --- a/EOM.TSHotelManagement.Common.Core/SystemManagement/SupervisionStatistics.cs +++ b/EOM.TSHotelManagement.Common.Core/SystemManagement/SupervisionStatistics.cs @@ -23,61 +23,123 @@ *模块说明：监管统计类 */ using SqlSugar; +using System; namespace EOM.TSHotelManagement.Common.Core { - /// - /// 监管统计 (Supervision Statistics) + // + /// 监管统计信息表 (Supervision Statistics) /// - [SugarTable("supervision_statistics")] + [SugarTable("supervision_statistics", "监管统计信息表 (Supervision Statistics)")] public class SupervisionStatistics : BaseEntity { + /// + /// 编号 (ID) + /// + [SugarColumn(ColumnName = "id", IsIdentity = true, IsPrimaryKey = true, IsNullable = false, ColumnDescription = "编号 (ID)")] + public int Id { get; set; } + /// /// 监管统计编号 (Supervision Statistics Number) /// - [SugarColumn(ColumnName = "statistics_number", IsPrimaryKey = true)] + [SugarColumn( + ColumnName = "statistics_number", + IsPrimaryKey = true, + ColumnDescription = "监管记录唯一编号 (Unique Statistics ID)", + IsNullable = false, + Length = 128 + )] public string StatisticsNumber { get; set; } /// - /// 本次监管部门 (Supervising Department) + /// 监管部门编码 (Supervising Department Code) /// - [SugarColumn(ColumnName = "supervising_department")] + [SugarColumn( + ColumnName = "supervising_department", + ColumnDescription = "监管部门编码（关联部门表）", + IsNullable = false, + Length = 128 + )] public string SupervisingDepartment { get; set; } /// - /// 本次监管部门名称 (Supervising Department Name) + /// 监管部门名称 (Supervising Department Name)（不存储到数据库） /// [SugarColumn(IsIgnore = true)] public string SupervisingDepartmentName { get; set; } /// - /// 本次监管进度 (Supervision Progress) + /// 监管进度 (Supervision Progress) /// - [SugarColumn(ColumnName = "supervision_progress")] + [SugarColumn( + ColumnName = "supervision_progress", + ColumnDescription = "监管进度描述（如：已完成/整改中）", + IsNullable = false, + Length = 200 + )] public string SupervisionProgress { get; set; } /// - /// 本次监管损失 (Supervision Loss) + /// 监管损失金额 (Supervision Loss Amount) /// - [SugarColumn(ColumnName = "supervision_loss")] + [SugarColumn( + ColumnName = "supervision_loss", + ColumnDescription = "监管造成的经济损失", + IsNullable = false + )] public string SupervisionLoss { get; set; } /// - /// 本次评分 (Supervision Score) + /// 监管评分 (Supervision Score) /// - [SugarColumn(ColumnName = "supervision_score")] + [SugarColumn( + ColumnName = "supervision_score", + ColumnDescription = "监管评分（范围：0-100分）", + IsNullable = false, + DefaultValue = "100" + )] public int SupervisionScore { get; set; } /// - /// 监管统计人 (Supervision Statistician) + /// 统计人员 (Supervision Statistician) /// - [SugarColumn(ColumnName = "supervision_statistician")] + [SugarColumn( + ColumnName = "supervision_statistician", + ColumnDescription = "统计责任人姓名", + IsNullable = false, + Length = 50 + )] public string SupervisionStatistician { get; set; } /// - /// 本次监管建议 (Supervision Advice) + /// 监管建议 (Supervision Advice) /// - [SugarColumn(ColumnName = "supervision_advice")] + [SugarColumn( + ColumnName = "supervision_advice", + ColumnDescription = "监管整改建议内容", + IsNullable = true, + Length = 1000 + )] public string SupervisionAdvice { get; set; } + + /// + /// 监管时间 (Supervision Time) + /// + [SugarColumn( + ColumnName = "supervision_time", + ColumnDescription = "监管检查时间", + IsNullable = false + )] + public DateTime SupervisionTime { get; set; } + + /// + /// 整改状态 (Rectification Status) + /// + [SugarColumn( + ColumnName = "rectification_status", + ColumnDescription = "0-未整改/1-已整改", + DefaultValue = "0" + )] + public int RectificationStatus { get; set; } } } diff --git a/EOM.TSHotelManagement.Common.Core/SystemManagement/SystemInformation.cs b/EOM.TSHotelManagement.Common.Core/SystemManagement/SystemInformation.cs index 97e48a3..22c7119 100644 --- a/EOM.TSHotelManagement.Common.Core/SystemManagement/SystemInformation.cs +++ b/EOM.TSHotelManagement.Common.Core/SystemManagement/SystemInformation.cs @@ -29,19 +29,25 @@ namespace EOM.TSHotelManagement.Common.Core /// /// 系统信息 (System Information) /// - [SugarTable("app_config_base")] + [SugarTable("app_config_base", "系统信息 (System Information)", true)] public class SystemInformation { + /// + /// 编号 (ID) + /// + [SugarColumn(ColumnName = "id", IsIdentity = true, IsPrimaryKey = true, IsNullable = false, ColumnDescription = "编号 (ID)")] + public int Id { get; set; } + /// /// 地址编号 (URL Number) /// - [SugarColumn(ColumnName = "url_no", IsPrimaryKey = true)] + [SugarColumn(ColumnName = "url_no", IsPrimaryKey = true, ColumnDescription = "地址编号 (URL Number)")] public int UrlNumber { get; set; } /// /// 地址 (URL Address) /// - [SugarColumn(ColumnName = "url_addr")] + [SugarColumn(ColumnName = "url_addr", Length = 256,ColumnDescription = "地址 (URL Address)")] public string UrlAddress { get; set; } } } diff --git a/EOM.TSHotelManagement.Common.Core/SystemManagement/UserRole.cs b/EOM.TSHotelManagement.Common.Core/SystemManagement/UserRole.cs index a0f6ba3..34d4569 100644 --- a/EOM.TSHotelManagement.Common.Core/SystemManagement/UserRole.cs +++ b/EOM.TSHotelManagement.Common.Core/SystemManagement/UserRole.cs @@ -1,24 +1,42 @@ using SqlSugar; namespace EOM.TSHotelManagement.Common.Core { - /// - /// 用户角色关联表 - /// - [SugarTable("user_role")] + // + /// 用户角色关联表 (User-Role Mapping) + /// + [SugarTable("user_role", "用户角色关联表 (User-Role Mapping)")] public class UserRole : BaseEntity { /// - /// 备 注:角色编码 - /// 默认值: - /// - [SugarColumn(ColumnName = "role_number")] + /// 编号 (ID) + /// + [SugarColumn(ColumnName = "id", IsIdentity = true, IsPrimaryKey = true, IsNullable = false, ColumnDescription = "编号 (ID)")] + public int Id { get; set; } + + /// + /// 角色编码（关联角色表） (Role Code) + /// + [SugarColumn( + ColumnName = "role_number", + IsPrimaryKey = true, + ColumnDescription = "关联角色编码 (Linked Role Code)", + IsNullable = false, + Length = 128, + IndexGroupNameList = new[] { "IX_role_number" } + )] public string RoleNumber { get; set; } = null!; /// - /// 备 注:用户编码 - /// 默认值: - /// - [SugarColumn(ColumnName = "user_number")] + /// 用户编码（关联用户表） (User Code) + /// + [SugarColumn( + ColumnName = "user_number", + IsPrimaryKey = true, + ColumnDescription = "关联用户编码 (Linked User Code)", + IsNullable = false, + Length = 128, + IndexGroupNameList = new[] { "IX_user_number" } + )] public string UserNumber { get; set; } = null!; } diff --git a/EOM.TSHotelManagement.Common.Core/SystemManagement/VipLevelRule.cs b/EOM.TSHotelManagement.Common.Core/SystemManagement/VipLevelRule.cs index c549dc6..f1bca5b 100644 --- a/EOM.TSHotelManagement.Common.Core/SystemManagement/VipLevelRule.cs +++ b/EOM.TSHotelManagement.Common.Core/SystemManagement/VipLevelRule.cs @@ -27,43 +27,65 @@ using SqlSugar; namespace EOM.TSHotelManagement.Common.Core { /// - /// 会员等级规则类 (VIP Level Rule Class) + /// 会员等级规则表 (VIP Level Rules) /// - [SugarTable("vip_rule")] + [SugarTable("vip_rule", "会员等级规则配置表 (VIP Level Rule Configuration)")] public class VipLevelRule : BaseEntity { /// - /// 索引ID (Index ID) + /// 编号 (ID) /// - [SugarColumn(ColumnName = "id", IsIdentity = true)] + [SugarColumn(ColumnName = "id", IsIdentity = true, IsPrimaryKey = true, IsNullable = false, ColumnDescription = "编号 (ID)")] public int Id { get; set; } + /// /// 会员规则流水号 (VIP Rule Serial Number) /// - [SugarColumn(ColumnName = "rule_id", IsPrimaryKey = true)] + [SugarColumn( + ColumnName = "rule_id", + IsPrimaryKey = true, + ColumnDescription = "规则业务唯一编号 (如VIPR-2023-001)", + IsNullable = false, + Length = 128 + )] public string RuleSerialNumber { get; set; } /// /// 会员规则名称 (VIP Rule Name) /// - [SugarColumn(ColumnName = "rule_name")] + [SugarColumn( + ColumnName = "rule_name", + ColumnDescription = "规则名称（如『黄金会员准入规则』）", + IsNullable = false, + Length = 200 + )] public string RuleName { get; set; } /// - /// 预设数值(历史消费总额) (Preset Value - Total Historical Spending) + /// 预设消费总额 (Preset Total Spending) /// - [SugarColumn(ColumnName = "rule_value")] + [SugarColumn( + ColumnName = "rule_value", + Length = 18, + ColumnDescription = "累计消费金额阈值（单位：元）", + IsNullable = false, + DecimalDigits = 2 + )] public decimal RuleValue { get; set; } /// - /// 会员等级 (VIP Level) + /// 会员等级ID (VIP Level ID) /// - [SugarColumn(ColumnName = "type_id")] + [SugarColumn( + ColumnName = "type_id", + ColumnDescription = "关联会员等级表 (Linked VIP Level)", + IsNullable = false + )] public int VipLevelId { get; set; } /// - /// 会员等级描述 (VIP Level Description) + /// 会员等级名称 (VIP Level Name)（不存储到数据库） /// [SugarColumn(IsIgnore = true)] public string VipLevelName { get; set; } diff --git a/EOM.TSHotelManagement.Common.Core/Util/ApplicationVersion.cs b/EOM.TSHotelManagement.Common.Core/Util/ApplicationVersion.cs index 4007b72..a408f82 100644 --- a/EOM.TSHotelManagement.Common.Core/Util/ApplicationVersion.cs +++ b/EOM.TSHotelManagement.Common.Core/Util/ApplicationVersion.cs @@ -5,19 +5,19 @@ namespace EOM.TSHotelManagement.Common.Core /// /// 应用版本 (Application Version) /// - [SugarTable("app_version")] + [SugarTable("app_version", "应用版本 (Application Version)")] public class ApplicationVersion { /// /// 流水号 (Sequence Number) /// - [SugarColumn(ColumnName = "base_versionId", IsIdentity = true, IsPrimaryKey = true)] + [SugarColumn(ColumnName = "base_versionId", IsIdentity = true, IsPrimaryKey = true, ColumnDescription = "流水号 (Sequence Number)")] public int ApplicationVersionId { get; set; } /// /// 版本号 (Version Number) /// - [SugarColumn(ColumnName = "base_version")] + [SugarColumn(ColumnName = "base_version", Length = 100, ColumnDescription = "版本号 (Version Number)")] public string VersionNumber { get; set; } } } diff --git a/EOM.TSHotelManagement.Common.Core/Util/CardCode.cs b/EOM.TSHotelManagement.Common.Core/Util/CardCode.cs index a0ac630..f3dfc66 100644 --- a/EOM.TSHotelManagement.Common.Core/Util/CardCode.cs +++ b/EOM.TSHotelManagement.Common.Core/Util/CardCode.cs @@ -5,44 +5,37 @@ namespace EOM.TSHotelManagement.Common.Core /// /// 卡片代码 (Card Codes) /// - [SugarTable("card_code")] - public class CardCode + [SugarTable("card_code", "卡片代码 (Card Codes)", true)] + public class CardCode:BaseEntity { - /// - /// 卡片代码 (Card Code) - /// - public CardCode() - { - } - /// /// 编号 (ID) /// - [SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsIdentity = true)] - public long Id { get; set; } + [SugarColumn(ColumnName = "id", IsIdentity = true, IsPrimaryKey = true, IsNullable = false, ColumnDescription = "编号 (ID)")] + public int Id { get; set; } /// /// 省份 (Province) /// - [SugarColumn(ColumnName = "province")] + [SugarColumn(ColumnName = "province",IsNullable = false,Length =100,ColumnDescription = "省份 (Province)")] public string Province { get; set; } /// /// 城市 (City) /// - [SugarColumn(ColumnName = "city")] + [SugarColumn(ColumnName = "city", IsNullable = true, Length = 100, ColumnDescription = "城市 (City)")] public string City { get; set; } /// /// 地区 (District) /// - [SugarColumn(ColumnName = "district")] + [SugarColumn(ColumnName = "district", IsNullable = true, Length = 100, ColumnDescription = "地区 (District)")] public string District { get; set; } /// /// 地区识别码 (Area Code) /// - [SugarColumn(ColumnName = "district_code")] + [SugarColumn(ColumnName = "district_code", IsNullable = false, Length = 50, ColumnDescription = "地区识别码 (Area Code)")] public string AreaCode { get; set; } } } diff --git a/EOM.TSHotelManagement.Common.Core/Util/OperationLog.cs b/EOM.TSHotelManagement.Common.Core/Util/OperationLog.cs index 9eb3b76..c31ebd4 100644 --- a/EOM.TSHotelManagement.Common.Core/Util/OperationLog.cs +++ b/EOM.TSHotelManagement.Common.Core/Util/OperationLog.cs @@ -48,95 +48,175 @@ namespace EOM.TSHotelManagement.Common.Core Critical = 300 } - /// - /// 操作日志 (Operation Log) + // + /// 操作日志表 (Operation Log) /// - [SugarTable("operation_log")] + [SugarTable("operation_log", "操作日志表 (Operation Log)")] public class OperationLog : BaseEntity { + /// + /// 编号 (ID) + /// + [SugarColumn(ColumnName = "id", IsIdentity = true, IsPrimaryKey = true, IsNullable = false, ColumnDescription = "编号 (ID)")] + public int Id { get; set; } + /// /// 日志ID (Log ID) /// - [SugarColumn(ColumnName = "operation_number", IsPrimaryKey = true)] + [SugarColumn( + ColumnName = "operation_number", + IsPrimaryKey = true, + ColumnDescription = "日志ID (Log ID)", + IsNullable = false, + Length = 128 + )] public string OperationId { get; set; } /// /// 操作时间 (Operation Time) /// - [SugarColumn(ColumnName = "operation_time")] + [SugarColumn( + ColumnName = "operation_time", + ColumnDescription = "操作时间 (Operation Time)", + IsNullable = false + )] public DateTime OperationTime { get; set; } /// /// 操作信息 (Log Content) /// - [SugarColumn(ColumnName = "log_content")] + [SugarColumn( + ColumnName = "log_content", + ColumnDescription = "操作信息 (Log Content)", + IsNullable = false, + Length = 2000 + )] public string LogContent { get; set; } /// /// 操作账号 (Operation Account) /// - [SugarColumn(ColumnName = "operation_account")] + [SugarColumn( + ColumnName = "operation_account", + ColumnDescription = "操作账号 (Operation Account)", + IsNullable = false, + Length = 50 + )] public string OperationAccount { get; set; } /// /// 日志等级 (Log Level) /// - [SugarColumn(ColumnName = "operation_level")] + [SugarColumn( + ColumnName = "operation_level", + ColumnDescription = "日志等级枚举值 (Log Level Enum)", + IsNullable = false + )] public LogLevel LogLevel { get; set; } /// /// 软件版本 (Software Version) /// - [SugarColumn(ColumnName = "software_version")] + [SugarColumn( + ColumnName = "software_version", + ColumnDescription = "软件版本号 (Software Version)", + IsNullable = true, + Length = 50 + )] public string SoftwareVersion { get; set; } /// /// 登录IP (Login IP Address) /// - [SugarColumn(ColumnName = "login_ip")] + [SugarColumn( + ColumnName = "login_ip", + ColumnDescription = "登录IP地址 (Login IP Address)", + IsNullable = false, + Length = 45 + )] public string LoginIpAddress { get; set; } /// - /// 日志等级名称 (Log Level Name) + /// 日志等级名称 (Log Level Name)（不存储到数据库） /// [SugarColumn(IsIgnore = true)] public string LogLevelName { get; set; } - /// /// 请求路径 (Request Path) /// - [SugarColumn(ColumnName = "request_path")] + [SugarColumn( + ColumnName = "request_path", + ColumnDescription = "请求路径 (Request Path)", + IsNullable = false, + Length = 500 + )] public string RequestPath { get; set; } + /// /// 查询字符串 (Query String) /// - [SugarColumn(ColumnName = "query_string")] + [SugarColumn( + ColumnName = "query_string", + ColumnDescription = "查询参数 (Query String)", + IsNullable = true, + Length = 2000 + )] public string QueryString { get; set; } + /// /// 响应时间 (Elapsed Time) /// - [SugarColumn(ColumnName = "elapsed_time")] + [SugarColumn( + ColumnName = "elapsed_time", + ColumnDescription = "响应时间（毫秒） (Elapsed Time in ms)", + IsNullable = false, + DefaultValue = "0" + )] public long ElapsedTime { get; set; } + /// /// 请求方法 (Http Method) /// - [SugarColumn(ColumnName = "http_method")] + [SugarColumn( + ColumnName = "http_method", + ColumnDescription = "HTTP请求方法 (HTTP Method)", + IsNullable = false, + Length = 10 + )] public string HttpMethod { get; set; } + /// /// 状态码 (Status Code) /// - [SugarColumn(ColumnName = "status_code")] + [SugarColumn( + ColumnName = "status_code", + ColumnDescription = "HTTP状态码 (HTTP Status Code)", + IsNullable = false, + DefaultValue = "200" + )] public int StatusCode { get; set; } + /// /// 异常消息 (Exception Message) /// - [SugarColumn(ColumnName = "exception_message")] + [SugarColumn( + ColumnName = "exception_message", + ColumnDescription = "异常消息内容 (Exception Message)", + IsNullable = true, + Length = 2000 + )] public string ExceptionMessage { get; set; } + /// /// 异常堆栈 (Exception Stack Trace) /// - [SugarColumn(ColumnName = "exception_stacktrace")] + [SugarColumn( + ColumnName = "exception_stacktrace", + ColumnDescription = "异常堆栈信息 (Exception Stack Trace)", + IsNullable = true, + Length = 4000 + )] public string ExceptionStackTrace { get; set; } } } diff --git a/EOM.TSHotelManagement.Migration/EOM.TSHotelManagement.Migration.csproj b/EOM.TSHotelManagement.Migration/EOM.TSHotelManagement.Migration.csproj new file mode 100644 index 0000000..030f286 --- /dev/null +++ b/EOM.TSHotelManagement.Migration/EOM.TSHotelManagement.Migration.csproj @@ -0,0 +1,17 @@ + + + + net8.0 + enable + enable + + + + + + + + + + + diff --git a/EOM.TSHotelManagement.Migration/EntityBuilder.cs b/EOM.TSHotelManagement.Migration/EntityBuilder.cs new file mode 100644 index 0000000..f620e08 --- /dev/null +++ b/EOM.TSHotelManagement.Migration/EntityBuilder.cs @@ -0,0 +1,530 @@ +using EOM.TSHotelManagement.Common.Core; +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace EOM.TSHotelManagement.Migration +{ + public class EntityBuilder + { + private readonly Type[] entityTypes = + { + typeof(ApplicationVersion), + typeof(Administrator), + typeof(AdministratorType), + typeof(AppointmentNotice), + typeof(Asset), + typeof(Customer), + typeof(CustoType), + typeof(CardCode), + typeof(Department), + typeof(Employee), + typeof(EmployeeCheck), + typeof(EmployeeHistory), + typeof(EmployeePhoto), + typeof(EmployeeRewardPunishment), + typeof(EnergyManagement), + typeof(Education), + typeof(Menu), + typeof(Nation), + typeof(NavBar), + typeof(OperationLog), + typeof(Position), + typeof(PromotionContent), + typeof(PassportType), + typeof(Room), + typeof(RoomType), + typeof(Reser), + typeof(RewardPunishmentType), + typeof(Role), + typeof(RolePermission), + typeof(SellThing), + typeof(Spend), + typeof(SupervisionStatistics), + typeof(SystemInformation), + typeof(UserRole), + typeof(VipLevelRule), + }; + + private readonly List entityDatas = new() + { + new AdministratorType + { + TypeId = "Admin", + TypeName = "超级管理员", + IsDelete = 0, + DataInsUsr = "System", + DataInsDate = DateTime.Now, + }, + new Administrator + { + Number = "1263785187301658678", + Account = "admin", + Password = "clUKFMeIUWp6YflZweR0Cw==·#c0fbb?;*$>#;^b%$?>#%% entityTypes; + + public List GetEntityDatas() => entityDatas; + } +} diff --git a/EOM.TSHotelManagement.Web.sln b/EOM.TSHotelManagement.Web.sln index 1cc368d..c293f21 100644 --- a/EOM.TSHotelManagement.Web.sln +++ b/EOM.TSHotelManagement.Web.sln @@ -15,6 +15,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EOM.TSHotelManagement.Commo EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EOM.TSHotelManagement.Shared", "EOM.TSHotelManagement.Shared\EOM.TSHotelManagement.Shared.csproj", "{1DC1D6E4-9FEB-4AD3-B1A4-0C20241C6D85}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EOM.TSHotelManagement.Migration", "EOM.TSHotelManagement.Migration\EOM.TSHotelManagement.Migration.csproj", "{A1A986E0-E59D-4913-B63E-D965453B8CC0}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -45,6 +47,10 @@ Global {1DC1D6E4-9FEB-4AD3-B1A4-0C20241C6D85}.Debug|Any CPU.Build.0 = Debug|Any CPU {1DC1D6E4-9FEB-4AD3-B1A4-0C20241C6D85}.Release|Any CPU.ActiveCfg = Release|Any CPU {1DC1D6E4-9FEB-4AD3-B1A4-0C20241C6D85}.Release|Any CPU.Build.0 = Release|Any CPU + {A1A986E0-E59D-4913-B63E-D965453B8CC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A1A986E0-E59D-4913-B63E-D965453B8CC0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A1A986E0-E59D-4913-B63E-D965453B8CC0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A1A986E0-E59D-4913-B63E-D965453B8CC0}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/EOM.TSHotelManagement.WebApi/EOM.TSHotelManagement.WebApi.csproj b/EOM.TSHotelManagement.WebApi/EOM.TSHotelManagement.WebApi.csproj index 8f65b1e..acbe604 100644 --- a/EOM.TSHotelManagement.WebApi/EOM.TSHotelManagement.WebApi.csproj +++ b/EOM.TSHotelManagement.WebApi/EOM.TSHotelManagement.WebApi.csproj @@ -30,6 +30,7 @@ + diff --git a/EOM.TSHotelManagement.WebApi/Factory/SqlSugarClientFactory.cs b/EOM.TSHotelManagement.WebApi/Factory/SqlSugarClientFactory.cs index 206ada5..f236486 100644 --- a/EOM.TSHotelManagement.WebApi/Factory/SqlSugarClientFactory.cs +++ b/EOM.TSHotelManagement.WebApi/Factory/SqlSugarClientFactory.cs @@ -57,7 +57,7 @@ namespace EOM.TSHotelManagement.WebApi return new SqlSugarClient(config); } - private DbType GetDbType(string dbName) + public static DbType GetDbType(string dbName) { return dbName switch { diff --git a/EOM.TSHotelManagement.WebApi/MigrationConfig/InitializeConfig.cs b/EOM.TSHotelManagement.WebApi/MigrationConfig/InitializeConfig.cs new file mode 100644 index 0000000..1417e41 --- /dev/null +++ b/EOM.TSHotelManagement.WebApi/MigrationConfig/InitializeConfig.cs @@ -0,0 +1,115 @@ +using EOM.TSHotelManagement.Common.Core; +using EOM.TSHotelManagement.Migration; +using EOM.TSHotelManagement.Shared; +using EOM.TSHotelManagement.WebApi; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Identity; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; +using MySqlConnector; +using SqlSugar; +using System; +using System.Collections.Generic; + +namespace EOM.TSHotelManagement.WebApi +{ + public class InitializeConfig + { + #region initlize database + public void InitializeDatabase(IApplicationBuilder app) + { + using var scope = app.ApplicationServices.CreateScope(); + var logger = scope.ServiceProvider.GetRequiredService>(); + var config = scope.ServiceProvider.GetRequiredService(); + var factory = scope.ServiceProvider.GetRequiredService(); + + try + { + var dbName = config["DefaultDatabase"] ?? "MariaDB"; + + using (var masterDb = CreateMasterConnection(config, dbName)) + { + var dbSettings = GetDatabaseSettings(config, dbName); + if (!masterDb.DbMaintenance.GetDataBaseList().Contains(dbSettings.Database)) + { + Console.WriteLine($"Creating database {dbSettings.Database}..."); + masterDb.DbMaintenance.CreateDatabase(dbSettings.Database); + Console.WriteLine("Database created successfully"); + } + } + + using (var db = factory.CreateClient(dbName)) + { + if (!db.DbMaintenance.IsAnyTable(nameof(Administrator))) + { + Console.WriteLine("Initializing database schema..."); + + var entityBuilder = new EntityBuilder(); + + db.CodeFirst.InitTables(entityBuilder.EntityTypes); + + Console.WriteLine("Database schema initialized"); + + SeedInitialData(db); + } + } + } + catch (Exception ex) + { + Console.WriteLine($"Database initialization failed:{ex.Message}"); + throw; + } + } + + private (string Database, DbType DbType) GetDatabaseSettings(IConfiguration config, string dbName) + { + var dbType = SqlSugarClientFactory.GetDbType(dbName); + var connectionString = GetConnectionString(config, dbName); + var builder = new MySqlConnectionStringBuilder(connectionString); + return (builder.Database, dbType); + } + + private SqlSugarClient CreateMasterConnection(IConfiguration config, string dbName) + { + var connectionString = GetConnectionString(config, dbName); + var builder = new MySqlConnectionStringBuilder(connectionString) + { + Database = null + }; + + var dbType = SqlSugarClientFactory.GetDbType(dbName); + + return new SqlSugarClient(new ConnectionConfig + { + ConnectionString = builder.ConnectionString, + DbType = dbType, + IsAutoCloseConnection = true + }); + } + + private string GetConnectionString(IConfiguration config, string dbName) + { + if (Environment.GetEnvironmentVariable("DOCKER_ENV") != null) + { + return Environment.GetEnvironmentVariable($"{dbName}ConnectStr") + ?? throw new ArgumentException($"Environment variable {dbName}ConnectStr not found"); + } + return config.GetConnectionString($"{dbName}ConnectStr"); + } + + private void SeedInitialData(ISqlSugarClient db) + { + if (!db.Queryable().Any()) + { + var entityBuilder = new EntityBuilder(); + foreach (var entityData in entityBuilder.GetEntityDatas()) + { + db.InsertableByObject(entityData).AS(entityData.GetType().Name).ExecuteCommand(); + Console.WriteLine($"Inserted initial data for {entityData.GetType().Name}"); + } + } + } + #endregion + } +} diff --git a/EOM.TSHotelManagement.WebApi/Startup.cs b/EOM.TSHotelManagement.WebApi/Startup.cs index 43d43f1..0f58de6 100644 --- a/EOM.TSHotelManagement.WebApi/Startup.cs +++ b/EOM.TSHotelManagement.WebApi/Startup.cs @@ -1,4 +1,5 @@ using Autofac; +using EOM.TSHotelManagement.Common.Core; using EOM.TSHotelManagement.Common.Util; using EOM.TSHotelManagement.EntityFramework; using EOM.TSHotelManagement.Shared; @@ -11,8 +12,10 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; +using Microsoft.Extensions.Logging; using Microsoft.IdentityModel.Tokens; using Microsoft.OpenApi.Models; +using MySqlConnector; using Newtonsoft.Json.Serialization; using SqlSugar; using System; @@ -146,6 +149,8 @@ namespace EOM.TSHotelManagement.WebApi // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. public void Configure(IApplicationBuilder app, IWebHostEnvironment env) { + new InitializeConfig().InitializeDatabase(app); + if (env.IsDevelopment()) { app.UseDeveloperExceptionPage(); @@ -227,5 +232,7 @@ namespace EOM.TSHotelManagement.WebApi } #endregion } + + } } -- Gitee From da33903fd95cf6a099adaaff35cf97e268bd2f35 Mon Sep 17 00:00:00 2001 From: ck_yeun9 Date: Sat, 26 Apr 2025 17:55:39 +0800 Subject: [PATCH 3/5] update latest database script. --- .../EOM.TSHotelManagement.WebApi.csproj | 2 +- .../MDB_tshotel_script_data.sql" | 4533 ++++++++++++++++ .../MDB_tshotel_script_table.sql" | 789 ++- .../MDB_tshotel_script_data.sql" | 4533 ++++++++++++++++ .../MDB_tshotel_script_table.sql" | 684 +++ .../PGDB_tshotel_script_data.sql" | 4535 +++++++++++++++++ .../PGDB_tshotel_script_table.sql" | 1292 +++++ .../tshotel-backstage-dbscript-data.sql" | 4529 ---------------- 8 files changed, 15964 insertions(+), 4933 deletions(-) create mode 100644 "\346\225\260\346\215\256\345\272\223\350\204\232\346\234\254/MariaDB\347\211\210\346\234\254/MDB_tshotel_script_data.sql" rename "\346\225\260\346\215\256\345\272\223\350\204\232\346\234\254/latest_MariaDB\347\211\210\346\234\254/tshotel-backstage-dbscript-table.sql" => "\346\225\260\346\215\256\345\272\223\350\204\232\346\234\254/MariaDB\347\211\210\346\234\254/MDB_tshotel_script_table.sql" (31%) create mode 100644 "\346\225\260\346\215\256\345\272\223\350\204\232\346\234\254/MySQL\347\211\210\346\234\254/MDB_tshotel_script_data.sql" create mode 100644 "\346\225\260\346\215\256\345\272\223\350\204\232\346\234\254/MySQL\347\211\210\346\234\254/MDB_tshotel_script_table.sql" create mode 100644 "\346\225\260\346\215\256\345\272\223\350\204\232\346\234\254/PostgreSQL\347\211\210\346\234\254/PGDB_tshotel_script_data.sql" create mode 100644 "\346\225\260\346\215\256\345\272\223\350\204\232\346\234\254/PostgreSQL\347\211\210\346\234\254/PGDB_tshotel_script_table.sql" delete mode 100644 "\346\225\260\346\215\256\345\272\223\350\204\232\346\234\254/latest_MariaDB\347\211\210\346\234\254/tshotel-backstage-dbscript-data.sql" diff --git a/EOM.TSHotelManagement.WebApi/EOM.TSHotelManagement.WebApi.csproj b/EOM.TSHotelManagement.WebApi/EOM.TSHotelManagement.WebApi.csproj index acbe604..cfb7fb3 100644 --- a/EOM.TSHotelManagement.WebApi/EOM.TSHotelManagement.WebApi.csproj +++ b/EOM.TSHotelManagement.WebApi/EOM.TSHotelManagement.WebApi.csproj @@ -30,7 +30,7 @@ - + diff --git "a/\346\225\260\346\215\256\345\272\223\350\204\232\346\234\254/MariaDB\347\211\210\346\234\254/MDB_tshotel_script_data.sql" "b/\346\225\260\346\215\256\345\272\223\350\204\232\346\234\254/MariaDB\347\211\210\346\234\254/MDB_tshotel_script_data.sql" new file mode 100644 index 0000000..1c1b51f --- /dev/null +++ "b/\346\225\260\346\215\256\345\272\223\350\204\232\346\234\254/MariaDB\347\211\210\346\234\254/MDB_tshotel_script_data.sql" @@ -0,0 +1,4533 @@ +INSERT INTO `administrator` (`id`, `admin_number`, `admin_account`, `admin_password`, `admin_type`, `admin_name`, `is_admin`, `delete_mk`, `datains_usr`, `datains_date`, `datachg_usr`, `datachg_date`) VALUES (1, '1263785187301658678', 'admin', 'clUKFMeIUWp6YflZweR0Cw==·#c0fbb?;*$>#;^b%$?>#%%#;^b%$?>#%%#;^b%$?>#%%#;^b%$?>#%% Date: Sat, 26 Apr 2025 21:20:58 +0800 Subject: [PATCH 4/5] add notice module. --- .../Business/Asset/AssetService.cs | 16 +- .../Business/Customer/CustomerService.cs | 144 +++--------------- .../EnergyManagementService.cs | 8 + .../IPromotionContentService.cs | 21 +++ .../PromotionContentService.cs | 61 ++++++++ .../Business/Room/RoomService.cs | 26 ++-- .../Business/Spend/SpendService.cs | 2 +- .../Employee/EmployeeService.cs | 12 +- .../RewardPunishmentService.cs | 4 +- .../Administrator/AdminService.cs | 2 +- .../SystemManagement/Base/BaseService.cs | 122 ++++++++++++++- .../SystemManagement/Base/IBaseService.cs | 31 ++++ .../SystemManagement/Notice/INoticeService.cs | 20 ++- .../SystemManagement/Notice/NoticeService.cs | 41 ++++- .../VipRule/VipRuleAppService.cs | 2 +- .../BaseDto/StatusCodeConstants.cs | 91 +++++++++++ .../Dto/UpdateEnergyManagementInputDto.cs | 2 +- .../Dto/CreatePromotionContentInputDto.cs | 5 +- .../Dto/DeletePromotionContentInputDto.cs | 1 - .../Dto/UpdatePromotionContentInputDto.cs | 6 +- .../CreateAppointmentNoticeTypeInputDto.cs | 21 +++ .../DeleteAppointmentNoticeTypeInputDto.cs | 16 ++ .../ReadAppointmentNoticeTypeInputDto.cs | 21 +++ .../ReadAppointmentNoticeTypeOutputDto.cs | 46 ++++++ .../UpdateAppointmentNoticeTypeInputDto.cs | 21 +++ .../SystemManagement/AppointmentNotice.cs | 2 +- .../SystemManagement/AppointmentNoticeType.cs | 31 ++++ .../EntityBuilder.cs | 13 ++ .../PromotionContent/FontsController.cs | 33 ++++ .../SystemManagement/Base/BaseController.cs | 47 ++++++ .../MigrationConfig/InitializeConfig.cs | 37 ++++- 31 files changed, 727 insertions(+), 178 deletions(-) create mode 100644 EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/AppointmentNoticeType/CreateAppointmentNoticeTypeInputDto.cs create mode 100644 EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/AppointmentNoticeType/DeleteAppointmentNoticeTypeInputDto.cs create mode 100644 EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/AppointmentNoticeType/ReadAppointmentNoticeTypeInputDto.cs create mode 100644 EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/AppointmentNoticeType/ReadAppointmentNoticeTypeOutputDto.cs create mode 100644 EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/AppointmentNoticeType/UpdateAppointmentNoticeTypeInputDto.cs create mode 100644 EOM.TSHotelManagement.Common.Core/SystemManagement/AppointmentNoticeType.cs diff --git a/EOM.TSHotelManagement.Application/Business/Asset/AssetService.cs b/EOM.TSHotelManagement.Application/Business/Asset/AssetService.cs index 8295c9f..6597482 100644 --- a/EOM.TSHotelManagement.Application/Business/Asset/AssetService.cs +++ b/EOM.TSHotelManagement.Application/Business/Asset/AssetService.cs @@ -71,6 +71,10 @@ namespace EOM.TSHotelManagement.Application { try { + if (assetRepository.IsAny(a => a.AssetNumber == asset.AssetNumber)) + { + return new BaseOutputDto() { Message = LocalizationHelper.GetLocalizedString("the asset number already exists.", "资产编号已存在"), StatusCode = StatusCodeConstants.InternalServerError }; + } var result = assetRepository.Insert(EntityMapper.Map(asset)); } catch (Exception ex) @@ -107,9 +111,9 @@ namespace EOM.TSHotelManagement.Application cs.listSource.ForEach(source => { - var dept = depts.FirstOrDefault(a => a.DepartmentNumber.Equals(source.DepartmentCode)); + var dept = depts.SingleOrDefault(a => a.DepartmentNumber.Equals(source.DepartmentCode)); source.DepartmentName = dept == null ? "" : dept.DepartmentName; - var worker = employees.FirstOrDefault(a => a.EmployeeId.Equals(source.AcquiredByEmployeeId)); + var worker = employees.SingleOrDefault(a => a.EmployeeId.Equals(source.AcquiredByEmployeeId)); source.AcquiredByEmployeeName = worker == null ? "" : worker.EmployeeName; source.AssetValueFormatted = source.AssetValue == 0 ? "" : Decimal.Parse(source.AssetValue.ToString()).ToString("#,##0.00").ToString(); @@ -128,6 +132,10 @@ namespace EOM.TSHotelManagement.Application { try { + if (!assetRepository.IsAny(a => a.AssetNumber == asset.AssetNumber)) + { + return new BaseOutputDto() { Message = LocalizationHelper.GetLocalizedString("asset number does not exist.", "资产编号不存在"), StatusCode = StatusCodeConstants.InternalServerError }; + } assetRepository.Update(EntityMapper.Map(asset)); } catch (Exception ex) @@ -146,6 +154,10 @@ namespace EOM.TSHotelManagement.Application { try { + if (!assetRepository.IsAny(a => a.AssetNumber == asset.AssetNumber)) + { + return new BaseOutputDto() { Message = LocalizationHelper.GetLocalizedString("asset number does not exist.", "资产编号不存在"), StatusCode = StatusCodeConstants.InternalServerError }; + } assetRepository.Update(EntityMapper.Map(asset)); } catch (Exception ex) diff --git a/EOM.TSHotelManagement.Application/Business/Customer/CustomerService.cs b/EOM.TSHotelManagement.Application/Business/Customer/CustomerService.cs index 1b7e8dd..3c74786 100644 --- a/EOM.TSHotelManagement.Application/Business/Customer/CustomerService.cs +++ b/EOM.TSHotelManagement.Application/Business/Customer/CustomerService.cs @@ -92,6 +92,10 @@ namespace EOM.TSHotelManagement.Application custo.CustomerPhoneNumber = NewTel; try { + if (custoRepository.IsAny(a => a.CustomerNumber == custo.CustomerNumber)) + { + return new BaseOutputDto() { Message = LocalizationHelper.GetLocalizedString("customer number already exist.", "客户编号已存在"), StatusCode = StatusCodeConstants.InternalServerError }; + } var result = custoRepository.Insert(EntityMapper.Map(custo)); } catch (Exception ex) @@ -116,6 +120,10 @@ namespace EOM.TSHotelManagement.Application custo.CustomerPhoneNumber = NewTel; try { + if (!custoRepository.IsAny(a => a.CustomerNumber == custo.CustomerNumber)) + { + return new BaseOutputDto() { Message = LocalizationHelper.GetLocalizedString("customer number does not exist.", "客户编号不存在"), StatusCode = StatusCodeConstants.InternalServerError }; + } var result = custoRepository.Update(EntityMapper.Map(custo)); if (result) @@ -141,6 +149,10 @@ namespace EOM.TSHotelManagement.Application /// public BaseOutputDto DelCustomerInfo(DeleteCustomerInputDto custo) { + if (!custoRepository.IsAny(a => a.CustomerNumber == custo.CustomerNumber)) + { + return new BaseOutputDto() { Message = LocalizationHelper.GetLocalizedString("customer number does not exist.", "客户编号不存在"), StatusCode = StatusCodeConstants.InternalServerError }; + } var occupied = Convert.ToInt32(RoomState.Occupied); var isOccupied = custoRepository.Change().IsAny(a => a.CustomerNumber == custo.CustomerNumber && a.RoomStateId == occupied); var haveUnSettle = custoRepository.Change().IsAny(a => a.CustomerNumber == custo.CustomerNumber && a.SettlementStatus == SpendConsts.UnSettle); @@ -175,6 +187,10 @@ namespace EOM.TSHotelManagement.Application { try { + if (!custoRepository.IsAny(a => a.CustomerNumber == updateCustomerInputDto.CustomerNumber)) + { + return new BaseOutputDto() { Message = LocalizationHelper.GetLocalizedString("customer number does not exist.", "客户编号不存在"), StatusCode = StatusCodeConstants.InternalServerError }; + } var result = custoRepository.Update(EntityMapper.Map(updateCustomerInputDto)); if (result) @@ -302,15 +318,15 @@ namespace EOM.TSHotelManagement.Application } //性别类型 - var sexType = genders.FirstOrDefault(a => a.Id == source.CustomerGender); + var sexType = genders.SingleOrDefault(a => a.Id == source.CustomerGender); source.GenderName = sexType?.Description ?? ""; //证件类型 - var passPortType = passPortTypes.FirstOrDefault(a => a.PassportId == source.PassportId); + var passPortType = passPortTypes.SingleOrDefault(a => a.PassportId == source.PassportId); source.PassportName = passPortType?.PassportName ?? ""; //客户类型 - var custoType = custoTypes.FirstOrDefault(a => a.CustomerType == source.CustomerType); + var custoType = custoTypes.SingleOrDefault(a => a.CustomerType == source.CustomerType); source.CustomerTypeName = custoType?.CustomerTypeName ?? ""; }); @@ -320,92 +336,6 @@ namespace EOM.TSHotelManagement.Application return oSelectCustoAllDto; } - /// - /// 查询指定客户信息 - /// - /// - //public ListOutputDto SelectCustomers(Customer custo) - //{ - // var customers = new ListOutputDto(); - - // var where = Expressionable.Create(); - - // //查询出所有性别类型 - // List sexTypes = new List(); - // sexTypes = sexTypeRepository.GetList(); - // //查询出所有证件类型 - // List passPortTypes = new List(); - // passPortTypes = passPortTypeRepository.GetList(); - // //查询出所有客户类型 - // List custoTypes = new List(); - // custoTypes = custoTypeRepository.GetList(); - // //查询出所有客户信息 - // List custos = new List(); - - // if (!custo.CustomerNumber.IsNullOrEmpty()) - // { - // where = where.And(a => a.CustomerNumber.Equals(custo.CustomerNumber)); - // } - // if (!custo.CustomerName.IsNullOrEmpty()) - // { - // where = where.And(a => a.CustomerName.Contains(custo.CustomerName)); - // } - // if (!custo.CustomerPhoneNumber.IsNullOrEmpty()) - // { - // where = where.And(a => a.CustomerPhoneNumber.Contains(custo.CustomerPhoneNumber)); - // } - // if (!custo.CustomerAddress.IsNullOrEmpty()) - // { - // where = where.And(a => a.CustomerAddress.Contains(custo.CustomerAddress)); - // } - // if (!custo.PassportID.IsNullOrEmpty()) - // { - // where = where.And(a => a.PassportID.Contains(custo.PassportID)); - // } - // if (!custo.IsDelete.IsNullOrEmpty()) - // { - // where = where.And(a => a.IsDelete == custo.IsDelete); - // } - - // int totalCount = 0; - // if (custo.Page != 0 && custo.PageSize != 0) - // { - // customers.listSource = custoRepository.AsQueryable().Where(where.ToExpression()).OrderBy(a => a.CustomerNumber) - // .ToPageList((int)custo.Page, (int)custo.PageSize, ref totalCount); - // customers.total = totalCount; - // } - - // customers.listSource.ForEach(source => - // { - // try - // { - // //解密身份证号码 - // var sourceStr = source.PassportID.Contains('·') ? encrypt.Decryption(source.PassportID) : dataProtector.Unprotect(source.PassportID); - // source.PassportID = sourceStr; - // //解密联系方式 - // var sourceTelStr = source.CustomerPhoneNumber.Contains('·') ? encrypt.Decryption(source.CustomerPhoneNumber) : dataProtector.Unprotect(source.CustomerPhoneNumber); - // source.CustomerPhoneNumber = sourceTelStr; - // } - // catch (Exception) - // { - // source.PassportID = source.PassportID; - // source.CustomerPhoneNumber = source.CustomerPhoneNumber; - // } - // //性别类型 - // var sexType = sexTypes.FirstOrDefault(a => a.GenderId == source.CustomerGender); - // source.GenderName = sexType.GenderName.IsNullOrEmpty() ? "" : sexType.GenderName; - // //证件类型 - // var passPortType = passPortTypes.FirstOrDefault(a => a.PassportId == source.PassportType); - // source.PassportTypeName = passPortType.PassportName.IsNullOrEmpty() ? "" : passPortType.PassportName; - // //客户类型 - // var custoType = custoTypes.FirstOrDefault(a => a.CustomerType == source.CustomerType); - // source.CustomerTypeName = custoType.CustomerTypeName.IsNullOrEmpty() ? "" : custoType.CustomerTypeName; - // }); - - // return customers; - - //} - /// /// 查询指定客户信息 /// @@ -460,13 +390,13 @@ namespace EOM.TSHotelManagement.Application customer.CustomerPhoneNumber = customer.CustomerPhoneNumber; } //性别类型 - var sexType = genders.FirstOrDefault(a => a.Id == customer.CustomerGender); + var sexType = genders.SingleOrDefault(a => a.Id == customer.CustomerGender); customer.GenderName = sexType.Description.IsNullOrEmpty() ? "" : sexType.Description; //证件类型 - var passPortType = passPortTypes.FirstOrDefault(a => a.PassportId == customer.PassportId); + var passPortType = passPortTypes.SingleOrDefault(a => a.PassportId == customer.PassportId); customer.PassportName = passPortType.PassportName.IsNullOrEmpty() ? "" : passPortType.PassportName; //客户类型 - var custoType = custoTypes.FirstOrDefault(a => a.CustomerType == customer.CustomerType); + var custoType = custoTypes.SingleOrDefault(a => a.CustomerType == customer.CustomerType); customer.CustomerTypeName = custoType.CustomerTypeName.IsNullOrEmpty() ? "" : custoType.CustomerTypeName; singleOutputDto.Source = EntityMapper.Map(customer); @@ -474,35 +404,5 @@ namespace EOM.TSHotelManagement.Application return singleOutputDto; } - /// - /// 根据客户编号查询客户信息 - /// - /// - /// - //public Customer SelectCardInfoByCustoNo(string CustoNo) - //{ - // Customer c = custoRepository.GetSingle(a => a.CustomerNumber.Equals(CustoNo)); - // if (c.IsNullOrEmpty()) - // { - // return null; - // } - // //性别类型 - // var sexType = sexTypeRepository.GetSingle(a => a.GenderId == c.CustomerGender); - // c.GenderName = sexType.GenderName.IsNullOrEmpty() ? "" : sexType.GenderName; - // //证件类型 - // var passPortType = passPortTypeRepository.GetSingle(a => a.PassportId == c.PassportType); - // c.PassportTypeName = passPortType.PassportName.IsNullOrEmpty() ? "" : passPortType.PassportName; - // //客户类型 - // var custoType = custoTypeRepository.GetSingle(a => a.CustomerType == c.CustomerType); - // c.CustomerTypeName = custoType.CustomerTypeName.IsNullOrEmpty() ? "" : custoType.CustomerTypeName; - // //解密身份证号码 - // var sourceStr = c.PassportID.Contains("·") ? encrypt.Decryption(c.PassportID) : c.PassportID; - // c.PassportID = sourceStr; - // //解密联系方式 - // var sourceTelStr = c.CustomerPhoneNumber.Contains("·") ? encrypt.Decryption(c.CustomerPhoneNumber) : c.CustomerPhoneNumber; - // c.CustomerPhoneNumber = sourceTelStr; - // return c; - //} - } } diff --git a/EOM.TSHotelManagement.Application/Business/EnergyManagement/EnergyManagementService.cs b/EOM.TSHotelManagement.Application/Business/EnergyManagement/EnergyManagementService.cs index 2d5a04e..675de59 100644 --- a/EOM.TSHotelManagement.Application/Business/EnergyManagement/EnergyManagementService.cs +++ b/EOM.TSHotelManagement.Application/Business/EnergyManagement/EnergyManagementService.cs @@ -97,6 +97,10 @@ namespace EOM.TSHotelManagement.Application { try { + if (wtiRepository.IsAny(a => a.InformationId == w.InformationNumber)) + { + return new BaseOutputDto() { Message = LocalizationHelper.GetLocalizedString("information number already exist.", "信息编号已存在"), StatusCode = StatusCodeConstants.InternalServerError }; + } var result = wtiRepository.Insert(EntityMapper.Map(w)); } catch (Exception ex) @@ -117,6 +121,10 @@ namespace EOM.TSHotelManagement.Application { try { + if (!wtiRepository.IsAny(a => a.InformationId == w.InformationId)) + { + return new BaseOutputDto() { Message = LocalizationHelper.GetLocalizedString("information number does not exist.", "信息编号不存在"), StatusCode = StatusCodeConstants.InternalServerError }; + } var result = wtiRepository.Update(EntityMapper.Map(w)); if (result) diff --git a/EOM.TSHotelManagement.Application/Business/PromotionContent/IPromotionContentService.cs b/EOM.TSHotelManagement.Application/Business/PromotionContent/IPromotionContentService.cs index 631460a..0746465 100644 --- a/EOM.TSHotelManagement.Application/Business/PromotionContent/IPromotionContentService.cs +++ b/EOM.TSHotelManagement.Application/Business/PromotionContent/IPromotionContentService.cs @@ -41,5 +41,26 @@ namespace EOM.TSHotelManagement.Application /// /// ListOutputDto SelectPromotionContents(); + + /// + /// 添加宣传联动内容 + /// + /// + /// + BaseOutputDto AddPromotionContent(CreatePromotionContentInputDto createPromotionContentInputDto); + + /// + /// 删除宣传联动内容 + /// + /// + /// + BaseOutputDto DeletePromotionContent(DeletePromotionContentInputDto deletePromotionContentInputDto); + + /// + /// 更新宣传联动内容 + /// + /// + /// + BaseOutputDto UpdatePromotionContent(UpdatePromotionContentInputDto updatePromotionContentInputDto); } } \ No newline at end of file diff --git a/EOM.TSHotelManagement.Application/Business/PromotionContent/PromotionContentService.cs b/EOM.TSHotelManagement.Application/Business/PromotionContent/PromotionContentService.cs index e7a35dd..e310c8c 100644 --- a/EOM.TSHotelManagement.Application/Business/PromotionContent/PromotionContentService.cs +++ b/EOM.TSHotelManagement.Application/Business/PromotionContent/PromotionContentService.cs @@ -74,5 +74,66 @@ namespace EOM.TSHotelManagement.Application fonts.listSource = EntityMapper.MapList(listSource); return fonts; } + + /// + /// 添加宣传联动内容 + /// + /// + /// + public BaseOutputDto AddPromotionContent(CreatePromotionContentInputDto createPromotionContentInputDto) + { + try + { + fontsRepository.Insert(EntityMapper.Map(createPromotionContentInputDto)); + } + catch (Exception ex) + { + LogHelper.LogError(LocalizationHelper.GetLocalizedString("Insert Promotion Content Failed", "宣传联动内容添加失败"), ex); + return new BaseOutputDto(StatusCodeConstants.InternalServerError, LocalizationHelper.GetLocalizedString("Insert Promotion Content Failed", "宣传联动内容添加失败")); + } + + return new BaseOutputDto(StatusCodeConstants.Success, LocalizationHelper.GetLocalizedString("Insert Promotion Content Success", "宣传联动内容添加成功")); + } + + /// + /// 删除宣传联动内容 + /// + /// + /// + public BaseOutputDto DeletePromotionContent(DeletePromotionContentInputDto deletePromotionContentInputDto) + { + try + { + fontsRepository.Update(EntityMapper.Map(deletePromotionContentInputDto)); + } + catch (Exception ex) + { + LogHelper.LogError(LocalizationHelper.GetLocalizedString("Delete Promotion Content Failed", "宣传联动内容删除失败"), ex); + return new BaseOutputDto(StatusCodeConstants.InternalServerError, LocalizationHelper.GetLocalizedString("Delete Promotion Content Failed", "宣传联动内容删除失败")); + } + + return new BaseOutputDto(StatusCodeConstants.Success, LocalizationHelper.GetLocalizedString("Delete Promotion Content Success", "宣传联动内容删除成功")); + } + + /// + /// 更新宣传联动内容 + /// + /// + /// + public BaseOutputDto UpdatePromotionContent(UpdatePromotionContentInputDto updatePromotionContentInputDto) + { + try + { + fontsRepository.Update(EntityMapper.Map(updatePromotionContentInputDto)); + } + catch (Exception ex) + { + LogHelper.LogError(LocalizationHelper.GetLocalizedString("Update Promotion Content Failed", "宣传联动内容更新失败"), ex); + return new BaseOutputDto(StatusCodeConstants.InternalServerError, LocalizationHelper.GetLocalizedString("Update Promotion Content Failed", "宣传联动内容更新失败")); + } + + return new BaseOutputDto(StatusCodeConstants.Success, LocalizationHelper.GetLocalizedString("Update Promotion Content Success", "宣传联动内容更新成功")); + + } } } diff --git a/EOM.TSHotelManagement.Application/Business/Room/RoomService.cs b/EOM.TSHotelManagement.Application/Business/Room/RoomService.cs index 1781b0c..72f42f2 100644 --- a/EOM.TSHotelManagement.Application/Business/Room/RoomService.cs +++ b/EOM.TSHotelManagement.Application/Business/Room/RoomService.cs @@ -88,9 +88,9 @@ namespace EOM.TSHotelManagement.Application rooms = roomRepository.GetList(a => a.IsDelete != 1 && a.RoomStateId == readRoomInputDto.RoomStateId).OrderBy(a => a.RoomNumber).ToList(); rooms.ForEach(source => { - var roomState = roomStates.FirstOrDefault(a => a.Id == source.RoomStateId); + var roomState = roomStates.SingleOrDefault(a => a.Id == source.RoomStateId); source.RoomState = roomState.Description.IsNullOrEmpty() ? "" : roomState.Description; - var roomType = roomTypes.FirstOrDefault(a => a.RoomTypeId == source.RoomTypeId); + var roomType = roomTypes.SingleOrDefault(a => a.RoomTypeId == source.RoomTypeId); source.RoomName = roomType.RoomTypeName.IsNullOrEmpty() ? "" : roomType.RoomTypeName; }); @@ -122,9 +122,9 @@ namespace EOM.TSHotelManagement.Application rooms = roomRepository.GetList(a => a.IsDelete != 1 && a.RoomStateId == 0).OrderBy(a => a.RoomNumber).ToList(); rooms.ForEach(source => { - var roomState = roomStates.FirstOrDefault(a => a.Id == source.RoomStateId); + var roomState = roomStates.SingleOrDefault(a => a.Id == source.RoomStateId); source.RoomState = roomState.Description.IsNullOrEmpty() ? "" : roomState.Description; - var roomType = roomTypes.FirstOrDefault(a => a.RoomTypeId == source.RoomTypeId); + var roomType = roomTypes.SingleOrDefault(a => a.RoomTypeId == source.RoomTypeId); source.RoomName = roomType.RoomTypeName.IsNullOrEmpty() ? "" : roomType.RoomTypeName; }); @@ -180,12 +180,12 @@ namespace EOM.TSHotelManagement.Application rooms.ForEach(source => { - var roomState = roomStates.FirstOrDefault(a => a.Id == source.RoomStateId); + var roomState = roomStates.SingleOrDefault(a => a.Id == source.RoomStateId); source.RoomState = roomState.Description.IsNullOrEmpty() ? "" : roomState.Description; - var roomType = roomTypes.FirstOrDefault(a => a.RoomTypeId == source.RoomTypeId); + var roomType = roomTypes.SingleOrDefault(a => a.RoomTypeId == source.RoomTypeId); source.RoomName = roomType.RoomTypeName.IsNullOrEmpty() ? "" : roomType.RoomTypeName; - var custo = custos.FirstOrDefault(a => a.CustomerNumber.Equals(source.CustomerNumber)); + var custo = custos.SingleOrDefault(a => a.CustomerNumber.Equals(source.CustomerNumber)); source.CustomerName = custo.IsNullOrEmpty() ? "" : custo.CustomerName; //把入住时间格式化 @@ -225,12 +225,12 @@ namespace EOM.TSHotelManagement.Application custos = custoRepository.GetList(a => listCustoNo.Contains(a.CustomerNumber)); rooms.ForEach(source => { - var roomState = roomStates.FirstOrDefault(a => a.Id == source.RoomStateId); + var roomState = roomStates.SingleOrDefault(a => a.Id == source.RoomStateId); source.RoomState = roomState.Description.IsNullOrEmpty() ? "" : roomState.Description; - var roomType = roomTypes.FirstOrDefault(a => a.RoomTypeId == source.RoomTypeId); + var roomType = roomTypes.SingleOrDefault(a => a.RoomTypeId == source.RoomTypeId); source.RoomName = roomType.RoomTypeName.IsNullOrEmpty() ? "" : roomType.RoomTypeName; - var custo = custos.FirstOrDefault(a => a.CustomerNumber.Equals(source.CustomerNumber)); + var custo = custos.SingleOrDefault(a => a.CustomerNumber.Equals(source.CustomerNumber)); source.CustomerName = custo.IsNullOrEmpty() ? "" : custo.CustomerName; }); @@ -261,7 +261,7 @@ namespace EOM.TSHotelManagement.Application room = roomRepository.GetSingle(a => a.IsDelete != 1 && a.RoomNumber == readRoomInputDto.RoomNumber); if (!room.IsNullOrEmpty()) { - var roomSate = roomStates.FirstOrDefault(a => a.Id == room.RoomStateId); + var roomSate = roomStates.SingleOrDefault(a => a.Id == room.RoomStateId); room.RoomState = roomSate.Description.IsNullOrEmpty() ? "" : roomSate.Description; var roomType = roomTypeRepository.GetSingle(a => a.RoomTypeId == room.RoomTypeId); room.RoomName = roomType.RoomTypeName.IsNullOrEmpty() ? "" : roomType.RoomTypeName; @@ -598,9 +598,9 @@ namespace EOM.TSHotelManagement.Application rooms = roomRepository.GetList(a => a.IsDelete != 1 && a.RoomStateId == 1).OrderBy(a => a.RoomNumber).ToList(); rooms.ForEach(source => { - var roomState = roomStates.FirstOrDefault(a => a.Id == source.RoomStateId); + var roomState = roomStates.SingleOrDefault(a => a.Id == source.RoomStateId); source.RoomState = roomState.Description.IsNullOrEmpty() ? "" : roomState.Description; - var roomType = roomTypes.FirstOrDefault(a => a.RoomTypeId == source.RoomTypeId); + var roomType = roomTypes.SingleOrDefault(a => a.RoomTypeId == source.RoomTypeId); source.RoomName = roomType.RoomTypeName.IsNullOrEmpty() ? "" : roomType.RoomTypeName; }); diff --git a/EOM.TSHotelManagement.Application/Business/Spend/SpendService.cs b/EOM.TSHotelManagement.Application/Business/Spend/SpendService.cs index 8142dad..07654e9 100644 --- a/EOM.TSHotelManagement.Application/Business/Spend/SpendService.cs +++ b/EOM.TSHotelManagement.Application/Business/Spend/SpendService.cs @@ -149,7 +149,7 @@ namespace EOM.TSHotelManagement.Application { if (source.ProductNumber.IsNullOrEmpty()) { - var spendInfo = spendInfos.FirstOrDefault(a => a.ProductName.Equals(source.ProductName)); + var spendInfo = spendInfos.SingleOrDefault(a => a.ProductName.Equals(source.ProductName)); if (spendInfo != null) { source.ProductNumber = spendInfo.ProductNumber; diff --git a/EOM.TSHotelManagement.Application/Employee/EmployeeService.cs b/EOM.TSHotelManagement.Application/Employee/EmployeeService.cs index 63debef..80aab99 100644 --- a/EOM.TSHotelManagement.Application/Employee/EmployeeService.cs +++ b/EOM.TSHotelManagement.Application/Employee/EmployeeService.cs @@ -281,19 +281,19 @@ namespace EOM.TSHotelManagement.Application source.PhoneNumber = source.PhoneNumber; } //性别类型 - var sexType = genders.FirstOrDefault(a => a.Id == source.Gender); + var sexType = genders.SingleOrDefault(a => a.Id == source.Gender); source.GenderName = sexType.IsNullOrEmpty() ? "" : sexType.Description; //教育程度 - var eduction = educations.FirstOrDefault(a => a.EducationNumber == source.EducationLevel); + var eduction = educations.SingleOrDefault(a => a.EducationNumber == source.EducationLevel); source.EducationLevelName = eduction.IsNullOrEmpty() ? "" : eduction.EducationName; //民族类型 - var nation = nations.FirstOrDefault(a => a.NationNumber == source.Ethnicity); + var nation = nations.SingleOrDefault(a => a.NationNumber == source.Ethnicity); source.EthnicityName = nation.IsNullOrEmpty() ? "" : nation.NationName; //部门 - var dept = depts.FirstOrDefault(a => a.DepartmentNumber == source.Department); + var dept = depts.SingleOrDefault(a => a.DepartmentNumber == source.Department); source.DepartmentName = dept.IsNullOrEmpty() ? "" : dept.DepartmentName; //职位 - var position = positions.FirstOrDefault(a => a.PositionNumber == source.Position); + var position = positions.SingleOrDefault(a => a.PositionNumber == source.Position); source.PositionName = position.IsNullOrEmpty() ? "" : position.PositionName; var passport = passportTypes.SingleOrDefault(a => a.PassportId == source.IdCardType); source.IdCardTypeName = passport.IsNullOrEmpty() ? "" : passport.PassportName; @@ -509,7 +509,7 @@ namespace EOM.TSHotelManagement.Application FieldInfo field = enumType.GetField(enumName); DescriptionAttribute attribute = field? .GetCustomAttributes(typeof(DescriptionAttribute), false) - .FirstOrDefault() as DescriptionAttribute; + .SingleOrDefault() as DescriptionAttribute; string description = attribute?.Description ?? enumName; diff --git a/EOM.TSHotelManagement.Application/Employee/RewardPunishment/RewardPunishmentService.cs b/EOM.TSHotelManagement.Application/Employee/RewardPunishment/RewardPunishmentService.cs index 5cd6352..311d2d9 100644 --- a/EOM.TSHotelManagement.Application/Employee/RewardPunishment/RewardPunishmentService.cs +++ b/EOM.TSHotelManagement.Application/Employee/RewardPunishment/RewardPunishmentService.cs @@ -125,11 +125,11 @@ namespace EOM.TSHotelManagement.Application gb.ForEach(source => { //奖惩类型 - var gbType = gBTypes.FirstOrDefault(a => a.RewardPunishmentTypeId == source.RewardPunishmentType); + var gbType = gBTypes.SingleOrDefault(a => a.RewardPunishmentTypeId == source.RewardPunishmentType); source.RewardPunishmentTypeName = gbType.RewardPunishmentTypeName.IsNullOrEmpty() ? "" : gbType.RewardPunishmentTypeName; //操作人 - var admin = admins.FirstOrDefault(a => a.Account == source.RewardPunishmentOperator); + var admin = admins.SingleOrDefault(a => a.Account == source.RewardPunishmentOperator); source.OperatorName = admin.Name.IsNullOrEmpty() ? "" : admin.Name; }); diff --git a/EOM.TSHotelManagement.Application/SystemManagement/Administrator/AdminService.cs b/EOM.TSHotelManagement.Application/SystemManagement/Administrator/AdminService.cs index ff6e9b2..ebbff17 100644 --- a/EOM.TSHotelManagement.Application/SystemManagement/Administrator/AdminService.cs +++ b/EOM.TSHotelManagement.Application/SystemManagement/Administrator/AdminService.cs @@ -247,7 +247,7 @@ namespace EOM.TSHotelManagement.Application var isAdminType = admins.IsSuperAdmin == 1 ? "是" : "否"; admins.IsSuperAdminDescription = isAdminType; - var adminType = listAdminType.FirstOrDefault(a => a.TypeId.Equals(admins.Type)); + var adminType = listAdminType.SingleOrDefault(a => a.TypeId.Equals(admins.Type)); admins.TypeName = adminType == null ? "" : adminType.TypeName; var adminDelete = admins.IsDelete == 1 ? "是" : "否"; diff --git a/EOM.TSHotelManagement.Application/SystemManagement/Base/BaseService.cs b/EOM.TSHotelManagement.Application/SystemManagement/Base/BaseService.cs index 062d087..c97c287 100644 --- a/EOM.TSHotelManagement.Application/SystemManagement/Base/BaseService.cs +++ b/EOM.TSHotelManagement.Application/SystemManagement/Base/BaseService.cs @@ -81,6 +81,11 @@ namespace EOM.TSHotelManagement.Application /// private readonly GenericRepository baseRepository; + /// + /// 公告类型 + /// + private readonly GenericRepository appointmentNoticeTypeRepository; + /// /// /// @@ -93,7 +98,8 @@ namespace EOM.TSHotelManagement.Application /// /// /// - public BaseService(GenericRepository workerRepository, GenericRepository educationRepository, GenericRepository nationRepository, GenericRepository deptRepository, GenericRepository positionRepository, GenericRepository passPortTypeRepository, GenericRepository custoTypeRepository, GenericRepository goodbadTypeRepository, GenericRepository baseRepository) + /// + public BaseService(GenericRepository workerRepository, GenericRepository educationRepository, GenericRepository nationRepository, GenericRepository deptRepository, GenericRepository positionRepository, GenericRepository passPortTypeRepository, GenericRepository custoTypeRepository, GenericRepository goodbadTypeRepository, GenericRepository baseRepository, GenericRepository appointmentNoticeTypeRepository) { this.workerRepository = workerRepository; this.educationRepository = educationRepository; @@ -104,6 +110,7 @@ namespace EOM.TSHotelManagement.Application this.custoTypeRepository = custoTypeRepository; this.goodbadTypeRepository = goodbadTypeRepository; this.baseRepository = baseRepository; + this.appointmentNoticeTypeRepository = appointmentNoticeTypeRepository; } #region 性别模块 @@ -873,5 +880,118 @@ namespace EOM.TSHotelManagement.Application } #endregion + + #region 公告类型模块 + + /// + /// 查询所有公告类型 + /// + /// + public ListOutputDto SelectAppointmentNoticeTypeAll(ReadAppointmentNoticeTypeInputDto readAppointmentNoticeTypeInputDto) + { + var listSource = new List(); + + var where = Expressionable.Create(); + + if (!readAppointmentNoticeTypeInputDto.IsDelete.IsNullOrEmpty()) + { + where = where.And(a => a.IsDelete == readAppointmentNoticeTypeInputDto.IsDelete); + } + + var count = 0; + + if (!readAppointmentNoticeTypeInputDto.IgnorePaging && readAppointmentNoticeTypeInputDto.Page != 0 && readAppointmentNoticeTypeInputDto.PageSize != 0) + { + listSource = appointmentNoticeTypeRepository.AsQueryable().Where(where.ToExpression()) + .ToPageList(readAppointmentNoticeTypeInputDto.Page, readAppointmentNoticeTypeInputDto.PageSize, ref count); + } + else + { + listSource = appointmentNoticeTypeRepository.AsQueryable().Where(where.ToExpression()).ToList(); + } + + var result = EntityMapper.MapList(listSource); + + return new ListOutputDto { listSource = result, total = count }; + } + + /// + /// 添加公告类型 + /// + /// + /// + public BaseOutputDto CreateAppointmentNoticeType(CreateAppointmentNoticeTypeInputDto createAppointmentNoticeTypeInputDto) + { + try + { + if (appointmentNoticeTypeRepository.IsAny(a => a.NoticeTypeNumber == createAppointmentNoticeTypeInputDto.NoticeTypeNumber)) + { + return new BaseOutputDto { StatusCode = StatusCodeConstants.InternalServerError, Message = LocalizationHelper.GetLocalizedString("appointment notice number already exits.","公告类型编号已存在") }; + } + appointmentNoticeTypeRepository.Insert(EntityMapper.Map(createAppointmentNoticeTypeInputDto)); + } + catch (Exception ex) + { + LogHelper.LogError(LocalizationHelper.GetLocalizedString("insert appointment notice failed.", "公告类型添加失败"), ex); + return new BaseOutputDto { StatusCode = StatusCodeConstants.InternalServerError, Message = LocalizationHelper.GetLocalizedString("insert appointment notice failed.", "公告类型添加失败") }; + } + + return new BaseOutputDto { StatusCode = StatusCodeConstants.Success, Message = LocalizationHelper.GetLocalizedString("insert appointment notice successful.", "公告类型添加成功") }; + } + + /// + /// 删除公告类型 + /// + /// + /// + public BaseOutputDto DeleteAppointmentNoticeType(DeleteAppointmentNoticeTypeInputDto deleteAppointmentNoticeTypeInputDto) + { + try + { + if (!appointmentNoticeTypeRepository.IsAny(a => a.NoticeTypeNumber == deleteAppointmentNoticeTypeInputDto.NoticeTypeNumber)) + { + return new BaseOutputDto { StatusCode = StatusCodeConstants.InternalServerError, Message = LocalizationHelper.GetLocalizedString("appointment notice number does not already.", "公告类型编号不存在") }; + } + appointmentNoticeTypeRepository.Update(a => new AppointmentNoticeType + { + IsDelete = 1, + DataChgUsr = deleteAppointmentNoticeTypeInputDto.DataChgUsr, + DataChgDate = deleteAppointmentNoticeTypeInputDto.DataChgDate + }, a => a.NoticeTypeNumber == deleteAppointmentNoticeTypeInputDto.NoticeTypeNumber); + } + catch (Exception ex) + { + LogHelper.LogError(LocalizationHelper.GetLocalizedString("delete appointment notice failed.", "公告类型删除失败"), ex); + return new BaseOutputDto { StatusCode = StatusCodeConstants.InternalServerError, Message = LocalizationHelper.GetLocalizedString("delete appointment notice failed.", "公告类型删除失败") }; + } + + return new BaseOutputDto { StatusCode = StatusCodeConstants.Success, Message = LocalizationHelper.GetLocalizedString("delete appointment notice successful.", "公告类型删除成功") }; + } + + /// + /// 更新公告类型 + /// + /// + /// + public BaseOutputDto UpdateAppointmentNoticeType(UpdateAppointmentNoticeTypeInputDto updateAppointmentNoticeTypeInputDto) + { + try + { + if (!appointmentNoticeTypeRepository.IsAny(a => a.NoticeTypeNumber == updateAppointmentNoticeTypeInputDto.NoticeTypeNumber)) + { + return new BaseOutputDto { StatusCode = StatusCodeConstants.InternalServerError, Message = LocalizationHelper.GetLocalizedString("appointment notice number does not already.", "公告类型编号不存在") }; + } + appointmentNoticeTypeRepository.Update(EntityMapper.Map(updateAppointmentNoticeTypeInputDto)); + } + catch (Exception ex) + { + LogHelper.LogError(LocalizationHelper.GetLocalizedString("update appointment notice failed.", "公告类型更新失败"), ex); + return new BaseOutputDto { StatusCode = StatusCodeConstants.InternalServerError, Message = LocalizationHelper.GetLocalizedString("update appointment notice failed.", "公告类型更新失败") }; + } + + return new BaseOutputDto { StatusCode = StatusCodeConstants.Success, Message = LocalizationHelper.GetLocalizedString("update appointment notice successful.", "公告类型更新成功") }; + } + + #endregion } } diff --git a/EOM.TSHotelManagement.Application/SystemManagement/Base/IBaseService.cs b/EOM.TSHotelManagement.Application/SystemManagement/Base/IBaseService.cs index 3ee2485..5f6fb99 100644 --- a/EOM.TSHotelManagement.Application/SystemManagement/Base/IBaseService.cs +++ b/EOM.TSHotelManagement.Application/SystemManagement/Base/IBaseService.cs @@ -350,5 +350,36 @@ namespace EOM.TSHotelManagement.Application /// SingleOutputDto GetBase(); #endregion + + #region 公告类型模块 + + /// + /// 查询所有公告类型 + /// + /// + ListOutputDto SelectAppointmentNoticeTypeAll(ReadAppointmentNoticeTypeInputDto readAppointmentNoticeTypeInputDto); + + /// + /// 添加公告类型 + /// + /// + /// + BaseOutputDto CreateAppointmentNoticeType(CreateAppointmentNoticeTypeInputDto createAppointmentNoticeTypeInputDto); + + /// + /// 删除公告类型 + /// + /// + /// + BaseOutputDto DeleteAppointmentNoticeType(DeleteAppointmentNoticeTypeInputDto deleteAppointmentNoticeTypeInputDto); + + /// + /// 更新公告类型 + /// + /// + /// + BaseOutputDto UpdateAppointmentNoticeType(UpdateAppointmentNoticeTypeInputDto updateAppointmentNoticeTypeInputDto); + + #endregion } } diff --git a/EOM.TSHotelManagement.Application/SystemManagement/Notice/INoticeService.cs b/EOM.TSHotelManagement.Application/SystemManagement/Notice/INoticeService.cs index 4b374c2..b2a7297 100644 --- a/EOM.TSHotelManagement.Application/SystemManagement/Notice/INoticeService.cs +++ b/EOM.TSHotelManagement.Application/SystemManagement/Notice/INoticeService.cs @@ -30,14 +30,12 @@ namespace EOM.TSHotelManagement.Application /// public interface INoticeService { - #region 获取所有公告信息 /// /// 获取所有公告信息 /// /// ListOutputDto SelectNoticeAll(ReadAppointmentNoticeInputDto readAppointmentNoticeInputDto); - #endregion - + /// /// 查询公告 /// @@ -45,7 +43,6 @@ namespace EOM.TSHotelManagement.Application /// ReadAppointmentNoticeOutputDto SelectNoticeByNoticeNo(ReadAppointmentNoticeInputDto readAppointmentNoticeInputDto); - #region 上传公告信息 /// /// 上传公告信息 /// @@ -53,6 +50,19 @@ namespace EOM.TSHotelManagement.Application /// BaseOutputDto InsertNotice(CreateAppointmentNoticeInputDto createAppointmentNoticeInputDto); - #endregion + /// + /// 删除公告信息 + /// + /// + /// + BaseOutputDto DeleteNotice(DeleteAppointmentNoticeInputDto deleteAppointmentNoticeInputDto); + + /// + /// 更新公告信息 + /// + /// + /// + BaseOutputDto UpdateNotice(UpdateAppointmentNoticeInputDto updateAppointmentNoticeInputDto); + } } \ No newline at end of file diff --git a/EOM.TSHotelManagement.Application/SystemManagement/Notice/NoticeService.cs b/EOM.TSHotelManagement.Application/SystemManagement/Notice/NoticeService.cs index 9404dbb..bc0ff20 100644 --- a/EOM.TSHotelManagement.Application/SystemManagement/Notice/NoticeService.cs +++ b/EOM.TSHotelManagement.Application/SystemManagement/Notice/NoticeService.cs @@ -49,7 +49,6 @@ namespace EOM.TSHotelManagement.Application this.noticeRepository = noticeRepository; } - #region 获取所有公告信息 /// /// 获取所有公告信息 /// @@ -93,7 +92,6 @@ namespace EOM.TSHotelManagement.Application total = listSource.Count }; } - #endregion /// /// 根据公告编号查找公告信息 @@ -118,7 +116,6 @@ namespace EOM.TSHotelManagement.Application return source; } - #region 上传公告信息 /// /// 上传公告信息 /// @@ -137,7 +134,43 @@ namespace EOM.TSHotelManagement.Application return new BaseOutputDto(); } - #endregion + /// + /// 删除公告信息 + /// + /// + /// + public BaseOutputDto DeleteNotice(DeleteAppointmentNoticeInputDto deleteAppointmentNoticeInputDto) + { + try + { + noticeRepository.Update(EntityMapper.Map(deleteAppointmentNoticeInputDto)); + } + catch (Exception ex) + { + LogHelper.LogError(LocalizationHelper.GetLocalizedString("delete appointment notice failed","删除公告失败"),ex); + return new BaseOutputDto { Message = LocalizationHelper.GetLocalizedString("delete appointment notice failed", "删除公告失败"), StatusCode = StatusCodeConstants.InternalServerError }; + } + return new BaseOutputDto(); + } + + /// + /// 更新公告信息 + /// + /// + /// + public BaseOutputDto UpdateNotice(UpdateAppointmentNoticeInputDto updateAppointmentNoticeInputDto) + { + try + { + noticeRepository.Update(EntityMapper.Map(updateAppointmentNoticeInputDto)); + } + catch (Exception ex) + { + LogHelper.LogError(LocalizationHelper.GetLocalizedString("update appointment notice failed", "更新公告失败"), ex); + return new BaseOutputDto { Message = LocalizationHelper.GetLocalizedString("update appointment notice failed", "更新公告失败"), StatusCode = StatusCodeConstants.InternalServerError }; + } + return new BaseOutputDto(); + } } } diff --git a/EOM.TSHotelManagement.Application/SystemManagement/VipRule/VipRuleAppService.cs b/EOM.TSHotelManagement.Application/SystemManagement/VipRule/VipRuleAppService.cs index edb9923..5c2001e 100644 --- a/EOM.TSHotelManagement.Application/SystemManagement/VipRule/VipRuleAppService.cs +++ b/EOM.TSHotelManagement.Application/SystemManagement/VipRule/VipRuleAppService.cs @@ -75,7 +75,7 @@ namespace EOM.TSHotelManagement.Application listSource.ForEach(source => { - var userType = listUserType.FirstOrDefault(a => a.CustomerType == source.VipLevelId); + var userType = listUserType.SingleOrDefault(a => a.CustomerType == source.VipLevelId); source.VipLevelName = userType == null ? "" : userType.CustomerTypeName; }); diff --git a/EOM.TSHotelManagement.Common.Contract/BaseDto/StatusCodeConstants.cs b/EOM.TSHotelManagement.Common.Contract/BaseDto/StatusCodeConstants.cs index 8357e27..1ebed1e 100644 --- a/EOM.TSHotelManagement.Common.Contract/BaseDto/StatusCodeConstants.cs +++ b/EOM.TSHotelManagement.Common.Contract/BaseDto/StatusCodeConstants.cs @@ -2,13 +2,104 @@ { public static class StatusCodeConstants { + // 2xx Success + /// + /// 请求成功 + /// public const int Success = 200; + + /// + /// 创建成功（常用于 POST 请求） + /// public const int Created = 201; + + /// + /// 已接受（请求已接收但未处理完成） + /// + public const int Accepted = 202; + + /// + /// 无内容（响应体为空） + /// + public const int NoContent = 204; + + // 3xx Redirection + /// + /// 永久重定向 + /// + public const int MovedPermanently = 301; + + /// + /// 临时重定向 + /// + public const int Found = 302; + + /// + /// 查看其他地址（常用于 POST 后重定向） + /// + public const int SeeOther = 303; + + /// + /// 资源未修改（缓存用） + /// + public const int NotModified = 304; + + // 4xx Client Errors + /// + /// 错误请求（参数或格式错误） + /// public const int BadRequest = 400; + + /// + /// 未授权（身份验证失败） + /// public const int Unauthorized = 401; + + /// + /// 禁止访问（无权限） + /// public const int Forbidden = 403; + + /// + /// 未找到资源 + /// public const int NotFound = 404; + + /// + /// 方法不允许（如 GET 接口用 POST 访问） + /// + public const int MethodNotAllowed = 405; + + /// + /// 请求超时 + /// + public const int RequestTimeout = 408; + + /// + /// 资源冲突（如重复提交） + /// + public const int Conflict = 409; + + // 5xx Server Errors + /// + /// 服务器内部错误 + /// public const int InternalServerError = 500; + + /// + /// 网关错误（上游服务异常） + /// + public const int BadGateway = 502; + + /// + /// 服务不可用（维护或过载） + /// + public const int ServiceUnavailable = 503; + + /// + /// 网关超时（上游服务响应超时） + /// + public const int GatewayTimeout = 504; } } diff --git a/EOM.TSHotelManagement.Common.Contract/Business/EnergyManagement/Dto/UpdateEnergyManagementInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Business/EnergyManagement/Dto/UpdateEnergyManagementInputDto.cs index c3750c6..f25fb48 100644 --- a/EOM.TSHotelManagement.Common.Contract/Business/EnergyManagement/Dto/UpdateEnergyManagementInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Business/EnergyManagement/Dto/UpdateEnergyManagementInputDto.cs @@ -2,7 +2,7 @@ namespace EOM.TSHotelManagement.Common.Contract { public class UpdateEnergyManagementInputDto : BaseInputDto { - public int InformationId { get; set; } + public string InformationId { get; set; } public string RoomNumber { get; set; } public string CustomerNumber { get; set; } public DateTime StartDate { get; set; } diff --git a/EOM.TSHotelManagement.Common.Contract/Business/PromotionContent/Dto/CreatePromotionContentInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Business/PromotionContent/Dto/CreatePromotionContentInputDto.cs index c4ab6e5..3d714ae 100644 --- a/EOM.TSHotelManagement.Common.Contract/Business/PromotionContent/Dto/CreatePromotionContentInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Business/PromotionContent/Dto/CreatePromotionContentInputDto.cs @@ -2,10 +2,7 @@ namespace EOM.TSHotelManagement.Common.Contract { public class CreatePromotionContentInputDto : BaseInputDto { - public string PromotionTitle { get; set; } - public string PromotionContent { get; set; } - public DateTime StartDate { get; set; } - public DateTime EndDate { get; set; } + public string PromotionContentMessage { get; set; } } } diff --git a/EOM.TSHotelManagement.Common.Contract/Business/PromotionContent/Dto/DeletePromotionContentInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Business/PromotionContent/Dto/DeletePromotionContentInputDto.cs index 91209fb..6ca169e 100644 --- a/EOM.TSHotelManagement.Common.Contract/Business/PromotionContent/Dto/DeletePromotionContentInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Business/PromotionContent/Dto/DeletePromotionContentInputDto.cs @@ -2,7 +2,6 @@ namespace EOM.TSHotelManagement.Common.Contract { public class DeletePromotionContentInputDto : BaseInputDto { - public int PromotionId { get; set; } } } diff --git a/EOM.TSHotelManagement.Common.Contract/Business/PromotionContent/Dto/UpdatePromotionContentInputDto.cs b/EOM.TSHotelManagement.Common.Contract/Business/PromotionContent/Dto/UpdatePromotionContentInputDto.cs index 972d280..b2b847a 100644 --- a/EOM.TSHotelManagement.Common.Contract/Business/PromotionContent/Dto/UpdatePromotionContentInputDto.cs +++ b/EOM.TSHotelManagement.Common.Contract/Business/PromotionContent/Dto/UpdatePromotionContentInputDto.cs @@ -2,11 +2,7 @@ namespace EOM.TSHotelManagement.Common.Contract { public class UpdatePromotionContentInputDto : BaseInputDto { - public int PromotionId { get; set; } - public string PromotionTitle { get; set; } - public string PromotionContent { get; set; } - public DateTime StartDate { get; set; } - public DateTime EndDate { get; set; } + public string PromotionContentMessage { get; set; } } } diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/AppointmentNoticeType/CreateAppointmentNoticeTypeInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/AppointmentNoticeType/CreateAppointmentNoticeTypeInputDto.cs new file mode 100644 index 0000000..fc908d2 --- /dev/null +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/AppointmentNoticeType/CreateAppointmentNoticeTypeInputDto.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace EOM.TSHotelManagement.Common.Contract +{ + public class CreateAppointmentNoticeTypeInputDto:BaseInputDto + { + /// + /// 公告类型编号 (AppointmentNotice Type Number) + /// + public string NoticeTypeNumber { get; set; } + + /// + /// 公告类型名称 (AppointmentNotice Type Name) + /// + public string NoticeTypeName { get; set; } + } +} diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/AppointmentNoticeType/DeleteAppointmentNoticeTypeInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/AppointmentNoticeType/DeleteAppointmentNoticeTypeInputDto.cs new file mode 100644 index 0000000..87b6c76 --- /dev/null +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/AppointmentNoticeType/DeleteAppointmentNoticeTypeInputDto.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace EOM.TSHotelManagement.Common.Contract +{ + public class DeleteAppointmentNoticeTypeInputDto:BaseInputDto + { + /// + /// 公告类型编号 (AppointmentNotice Type Number) + /// + public string NoticeTypeNumber { get; set; } + } +} diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/AppointmentNoticeType/ReadAppointmentNoticeTypeInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/AppointmentNoticeType/ReadAppointmentNoticeTypeInputDto.cs new file mode 100644 index 0000000..f7dab2f --- /dev/null +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/AppointmentNoticeType/ReadAppointmentNoticeTypeInputDto.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace EOM.TSHotelManagement.Common.Contract +{ + public class ReadAppointmentNoticeTypeInputDto:ListInputDto + { + /// + /// 公告类型编号 (AppointmentNotice Type Number) + /// + public string NoticeTypeNumber { get; set; } + + /// + /// 公告类型名称 (AppointmentNotice Type Name) + /// + public string NoticeTypeName { get; set; } + } +} diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/AppointmentNoticeType/ReadAppointmentNoticeTypeOutputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/AppointmentNoticeType/ReadAppointmentNoticeTypeOutputDto.cs new file mode 100644 index 0000000..81538bd --- /dev/null +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/AppointmentNoticeType/ReadAppointmentNoticeTypeOutputDto.cs @@ -0,0 +1,46 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace EOM.TSHotelManagement.Common.Contract +{ + public class ReadAppointmentNoticeTypeOutputDto + { + /// + /// ID + /// + public int Id { get; set; } + /// + /// 公告类型编号 (AppointmentNotice Type Number) + /// + public string NoticeTypeNumber { get; set; } + + /// + /// 公告类型名称 (AppointmentNotice Type Name) + /// + public string NoticeTypeName { get; set; } + /// + /// 删除标识 + /// + public int? IsDelete { get; set; } = 0; + /// + /// 资料创建人 + /// + public string DataInsUsr { get; set; } + /// + /// 资料创建时间 + /// + public DateTime? DataInsDate { get; set; } + /// + /// 资料更新人 + /// + public string DataChgUsr { get; set; } + /// + /// 资料更新时间 + /// + public DateTime? DataChgDate { get; set; } + } +} diff --git a/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/AppointmentNoticeType/UpdateAppointmentNoticeTypeInputDto.cs b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/AppointmentNoticeType/UpdateAppointmentNoticeTypeInputDto.cs new file mode 100644 index 0000000..60c897b --- /dev/null +++ b/EOM.TSHotelManagement.Common.Contract/SystemManagement/Dto/AppointmentNoticeType/UpdateAppointmentNoticeTypeInputDto.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace EOM.TSHotelManagement.Common.Contract +{ + public class UpdateAppointmentNoticeTypeInputDto:BaseInputDto + { + /// + /// 公告类型编号 (AppointmentNotice Type Number) + /// + public string NoticeTypeNumber { get; set; } + + /// + /// 公告类型名称 (AppointmentNotice Type Name) + /// + public string NoticeTypeName { get; set; } + } +} diff --git a/EOM.TSHotelManagement.Common.Core/SystemManagement/AppointmentNotice.cs b/EOM.TSHotelManagement.Common.Core/SystemManagement/AppointmentNotice.cs index ea62dc2..daa7d20 100644 --- a/EOM.TSHotelManagement.Common.Core/SystemManagement/AppointmentNotice.cs +++ b/EOM.TSHotelManagement.Common.Core/SystemManagement/AppointmentNotice.cs @@ -30,7 +30,7 @@ namespace EOM.TSHotelManagement.Common.Core /// /// 任命公告 (Appointment AppointmentNotice) /// - [SugarTable("appointment_notice")] + [SugarTable("appointment_notice", "任命公告 (Appointment AppointmentNotice)")] public class AppointmentNotice : BaseEntity { /// diff --git a/EOM.TSHotelManagement.Common.Core/SystemManagement/AppointmentNoticeType.cs b/EOM.TSHotelManagement.Common.Core/SystemManagement/AppointmentNoticeType.cs new file mode 100644 index 0000000..3d1becb --- /dev/null +++ b/EOM.TSHotelManagement.Common.Core/SystemManagement/AppointmentNoticeType.cs @@ -0,0 +1,31 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace EOM.TSHotelManagement.Common.Core +{ + [SugarTable("appointment_notice_type", "任命公告类型 (Appointment AppointmentNotice Type)")] + public class AppointmentNoticeType : BaseEntity + { + /// + /// 编号 (ID) + /// + [SugarColumn(ColumnName = "id", IsIdentity = true, IsPrimaryKey = true, IsNullable = false, ColumnDescription = "编号 (ID)")] + public int Id { get; set; } + + /// + /// 公告类型编号 (AppointmentNotice Type Number) + /// + [SugarColumn(ColumnName = "notice_type_number", IsPrimaryKey = true, IsNullable = false, Length = 128, ColumnDescription = "公告类型编号 (AppointmentNotice Type Number)")] + public string NoticeTypeNumber { get; set; } + + /// + /// 公告类型名称 (AppointmentNotice Type Name) + /// + [SugarColumn(ColumnName = "notice_type_name", IsNullable = false, Length = 200, ColumnDescription = "公告类型名称 (AppointmentNotice Type Name)")] + public string NoticeTypeName { get; set; } + } +} diff --git a/EOM.TSHotelManagement.Migration/EntityBuilder.cs b/EOM.TSHotelManagement.Migration/EntityBuilder.cs index f620e08..2f52f53 100644 --- a/EOM.TSHotelManagement.Migration/EntityBuilder.cs +++ b/EOM.TSHotelManagement.Migration/EntityBuilder.cs @@ -16,6 +16,7 @@ namespace EOM.TSHotelManagement.Migration typeof(Administrator), typeof(AdministratorType), typeof(AppointmentNotice), + typeof(AppointmentNoticeType), typeof(Asset), typeof(Customer), typeof(CustoType), @@ -77,6 +78,7 @@ namespace EOM.TSHotelManagement.Migration Title = "首页", Path = "/home", Parent = null, + Icon = "HomeOutlined", IsDelete = 0, DataInsUsr = "System", DataInsDate = DateTime.Now, @@ -137,6 +139,17 @@ namespace EOM.TSHotelManagement.Migration DataInsDate = DateTime.Now, }, new Menu + { + Key = "noticetype", + Title = "公告类型管理", + Path = "/noticetype", + Parent = 2, + Icon = "ApartmentOutlined", + IsDelete = 0, + DataInsUsr = "System", + DataInsDate = DateTime.Now, + }, + new Menu { Key = "finance", Title = "财务信息管理", diff --git a/EOM.TSHotelManagement.WebApi/Controllers/Business/PromotionContent/FontsController.cs b/EOM.TSHotelManagement.WebApi/Controllers/Business/PromotionContent/FontsController.cs index 66a2343..b8123cd 100644 --- a/EOM.TSHotelManagement.WebApi/Controllers/Business/PromotionContent/FontsController.cs +++ b/EOM.TSHotelManagement.WebApi/Controllers/Business/PromotionContent/FontsController.cs @@ -42,5 +42,38 @@ namespace EOM.TSHotelManagement.WebApi.Controllers { return fontsService.SelectPromotionContents(); } + + /// + /// 添加宣传联动内容 + /// + /// + /// + [HttpPost] + public BaseOutputDto AddPromotionContent([FromBody]CreatePromotionContentInputDto createPromotionContentInputDto) + { + return fontsService.AddPromotionContent(createPromotionContentInputDto); + } + + /// + /// 删除宣传联动内容 + /// + /// + /// + [HttpPost] + public BaseOutputDto DeletePromotionContent([FromBody] DeletePromotionContentInputDto deletePromotionContentInputDto) + { + return fontsService.DeletePromotionContent(deletePromotionContentInputDto); + } + + /// + /// 更新宣传联动内容 + /// + /// + /// + [HttpPost] + public BaseOutputDto UpdatePromotionContent([FromBody] UpdatePromotionContentInputDto updatePromotionContentInputDto) + { + return fontsService.UpdatePromotionContent(updatePromotionContentInputDto); + } } } diff --git a/EOM.TSHotelManagement.WebApi/Controllers/SystemManagement/Base/BaseController.cs b/EOM.TSHotelManagement.WebApi/Controllers/SystemManagement/Base/BaseController.cs index c4abc0c..cf5610f 100644 --- a/EOM.TSHotelManagement.WebApi/Controllers/SystemManagement/Base/BaseController.cs +++ b/EOM.TSHotelManagement.WebApi/Controllers/SystemManagement/Base/BaseController.cs @@ -322,5 +322,52 @@ namespace EOM.TSHotelManagement.WebApi.Controllers } #endregion + + #region 公告类型模块 + + /// + /// 查询所有公告类型 + /// + /// + [HttpGet] + public ListOutputDto SelectAppointmentNoticeTypeAll([FromQuery] ReadAppointmentNoticeTypeInputDto readAppointmentNoticeTypeInputDto) + { + return baseService.SelectAppointmentNoticeTypeAll(readAppointmentNoticeTypeInputDto); + } + + /// + /// 添加公告类型 + /// + /// + /// + [HttpPost] + public BaseOutputDto CreateAppointmentNoticeType([FromBody] CreateAppointmentNoticeTypeInputDto createAppointmentNoticeTypeInputDto) + { + return baseService.CreateAppointmentNoticeType(createAppointmentNoticeTypeInputDto); + } + + /// + /// 删除公告类型 + /// + /// + /// + [HttpPost] + public BaseOutputDto DeleteAppointmentNoticeType([FromBody] DeleteAppointmentNoticeTypeInputDto deleteAppointmentNoticeTypeInputDto) + { + return baseService.DeleteAppointmentNoticeType(deleteAppointmentNoticeTypeInputDto); + } + + /// + /// 更新公告类型 + /// + /// + /// + [HttpPost] + public BaseOutputDto UpdateAppointmentNoticeType([FromBody] UpdateAppointmentNoticeTypeInputDto updateAppointmentNoticeTypeInputDto) + { + return baseService.UpdateAppointmentNoticeType(updateAppointmentNoticeTypeInputDto); + } + + #endregion } } diff --git a/EOM.TSHotelManagement.WebApi/MigrationConfig/InitializeConfig.cs b/EOM.TSHotelManagement.WebApi/MigrationConfig/InitializeConfig.cs index 1417e41..bc666b1 100644 --- a/EOM.TSHotelManagement.WebApi/MigrationConfig/InitializeConfig.cs +++ b/EOM.TSHotelManagement.WebApi/MigrationConfig/InitializeConfig.cs @@ -11,6 +11,7 @@ using MySqlConnector; using SqlSugar; using System; using System.Collections.Generic; +using System.Linq; namespace EOM.TSHotelManagement.WebApi { @@ -41,18 +42,38 @@ namespace EOM.TSHotelManagement.WebApi using (var db = factory.CreateClient(dbName)) { - if (!db.DbMaintenance.IsAnyTable(nameof(Administrator))) - { - Console.WriteLine("Initializing database schema..."); + Console.WriteLine("Initializing database schema..."); - var entityBuilder = new EntityBuilder(); + var entityBuilder = new EntityBuilder(); - db.CodeFirst.InitTables(entityBuilder.EntityTypes); + var dbTables = db.DbMaintenance.GetTableInfoList() + .Select(a => a.Name.Trim().ToLower()) + .ToList(); - Console.WriteLine("Database schema initialized"); + Console.WriteLine($"current db tables:{string.Join("\n",dbTables)}"); - SeedInitialData(db); - } + var initializeTables = entityBuilder.EntityTypes + .Select(a => a.Name.Trim().ToLower()) + .ToList(); + + Console.WriteLine($"current config tables:{string.Join("\n", initializeTables)}"); + + var needCreateTable = initializeTables + .Except(dbTables, StringComparer.OrdinalIgnoreCase) + .ToList(); + + var needCreateTableTypes = needCreateTable + .Select(tableName => entityBuilder.EntityTypes.SingleOrDefault(type => type.Name.Trim().ToLower() == tableName)) + .Where(type => type != null) + .ToArray(); + + Console.WriteLine($"need initialize tables:{string.Join("\n", needCreateTableTypes.Select(t => t.Name))}"); + + db.CodeFirst.InitTables(needCreateTableTypes); + + Console.WriteLine("Database schema initialized"); + + SeedInitialData(db); } } catch (Exception ex) -- Gitee From f41c111d15c2c41cc855ad64fec3d98a49bf0d44 Mon Sep 17 00:00:00 2001 From: ck_yeun9 Date: Sun, 27 Apr 2025 15:06:12 +0800 Subject: [PATCH 5/5] fix initialize database data logic. --- .../MigrationConfig/InitializeConfig.cs | 63 +++++++++++++++---- 1 file changed, 51 insertions(+), 12 deletions(-) diff --git a/EOM.TSHotelManagement.WebApi/MigrationConfig/InitializeConfig.cs b/EOM.TSHotelManagement.WebApi/MigrationConfig/InitializeConfig.cs index bc666b1..07d9cd0 100644 --- a/EOM.TSHotelManagement.WebApi/MigrationConfig/InitializeConfig.cs +++ b/EOM.TSHotelManagement.WebApi/MigrationConfig/InitializeConfig.cs @@ -1,9 +1,8 @@ using EOM.TSHotelManagement.Common.Core; using EOM.TSHotelManagement.Migration; using EOM.TSHotelManagement.Shared; -using EOM.TSHotelManagement.WebApi; +using jvncorelib.EncryptorLib; using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; @@ -50,25 +49,19 @@ namespace EOM.TSHotelManagement.WebApi .Select(a => a.Name.Trim().ToLower()) .ToList(); - Console.WriteLine($"current db tables:{string.Join("\n",dbTables)}"); - var initializeTables = entityBuilder.EntityTypes .Select(a => a.Name.Trim().ToLower()) .ToList(); - Console.WriteLine($"current config tables:{string.Join("\n", initializeTables)}"); - var needCreateTable = initializeTables .Except(dbTables, StringComparer.OrdinalIgnoreCase) .ToList(); var needCreateTableTypes = needCreateTable - .Select(tableName => entityBuilder.EntityTypes.SingleOrDefault(type => type.Name.Trim().ToLower() == tableName)) + .Select(tableName => entityBuilder.EntityTypes.SingleOrDefault(type => type.Name.Trim().Equals(tableName, StringComparison.OrdinalIgnoreCase))) .Where(type => type != null) .ToArray(); - Console.WriteLine($"need initialize tables:{string.Join("\n", needCreateTableTypes.Select(t => t.Name))}"); - db.CodeFirst.InitTables(needCreateTableTypes); Console.WriteLine("Database schema initialized"); @@ -121,15 +114,61 @@ namespace EOM.TSHotelManagement.WebApi private void SeedInitialData(ISqlSugarClient db) { - if (!db.Queryable().Any()) + Console.WriteLine("Initializing database data..."); + + try { var entityBuilder = new EntityBuilder(); + var entitiesToAdd = new List(); + foreach (var entityData in entityBuilder.GetEntityDatas()) { - db.InsertableByObject(entityData).AS(entityData.GetType().Name).ExecuteCommand(); - Console.WriteLine($"Inserted initial data for {entityData.GetType().Name}"); + switch (entityData) + { + case Menu menu when db.Queryable().Any(a => a.Key == menu.Key): + continue; + + case Administrator admin when db.Queryable().Any(a => admin.Account == admin.Account): + continue; + + case AdministratorType adminType when db.Queryable().Any(a => adminType.TypeName == adminType.TypeName): + continue; + + case NavBar navBar when db.Queryable().Any(a => navBar.NavigationBarName == navBar.NavigationBarName): + continue; + + case PromotionContent promoContent when db.Queryable().Any(a => promoContent.PromotionContentMessage == promoContent.PromotionContentMessage): + continue; + + case SystemInformation sysInfo when db.Queryable().Any(a => sysInfo.UrlNumber == sysInfo.UrlNumber): + continue; + } + entitiesToAdd.Add(entityData); + } + + if (entitiesToAdd.Count > 0) + { + foreach (var data in entitiesToAdd) + { + db.InsertableByObject(data).ExecuteCommand(); + } + Console.WriteLine($"Adding {entitiesToAdd.Count} initial data records"); + } + else + { + Console.WriteLine("No initial data to add"); } } + catch (Exception ex) + { + Console.WriteLine($"Database data initialization failed: {ex.Message}"); + throw; + } + finally + { + Console.WriteLine("Database data initialization completed"); + Console.WriteLine($"administrator account：admin\nadministrator password：admin"); + } } #endregion } -- Gitee