zhengsl/WholeProcessPlatform
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: 优化过鱼导入失败提示

Browse Source
This commit is contained in:
tangwei 2026-06-09 11:37:29 +08:00
parent 77cd988c63
commit 2de9713268
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
backend/src/main/java/com/yfd/platform/qgc_data/controller/FishDraftDataController.java
View File

@ -834,7 +834,7 @@ public class FishDraftDataController {
result.put("currentTask", null); result.put("currentTask", null);
return ResponseResult.successData(result); return ResponseResult.successData(result);
} }
String statusText = getStatusText(currentTask.getStatus()); String statusText = getStatusText(currentTask.getStatus(), currentTask.getSummary());
boolean canImport = isTaskComplete(currentTask.getStatus()); boolean canImport = isTaskComplete(currentTask.getStatus());
Map<String, Object> taskInfo = new HashMap<>(); Map<String, Object> taskInfo = new HashMap<>();
@ -848,13 +848,14 @@ public class FishDraftDataController {
return ResponseResult.successData(result); return ResponseResult.successData(result);
} }
private String getStatusText(String status) { private String getStatusText(String status, String failureReason) {
return switch (status) { return switch (status) {
case "UPLOADED" -> "已上传，等待解析"; case "UPLOADED" -> "已上传，等待解析";
case "PARSING" -> "解析中"; case "PARSING" -> "解析中";
case "VALIDATING" -> "校验中"; case "VALIDATING" -> "校验中";
case "VALIDATED" -> "已校验，待确认导入"; case "FAILED" -> (failureReason != null && !failureReason.isBlank())
case "FAILED" -> "导入失败"; ? failureReason
: "导入失败";
case "CONFIRMED" -> "已完成"; case "CONFIRMED" -> "已完成";
case "CANCELLED" -> "已取消"; case "CANCELLED" -> "已取消";
default -> "未知状态"; default -> "未知状态";
@ -886,7 +887,7 @@ public class FishDraftDataController {
int failCount = lastTask.getFailCount() != null ? lastTask.getFailCount() : 0; int failCount = lastTask.getFailCount() != null ? lastTask.getFailCount() : 0;
int progressPercent = totalCount > 0 ? (int) ((successCount + failCount) * 100.0 / totalCount) : 0; int progressPercent = totalCount > 0 ? (int) ((successCount + failCount) * 100.0 / totalCount) : 0;
Map<String, Object> taskInfo = buildTaskInfoMap(lastTask, getStatusText(lastTask.getStatus()), Map<String, Object> taskInfo = buildTaskInfoMap(lastTask, getStatusText(lastTask.getStatus(),lastTask.getSummary()),
totalCount, successCount, failCount, progressPercent); totalCount, successCount, failCount, progressPercent);
Map<String, Object> resultInfo = buildResultInfoMap(importResult); Map<String, Object> resultInfo = buildResultInfoMap(importResult);

2
backend/src/main/java/com/yfd/platform/qgc_data/mapper/ImportTaskMapper.java
View File

@ -40,7 +40,7 @@ public interface ImportTaskMapper extends BaseMapper<ImportTask> {
@Select("SELECT * FROM (" + @Select("SELECT * FROM (" +
"SELECT ID, IMPORT_NO, BIZ_TYPE, FILE_NAME, FILE_SIZE, FILE_PATH, TEMP_DIR, " + "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 " + "FROM IMPORT_TASK " +
"WHERE UPLOAD_USER_ID = #{uploadUserId} " + "WHERE UPLOAD_USER_ID = #{uploadUserId} " +
"AND STATUS IN ('UPLOADED', 'PARSING', 'VALIDATED','FAILED') " + "AND STATUS IN ('UPLOADED', 'PARSING', 'VALIDATED','FAILED') " +