diff --git a/server/MiAssessment/src/MiAssessment.Core/Services/AssessmentService.cs b/server/MiAssessment/src/MiAssessment.Core/Services/AssessmentService.cs index 32b5507..5d90d33 100644 --- a/server/MiAssessment/src/MiAssessment.Core/Services/AssessmentService.cs +++ b/server/MiAssessment/src/MiAssessment.Core/Services/AssessmentService.cs @@ -223,8 +223,8 @@ public class AssessmentService : IAssessmentService throw new UnauthorizedAccessException("无权限访问该测评记录"); } - // 验证记录状态(只有待测评或测评中状态才能提交答案) - if (record.Status != 1 && record.Status != 2) + // 验证记录状态(只有待测评、测评中或需重测状态才能提交答案) + if (record.Status != 1 && record.Status != 2 && record.Status != 7) { _logger.LogWarning("测评记录状态不允许提交答案,status: {Status}, recordId: {RecordId}", record.Status, request.RecordId); @@ -695,7 +695,7 @@ public class AssessmentService : IAssessmentService .AsNoTracking() .Where(r => r.UserId == userId && r.AssessmentTypeId == typeId - && (r.Status == 1 || r.Status == 2) + && (r.Status == 1 || r.Status == 2 || r.Status == 7) && !r.IsDeleted) .OrderByDescending(r => r.CreateTime) .Select(r => new PendingRecordDto diff --git a/server/MiAssessment/src/MiAssessment.Core/Services/OrderService.cs b/server/MiAssessment/src/MiAssessment.Core/Services/OrderService.cs index 197ca8b..42a1dff 100644 --- a/server/MiAssessment/src/MiAssessment.Core/Services/OrderService.cs +++ b/server/MiAssessment/src/MiAssessment.Core/Services/OrderService.cs @@ -904,6 +904,7 @@ public class OrderService : IOrderService 4 => "已测评", 5 => "生成失败", 6 => "报告生成中", + 7 => "待测评", _ => GetOrderStatusText(orderStatus) }; } diff --git a/uniapp/pages/assessment/info/index.vue b/uniapp/pages/assessment/info/index.vue index eeee8c6..e61aea7 100644 --- a/uniapp/pages/assessment/info/index.vue +++ b/uniapp/pages/assessment/info/index.vue @@ -557,11 +557,11 @@ onLoad((options) => { - 发现进行中的测评 + {{ pendingRecord?.status === 7 ? '需要重新测评' : '发现进行中的测评' }} - 您有一份未完成的测评记录,是否继续? + {{ pendingRecord?.status === 7 ? '您上次的测评结果中多个智能处于同一梯队,需要更细致的分析维度,请重新进行测评' : '您有一份未完成的测评记录,是否继续?' }} 姓名:{{ pendingRecord?.name }} @@ -569,11 +569,11 @@ onLoad((options) => { - + 重新开始 - 继续测评 + {{ pendingRecord?.status === 7 ? '重新测评' : '继续测评' }} diff --git a/uniapp/pages/order/list/index.vue b/uniapp/pages/order/list/index.vue index 3f16ba0..0c2682d 100644 --- a/uniapp/pages/order/list/index.vue +++ b/uniapp/pages/order/list/index.vue @@ -58,7 +58,7 @@ function getDisplayStatus(order) { // 已支付/已完成的订单,根据测评记录状态显示 if (assessmentStatus) { - const map = { 1: '待测评', 2: '测评中', 3: '测评生成中', 4: '已测评' } + const map = { 1: '待测评', 2: '测评中', 3: '测评生成中', 4: '已测评', 7: '待测评' } return map[assessmentStatus] || order.statusText || '已支付' }