From 2de9713268de94465a815c299ef29afe30ab22ee Mon Sep 17 00:00:00 2001 From: tangwei Date: Tue, 9 Jun 2026 11:37:29 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E8=BF=87=E9=B1=BC?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=A4=B1=E8=B4=A5=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qgc_data/controller/FishDraftDataController.java | 11 ++++++----- .../platform/qgc_data/mapper/ImportTaskMapper.java | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/backend/src/main/java/com/yfd/platform/qgc_data/controller/FishDraftDataController.java b/backend/src/main/java/com/yfd/platform/qgc_data/controller/FishDraftDataController.java index 00c3b5c9..4399f5e5 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_data/controller/FishDraftDataController.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/controller/FishDraftDataController.java @@ -834,7 +834,7 @@ public class FishDraftDataController { result.put("currentTask", null); return ResponseResult.successData(result); } - String statusText = getStatusText(currentTask.getStatus()); + String statusText = getStatusText(currentTask.getStatus(), currentTask.getSummary()); boolean canImport = isTaskComplete(currentTask.getStatus()); Map taskInfo = new HashMap<>(); @@ -848,13 +848,14 @@ public class FishDraftDataController { return ResponseResult.successData(result); } - private String getStatusText(String status) { + private String getStatusText(String status, String failureReason) { return switch (status) { case "UPLOADED" -> "已上传，等待解析"; case "PARSING" -> "解析中"; case "VALIDATING" -> "校验中"; - case "VALIDATED" -> "已校验，待确认导入"; - case "FAILED" -> "导入失败"; + case "FAILED" -> (failureReason != null && !failureReason.isBlank()) + ? failureReason + : "导入失败"; case "CONFIRMED" -> "已完成"; case "CANCELLED" -> "已取消"; default -> "未知状态"; @@ -886,7 +887,7 @@ public class FishDraftDataController { int failCount = lastTask.getFailCount() != null ? lastTask.getFailCount() : 0; int progressPercent = totalCount > 0 ? (int) ((successCount + failCount) * 100.0 / totalCount) : 0; - Map taskInfo = buildTaskInfoMap(lastTask, getStatusText(lastTask.getStatus()), + Map taskInfo = buildTaskInfoMap(lastTask, getStatusText(lastTask.getStatus(),lastTask.getSummary()), totalCount, successCount, failCount, progressPercent); Map resultInfo = buildResultInfoMap(importResult); diff --git a/backend/src/main/java/com/yfd/platform/qgc_data/mapper/ImportTaskMapper.java b/backend/src/main/java/com/yfd/platform/qgc_data/mapper/ImportTaskMapper.java index d811e589..42cda28b 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_data/mapper/ImportTaskMapper.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/mapper/ImportTaskMapper.java @@ -40,7 +40,7 @@ public interface ImportTaskMapper extends BaseMapper { @Select("SELECT * FROM (" + "SELECT ID, IMPORT_NO, BIZ_TYPE, FILE_NAME, FILE_SIZE, FILE_PATH, TEMP_DIR, " + - "TOTAL_COUNT, SUCCESS_COUNT, FAIL_COUNT, STATUS, ERROR_MSG " + + "TOTAL_COUNT, SUCCESS_COUNT,SUMMARY, FAIL_COUNT, STATUS, ERROR_MSG " + "FROM IMPORT_TASK " + "WHERE UPLOAD_USER_ID = #{uploadUserId} " + "AND STATUS IN ('UPLOADED', 'PARSING', 'VALIDATED','FAILED') " +