From eeb5fa36fcca49a1e8dd2aa0c66a67b437f96e08 Mon Sep 17 00:00:00 2001 From: zpc Date: Thu, 19 Mar 2026 06:52:57 +0800 Subject: [PATCH] 21 --- docs/数据库设计文档.md | 2 +- .../MiAssessment.Admin.Business/Entities/PlannerBooking.cs | 2 +- .../MiAssessment.Admin.Business/Models/Planner/BookingDto.cs | 2 +- .../Models/Planner/BookingQueryRequest.cs | 2 +- .../Models/Planner/UpdateBookingStatusRequest.cs | 2 +- .../admin-web/src/api/business/dashboard.ts | 4 ++-- .../src/views/business/__tests__/dict.property.test.ts | 4 ++-- .../admin-web/src/views/dashboard/index.vue | 2 +- .../src/MiAssessment.Core/Services/OrderService.cs | 4 ++-- .../src/MiAssessment.Model/Data/MiAssessmentDbContext.cs | 2 +- .../src/MiAssessment.Model/Entities/PlannerBooking.cs | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/数据库设计文档.md b/docs/数据库设计文档.md index 7840f91..4577db2 100644 --- a/docs/数据库设计文档.md +++ b/docs/数据库设计文档.md @@ -368,7 +368,7 @@ | ScoreBiology | int | 否 | - | 生物成绩 | | ScoreGeography | int | 否 | - | 地理成绩 | | ScorePolitics | int | 否 | - | 政治成绩 | -| Status | int | 是 | 1 | 状态:1待联系 2已联系 3已完成 4已取消 | +| Status | int | 是 | 1 | 状态:1待联系 2联系中 3已完成 4已取消 | | CreateTime | datetime2 | 是 | GETDATE() | 创建时间 | | UpdateTime | datetime2 | 是 | GETDATE() | 更新时间 | | IsDeleted | bit | 是 | 0 | 软删除 | diff --git a/server/MiAssessment/src/MiAssessment.Admin.Business/Entities/PlannerBooking.cs b/server/MiAssessment/src/MiAssessment.Admin.Business/Entities/PlannerBooking.cs index b8ad106..1a78f56 100644 --- a/server/MiAssessment/src/MiAssessment.Admin.Business/Entities/PlannerBooking.cs +++ b/server/MiAssessment/src/MiAssessment.Admin.Business/Entities/PlannerBooking.cs @@ -127,7 +127,7 @@ public class PlannerBooking public string? Expectation { get; set; } /// - /// 状态:1待联系 2已联系 3已完成 4已取消 + /// 状态:1待联系 2联系中 3已完成 4已取消 /// public int Status { get; set; } = 1; diff --git a/server/MiAssessment/src/MiAssessment.Admin.Business/Models/Planner/BookingDto.cs b/server/MiAssessment/src/MiAssessment.Admin.Business/Models/Planner/BookingDto.cs index 94cdc8b..afc5b1e 100644 --- a/server/MiAssessment/src/MiAssessment.Admin.Business/Models/Planner/BookingDto.cs +++ b/server/MiAssessment/src/MiAssessment.Admin.Business/Models/Planner/BookingDto.cs @@ -86,7 +86,7 @@ public class BookingDto public string GradeName { get; set; } = null!; /// - /// 状态:1待联系 2已联系 3已完成 4已取消 + /// 状态:1待联系 2联系中 3已完成 4已取消 /// public int Status { get; set; } diff --git a/server/MiAssessment/src/MiAssessment.Admin.Business/Models/Planner/BookingQueryRequest.cs b/server/MiAssessment/src/MiAssessment.Admin.Business/Models/Planner/BookingQueryRequest.cs index 39373e9..c681f6c 100644 --- a/server/MiAssessment/src/MiAssessment.Admin.Business/Models/Planner/BookingQueryRequest.cs +++ b/server/MiAssessment/src/MiAssessment.Admin.Business/Models/Planner/BookingQueryRequest.cs @@ -26,7 +26,7 @@ public class BookingQueryRequest : PagedRequest public DateTime? BookingDateEnd { get; set; } /// - /// 状态:1待联系 2已联系 3已完成 4已取消 + /// 状态:1待联系 2联系中 3已完成 4已取消 /// public int? Status { get; set; } diff --git a/server/MiAssessment/src/MiAssessment.Admin.Business/Models/Planner/UpdateBookingStatusRequest.cs b/server/MiAssessment/src/MiAssessment.Admin.Business/Models/Planner/UpdateBookingStatusRequest.cs index 40249d9..a545768 100644 --- a/server/MiAssessment/src/MiAssessment.Admin.Business/Models/Planner/UpdateBookingStatusRequest.cs +++ b/server/MiAssessment/src/MiAssessment.Admin.Business/Models/Planner/UpdateBookingStatusRequest.cs @@ -14,7 +14,7 @@ public class UpdateBookingStatusRequest public long Id { get; set; } /// - /// 状态:1待联系 2已联系 3已完成 4已取消 + /// 状态:1待联系 2联系中 3已完成 4已取消 /// [Range(1, 4, ErrorMessage = "状态值无效")] public int Status { get; set; } diff --git a/server/MiAssessment/src/MiAssessment.Admin/admin-web/src/api/business/dashboard.ts b/server/MiAssessment/src/MiAssessment.Admin/admin-web/src/api/business/dashboard.ts index f287a99..4d0b53b 100644 --- a/server/MiAssessment/src/MiAssessment.Admin/admin-web/src/api/business/dashboard.ts +++ b/server/MiAssessment/src/MiAssessment.Admin/admin-web/src/api/business/dashboard.ts @@ -79,7 +79,7 @@ export interface TrendsQuery { export interface PendingItems { /** 待审核提现数量 */ pendingWithdrawals: number - /** 待确认预约数量 */ + /** 待联系预约数量 */ pendingBookings: number } @@ -111,7 +111,7 @@ export function getTrends(params: TrendsQuery): Promise> /** * 获取待办事项 - * @returns 待办事项数据,包含待审核提现和待确认预约数量 + * @returns 待办事项数据,包含待审核提现和待联系预约数量 */ export function getPendingItems(): Promise> { return request({ diff --git a/server/MiAssessment/src/MiAssessment.Admin/admin-web/src/views/business/__tests__/dict.property.test.ts b/server/MiAssessment/src/MiAssessment.Admin/admin-web/src/views/business/__tests__/dict.property.test.ts index b8d42e8..400ffed 100644 --- a/server/MiAssessment/src/MiAssessment.Admin/admin-web/src/views/business/__tests__/dict.property.test.ts +++ b/server/MiAssessment/src/MiAssessment.Admin/admin-web/src/views/business/__tests__/dict.property.test.ts @@ -27,8 +27,8 @@ const dictData: Record = { { value: 6, label: '已取消' } ], booking_status: [ - { value: 1, label: '待确认' }, - { value: 2, label: '已确认' }, + { value: 1, label: '待联系' }, + { value: 2, label: '联系中' }, { value: 3, label: '已完成' }, { value: 4, label: '已取消' } ] diff --git a/server/MiAssessment/src/MiAssessment.Admin/admin-web/src/views/dashboard/index.vue b/server/MiAssessment/src/MiAssessment.Admin/admin-web/src/views/dashboard/index.vue index 1b426ad..afb0361 100644 --- a/server/MiAssessment/src/MiAssessment.Admin/admin-web/src/views/dashboard/index.vue +++ b/server/MiAssessment/src/MiAssessment.Admin/admin-web/src/views/dashboard/index.vue @@ -201,7 +201,7 @@
{{ state.pendingItems?.pendingBookings ?? 0 }}
-
待确认预约
+
待联系预约
diff --git a/server/MiAssessment/src/MiAssessment.Core/Services/OrderService.cs b/server/MiAssessment/src/MiAssessment.Core/Services/OrderService.cs index 7c06aa8..92ffa67 100644 --- a/server/MiAssessment/src/MiAssessment.Core/Services/OrderService.cs +++ b/server/MiAssessment/src/MiAssessment.Core/Services/OrderService.cs @@ -768,8 +768,8 @@ public class OrderService : IOrderService { return status switch { - 1 => "待确认", - 2 => "已确认", + 1 => "待联系", + 2 => "联系中", 3 => "已完成", 4 => "已取消", _ => "未知" diff --git a/server/MiAssessment/src/MiAssessment.Model/Data/MiAssessmentDbContext.cs b/server/MiAssessment/src/MiAssessment.Model/Data/MiAssessmentDbContext.cs index b9afa35..09b6653 100644 --- a/server/MiAssessment/src/MiAssessment.Model/Data/MiAssessmentDbContext.cs +++ b/server/MiAssessment/src/MiAssessment.Model/Data/MiAssessmentDbContext.cs @@ -544,7 +544,7 @@ public partial class MiAssessmentDbContext : DbContext .HasComment("政治成绩"); entity.Property(e => e.Status) .HasDefaultValue(1) - .HasComment("状态:1待联系 2已联系 3已完成 4已取消"); + .HasComment("状态:1待联系 2联系中 3已完成 4已取消"); entity.Property(e => e.CreateTime) .HasDefaultValueSql("(getdate())") .HasComment("创建时间"); diff --git a/server/MiAssessment/src/MiAssessment.Model/Entities/PlannerBooking.cs b/server/MiAssessment/src/MiAssessment.Model/Entities/PlannerBooking.cs index 730eeed..3ce113e 100644 --- a/server/MiAssessment/src/MiAssessment.Model/Entities/PlannerBooking.cs +++ b/server/MiAssessment/src/MiAssessment.Model/Entities/PlannerBooking.cs @@ -127,7 +127,7 @@ public class PlannerBooking public string? Expectation { get; set; } /// - /// 状态:1待联系 2已联系 3已完成 4已取消 + /// 状态:1待联系 2联系中 3已完成 4已取消 /// public int Status { get; set; } = 1;