outsource/mi-assessment
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

21
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
zpc 2026-03-31 16:56:34 +08:00
parent 0948ec6013
commit b8c66a363d
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/MiAssessment/src/MiAssessment.Core/Services/AssessmentService.cs
View File

@ -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

1
server/MiAssessment/src/MiAssessment.Core/Services/OrderService.cs
View File

@ -904,6 +904,7 @@ public class OrderService : IOrderService
4 => "已测评",
5 => "生成失败",
6 => "报告生成中",
7 => "待测评",
_ => GetOrderStatusText(orderStatus)
};
}

8
uniapp/pages/assessment/info/index.vue
View File

@ -557,11 +557,11 @@ onLoad((options) => {
<view v-if="showPendingPopup" class="popup-mask" @click="handleDismissPending">
<view class="popup-container pending-popup" @click.stop>
<view class="popup-header">
<text class="popup-title">发现进行中的测评</text>
<text class="popup-title">{{ pendingRecord?.status === 7 ? '需要重新测评' : '发现进行中的测评' }}</text>
</view>
<view class="popup-body">
<view class="pending-msg">
您有一份未完成的测评记录，是否继续？
{{ pendingRecord?.status === 7 ? '您上次的测评结果中多个智能处于同一梯队，需要更细致的分析维度，请重新进行测评' : '您有一份未完成的测评记录，是否继续？' }}
</view>
<view class="pending-info">
<text>姓名：{{ pendingRecord?.name }}</text>
@ -569,11 +569,11 @@ onLoad((options) => {
</view>
</view>
<view class="pending-footer">
<view class="popup-btn-outline" @click="handleDismissPending">
<view v-if="pendingRecord?.status !== 7" class="popup-btn-outline" @click="handleDismissPending">
<text>重新开始</text>
</view>
<view class="popup-btn" @click="handleContinuePending">
<text>继续测评</text>
<text>{{ pendingRecord?.status === 7 ? '重新测评' : '继续测评' }}</text>
</view>
</view>
</view>

2
uniapp/pages/order/list/index.vue
View File

@ -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 || '已支付'
}