From f1c609b4be7492a2bd082f58f72fddd4d4bcc161 Mon Sep 17 00:00:00 2001 From: KarlsEcho <1059017311@qq.com> Date: Wed, 15 Oct 2025 22:35:53 +0800 Subject: [PATCH] =?UTF-8?q?upd:=E6=96=B0=E5=A2=9E=E4=BA=86=E5=AE=B6?= =?UTF-8?q?=E6=94=BF=E7=94=A8=E6=88=B7=E5=AE=9E=E4=BD=93=EF=BC=8C=E5=B9=B6?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E4=BB=93=E5=82=A8=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=BA=86=E4=B9=8B=E5=89=8D=E7=9A=84=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=90=8D=E5=AD=97=E5=92=8Cdb=E4=B8=8A=E4=B8=8B=E6=96=87?= =?UTF-8?q?=E9=87=8C=E9=9D=A2=E7=9A=84=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IOrderRepository.cs | 0 .../IProductRepository.cs | 0 .../EntityFrameworkCore/AdminDbContext.cs | 6 ++-- .../Entities/HouseholdWorker.cs | 29 +++++++++++++++++++ .../IHouseholdWorkerRepository.cs | 14 +++++++++ .../KonSoft.TenantManagement.Domain.csproj | 2 +- .../Repositories/HouseholdWorkerRepository.cs | 14 +++++++++ .../TenantManagementDbContext.cs | 5 ++-- 8 files changed, 64 insertions(+), 6 deletions(-) rename modules/admin/src/KonSoft.Admin.Domain/{Repositories => IRepositories}/IOrderRepository.cs (100%) rename modules/admin/src/KonSoft.Admin.Domain/{Repositories => IRepositories}/IProductRepository.cs (100%) create mode 100644 modules/tenant-management/src/KonSoft.TenantManagement.Domain/Entities/HouseholdWorker.cs create mode 100644 modules/tenant-management/src/KonSoft.TenantManagement.Domain/IRepositories/IHouseholdWorkerRepository.cs create mode 100644 modules/tenant-management/src/KonSoft.TenantManagement.EntityFrameworkCore/EntityFrameworkCore/Repositories/HouseholdWorkerRepository.cs diff --git a/modules/admin/src/KonSoft.Admin.Domain/Repositories/IOrderRepository.cs b/modules/admin/src/KonSoft.Admin.Domain/IRepositories/IOrderRepository.cs similarity index 100% rename from modules/admin/src/KonSoft.Admin.Domain/Repositories/IOrderRepository.cs rename to modules/admin/src/KonSoft.Admin.Domain/IRepositories/IOrderRepository.cs diff --git a/modules/admin/src/KonSoft.Admin.Domain/Repositories/IProductRepository.cs b/modules/admin/src/KonSoft.Admin.Domain/IRepositories/IProductRepository.cs similarity index 100% rename from modules/admin/src/KonSoft.Admin.Domain/Repositories/IProductRepository.cs rename to modules/admin/src/KonSoft.Admin.Domain/IRepositories/IProductRepository.cs diff --git a/modules/admin/src/KonSoft.Admin.EntityFrameworkCore/EntityFrameworkCore/AdminDbContext.cs b/modules/admin/src/KonSoft.Admin.EntityFrameworkCore/EntityFrameworkCore/AdminDbContext.cs index 5eed71b..5f7dcdb 100644 --- a/modules/admin/src/KonSoft.Admin.EntityFrameworkCore/EntityFrameworkCore/AdminDbContext.cs +++ b/modules/admin/src/KonSoft.Admin.EntityFrameworkCore/EntityFrameworkCore/AdminDbContext.cs @@ -55,9 +55,9 @@ public class AdminDbContext : #endregion #region 订单 - public DbSet Order { get; set; } - public DbSet Worker { get; set; } - public DbSet ServiceCategory { get; set; } + public DbSet Orders { get; set; } + public DbSet Workers { get; set; } + public DbSet ServiceCategorys { get; set; } #endregion public AdminDbContext(DbContextOptions options) diff --git a/modules/tenant-management/src/KonSoft.TenantManagement.Domain/Entities/HouseholdWorker.cs b/modules/tenant-management/src/KonSoft.TenantManagement.Domain/Entities/HouseholdWorker.cs new file mode 100644 index 0000000..2947aae --- /dev/null +++ b/modules/tenant-management/src/KonSoft.TenantManagement.Domain/Entities/HouseholdWorker.cs @@ -0,0 +1,29 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Volo.Abp.Identity; + +namespace KonSoft.TenantManagement.Entities +{ + /// + /// 家政服务工人实体 + /// + public class HouseholdWorker:IdentityUser + { + /// + /// 接单数 + /// + public int OrderCount { get; set; } + /// + /// 职业 + /// + public required string Profession { get; set; } + /// + /// 能力范围 + /// + public required string ScopeOfCompetence { get; set; } + + } +} diff --git a/modules/tenant-management/src/KonSoft.TenantManagement.Domain/IRepositories/IHouseholdWorkerRepository.cs b/modules/tenant-management/src/KonSoft.TenantManagement.Domain/IRepositories/IHouseholdWorkerRepository.cs new file mode 100644 index 0000000..929fc91 --- /dev/null +++ b/modules/tenant-management/src/KonSoft.TenantManagement.Domain/IRepositories/IHouseholdWorkerRepository.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using KonSoft.TenantManagement.Entities; +using Volo.Abp.Domain.Repositories; + +namespace KonSoft.TenantManagement.IRepositories +{ + public interface IHouseholdWorkerRepository: EfCoreRepository, IRepository + { + } +} diff --git a/modules/tenant-management/src/KonSoft.TenantManagement.Domain/KonSoft.TenantManagement.Domain.csproj b/modules/tenant-management/src/KonSoft.TenantManagement.Domain/KonSoft.TenantManagement.Domain.csproj index fe6ddbc..c04d11a 100644 --- a/modules/tenant-management/src/KonSoft.TenantManagement.Domain/KonSoft.TenantManagement.Domain.csproj +++ b/modules/tenant-management/src/KonSoft.TenantManagement.Domain/KonSoft.TenantManagement.Domain.csproj @@ -1,4 +1,4 @@ - + net8.0 diff --git a/modules/tenant-management/src/KonSoft.TenantManagement.EntityFrameworkCore/EntityFrameworkCore/Repositories/HouseholdWorkerRepository.cs b/modules/tenant-management/src/KonSoft.TenantManagement.EntityFrameworkCore/EntityFrameworkCore/Repositories/HouseholdWorkerRepository.cs new file mode 100644 index 0000000..908279d --- /dev/null +++ b/modules/tenant-management/src/KonSoft.TenantManagement.EntityFrameworkCore/EntityFrameworkCore/Repositories/HouseholdWorkerRepository.cs @@ -0,0 +1,14 @@ +using KonSoft.TenantManagement.Entities; +using KonSoft.TenantManagement.IRepositories; +using Volo.Abp.Domain.Repositories.EntityFrameworkCore; +using Volo.Abp.EntityFrameworkCore; + +namespace KonSoft.TenantManagement.EntityFrameworkCore.Repositories +{ + public class HouseholdWorkerRepository: EfCoreRepository,IHouseholdWorkerRepository + { + public HouseholdWorkerRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) + { + } + } +} diff --git a/modules/tenant-management/src/KonSoft.TenantManagement.EntityFrameworkCore/EntityFrameworkCore/TenantManagementDbContext.cs b/modules/tenant-management/src/KonSoft.TenantManagement.EntityFrameworkCore/EntityFrameworkCore/TenantManagementDbContext.cs index 42fb62f..b85529d 100644 --- a/modules/tenant-management/src/KonSoft.TenantManagement.EntityFrameworkCore/EntityFrameworkCore/TenantManagementDbContext.cs +++ b/modules/tenant-management/src/KonSoft.TenantManagement.EntityFrameworkCore/EntityFrameworkCore/TenantManagementDbContext.cs @@ -1,4 +1,5 @@ -using Microsoft.EntityFrameworkCore; +using KonSoft.TenantManagement.Entities; +using Microsoft.EntityFrameworkCore; using Volo.Abp.AuditLogging.EntityFrameworkCore; using Volo.Abp.BackgroundJobs.EntityFrameworkCore; using Volo.Abp.Data; @@ -52,7 +53,7 @@ public class TenantManagementDbContext : public DbSet TenantConnectionStrings { get; set; } #endregion - + public DbSet HouseholdWorkers { get; set; } public TenantManagementDbContext(DbContextOptions options) : base(options) {