fix(assessment): 修复往期测评数据显示问题

- DTO新增Name和AssessmentTypeId字段，前端可显示测评人姓名
- 修正前端状态映射：1待测评 2测评中 3生成中 4已完成（与后端一致）
- 直接使用后端返回的statusText，避免前后端状态不同步
- 后端查询改用左连接，避免缺少关联数据时丢失记录
- 待测评/测评中状态点击可跳转继续答题

server/MiAssessment/src/MiAssessment.Core/Services/AssessmentService.cs

@@ -132,29 +132,39 @@ public class AssessmentService : IAssessmentService
         // 获取总数
         var total = await query.CountAsync();
 
-        // 分页查询
+        // 分页查询（使用左连接避免缺少关联数据时丢失记录）
         var records = await query
             .OrderByDescending(r => r.CreateTime)
             .Skip((page - 1) * pageSize)
             .Take(pageSize)
-            .Join(
+            .GroupJoin(
                 _dbContext.Orders.AsNoTracking(),
                 r => r.OrderId,
                 o => o.Id,
-                (r, o) => new { Record = r, Order = o }
+                (r, orders) => new { Record = r, Orders = orders }
             )
-            .Join(
+            .SelectMany(
+                ro => ro.Orders.DefaultIfEmpty(),
+                (ro, o) => new { ro.Record, Order = o }
+            )
+            .GroupJoin(
                 _dbContext.AssessmentTypes.AsNoTracking(),
                 ro => ro.Record.AssessmentTypeId,
                 at => at.Id,
-                (ro, at) => new AssessmentHistoryDto
+                (ro, types) => new { ro.Record, ro.Order, Types = types }
+            )
+            .SelectMany(
+                rot => rot.Types.DefaultIfEmpty(),
+                (rot, at) => new AssessmentHistoryDto
                 {
-                    Id = ro.Record.Id,
+                    Id = rot.Record.Id,
-                    OrderNo = ro.Order.OrderNo,
+                    OrderNo = rot.Order != null ? rot.Order.OrderNo : "",
-                    AssessmentName = at.Name,
+                    AssessmentName = at != null ? at.Name : "多元智能测评",
-                    Status = ro.Record.Status,
+                    Name = rot.Record.Name,
-                    StatusText = GetStatusText(ro.Record.Status),
+                    AssessmentTypeId = rot.Record.AssessmentTypeId,
-                    TestDate = ro.Record.CreateTime.ToString("yyyy-MM-dd")
+                    Status = rot.Record.Status,
+                    StatusText = GetStatusText(rot.Record.Status),
+                    TestDate = rot.Record.CreateTime.ToString("yyyy-MM-dd")
                 }
             )
             .ToListAsync();

server/MiAssessment/src/MiAssessment.Model/Models/Assessment/AssessmentHistoryDto.cs

@@ -20,6 +20,16 @@ public class AssessmentHistoryDto
     /// </summary>
     public string AssessmentName { get; set; } = null!;
 
+    /// <summary>
+    /// 测评人姓名
+    /// </summary>
+    public string Name { get; set; } = null!;
+
+    /// <summary>
+    /// 测评类型ID
+    /// </summary>
+    public long AssessmentTypeId { get; set; }
+
     /// <summary>
     /// 状态：1待测评 2测评中 3生成中 4已完成
     /// </summary>

uniapp/pages/assessment/history/index.vue

@@ -14,11 +14,12 @@ import Loading from '@/components/Loading/index.vue'
 const userStore = useUserStore()
 const { checkLogin } = useAuth()
 
-// 测评状态常量
+// 测评状态常量（与后端一致）
 const ASSESSMENT_STATUS = {
-  GENERATING: 1,   // 生成中
+  PENDING: 1,      // 待测评
-  COMPLETED: 2,    // 已完成
+  TESTING: 2,      // 测评中
-  FAILED: 3        // 生成失败
+  GENERATING: 3,   // 生成中
+  COMPLETED: 4     // 已完成
 }
 
 // 状态
@@ -32,44 +33,20 @@ const noMore = ref(false)
 
 // 计算属性
 const isEmpty = computed(() => !loading.value && historyList.value.length === 0)
-const hasMore = computed(() => historyList.value.length < total.value)
-
-/**
- * 获取测评状态文本
- */
-function getStatusText(status) {
-  const statusMap = {
-    [ASSESSMENT_STATUS.GENERATING]: '生成中',
-    [ASSESSMENT_STATUS.COMPLETED]: '已完成',
-    [ASSESSMENT_STATUS.FAILED]: '生成失败'
-  }
-  return statusMap[status] || '未知状态'
-}
 
 /**
  * 获取测评状态样式类
  */
 function getStatusClass(status) {
   const classMap = {
+    [ASSESSMENT_STATUS.PENDING]: 'status-pending',
+    [ASSESSMENT_STATUS.TESTING]: 'status-testing',
     [ASSESSMENT_STATUS.GENERATING]: 'status-generating',
-    [ASSESSMENT_STATUS.COMPLETED]: 'status-completed',
+    [ASSESSMENT_STATUS.COMPLETED]: 'status-completed'
-    [ASSESSMENT_STATUS.FAILED]: 'status-failed'
   }
   return classMap[status] || ''
 }
 
-/**
- * 格式化日期
- */
-function formatDate(dateStr) {
-  if (!dateStr) return ''
-  const date = new Date(dateStr)
-  const year = date.getFullYear()
-  const month = String(date.getMonth() + 1).padStart(2, '0')
-  const day = String(date.getDate()).padStart(2, '0')
-  return `${year}-${month}-${day}`
-}
-
 /**
  * 加载测评历史列表
  */
@@ -142,6 +119,15 @@ onReachBottom(() => {
  * 查看测评结果
  */
 function viewResult(record) {
+  // 已完成 - 查看报告
+  if (record.status === ASSESSMENT_STATUS.COMPLETED) {
+    uni.navigateTo({
+      url: `/pages/assessment/result/index?recordId=${record.id}`
+    })
+    return
+  }
+  
+  // 生成中 - 提示等待
   if (record.status === ASSESSMENT_STATUS.GENERATING) {
     uni.showToast({
       title: '报告生成中，请稍后查看',
@@ -150,24 +136,13 @@ function viewResult(record) {
     return
   }
   
-  if (record.status === ASSESSMENT_STATUS.FAILED) {
+  // 待测评/测评中 - 跳转到答题页继续
-    uni.showToast({
+  if (record.status === ASSESSMENT_STATUS.PENDING || record.status === ASSESSMENT_STATUS.TESTING) {
-      title: '报告生成失败，请联系客服',
+    uni.navigateTo({
-      icon: 'none'
+      url: `/pages/assessment/info/index?typeId=${record.assessmentTypeId || 1}`
     })
     return
   }
-  
-  uni.navigateTo({
-    url: `/pages/assessment/result/index?recordId=${record.id}`
-  })
-}
-
-/**
- * 判断是否显示查看结果按钮
- */
-function showViewResultBtn(status) {
-  return status === ASSESSMENT_STATUS.COMPLETED
 }
 
 /**
@@ -201,28 +176,28 @@ onMounted(() => {
         :key="record.id"
         @click="viewResult(record)"
       >
-        <!-- 卡片头部 -->
+        <!-- 卡片头部：测评名称 + 状态 -->
         <view class="card-header">
           <view class="assessment-name">{{ record.assessmentName || '多元智能测评' }}</view>
           <view class="assessment-status" :class="getStatusClass(record.status)">
-            {{ getStatusText(record.status) }}
+            {{ record.statusText }}
           </view>
         </view>
         
-        <!-- 卡片内容 -->
+        <!-- 卡片内容：测评人 + 测评日期 -->
         <view class="card-content">
           <view class="info-row">
             <text class="info-label">测评人</text>
-            <text class="info-value">{{ record.userName || '--' }}</text>
+            <text class="info-value">{{ record.name || '--' }}</text>
           </view>
           <view class="info-row">
             <text class="info-label">测评日期</text>
-            <text class="info-value">{{ formatDate(record.createTime) }}</text>
+            <text class="info-value">{{ record.testDate || '--' }}</text>
           </view>
         </view>
         
-        <!-- 卡片底部操作 -->
+        <!-- 卡片底部：已完成显示查看报告 -->
-        <view class="card-footer" v-if="showViewResultBtn(record.status)">
+        <view class="card-footer" v-if="record.status === ASSESSMENT_STATUS.COMPLETED">
           <view class="view-btn">
             <text>查看报告</text>
             <view class="arrow-icon"></view>
@@ -260,7 +235,6 @@ onMounted(() => {
   padding-bottom: calc(#{$spacing-lg} + env(safe-area-inset-bottom));
 }
 
-// 测评记录列表
 .history-list {
   .history-card {
     background-color: $bg-white;
@@ -269,7 +243,6 @@ onMounted(() => {
     overflow: hidden;
     box-shadow: $shadow-sm;
     
-    // 卡片头部
     .card-header {
       display: flex;
       align-items: center;
@@ -288,10 +261,16 @@ onMounted(() => {
         padding: 4rpx 16rpx;
         border-radius: $border-radius-sm;
         
-        // 已完成 - 绿色
+        // 待测评 - 橙色
-        &.status-completed {
+        &.status-pending {
-          color: $success-color;
+          color: $warning-color;
-          background-color: rgba(82, 196, 26, 0.1);
+          background-color: rgba(250, 173, 20, 0.1);
+        }
+        
+        // 测评中 - 蓝色
+        &.status-testing {
+          color: $primary-color;
+          background-color: rgba(74, 144, 226, 0.1);
         }
         
         // 生成中 - 蓝色
@@ -300,15 +279,14 @@ onMounted(() => {
           background-color: rgba(74, 144, 226, 0.1);
         }
         
-        // 生成失败 - 红色
+        // 已完成 - 绿色
-        &.status-failed {
+        &.status-completed {
-          color: $error-color;
+          color: $success-color;
-          background-color: rgba(255, 77, 79, 0.1);
+          background-color: rgba(82, 196, 26, 0.1);
         }
       }
     }
     
-    // 卡片内容
     .card-content {
       padding: $spacing-md $spacing-lg;
       
@@ -330,7 +308,6 @@ onMounted(() => {
       }
     }
     
-    // 卡片底部
     .card-footer {
       display: flex;
       justify-content: flex-end;