From 9c9ceb0a1e90c28c87f778265d1ecd323d8d4a38 Mon Sep 17 00:00:00 2001 From: zhuxinru Date: Tue, 17 Mar 2026 19:17:55 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=9F=A5=E8=AF=A2=E5=B7=A5=E4=BD=8D?= =?UTF-8?q?=E4=B8=8B=E7=9A=84=E6=8A=A5=E5=91=8A=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/resp/data/SimulationTaskResultCurveResp.java | 3 +++ .../com/sdm/project/model/resp/WorkspaceReportListResp.java | 6 +++++- .../com/sdm/project/service/impl/ProjectServiceImpl.java | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/com/sdm/common/entity/resp/data/SimulationTaskResultCurveResp.java b/common/src/main/java/com/sdm/common/entity/resp/data/SimulationTaskResultCurveResp.java index f91e41c5..0e82c173 100644 --- a/common/src/main/java/com/sdm/common/entity/resp/data/SimulationTaskResultCurveResp.java +++ b/common/src/main/java/com/sdm/common/entity/resp/data/SimulationTaskResultCurveResp.java @@ -38,4 +38,7 @@ public class SimulationTaskResultCurveResp extends BaseResp { @Schema(description = "排序号") private Integer sortOrder; + + @Schema(description = "创建人") + private Long creatorId; } diff --git a/project/src/main/java/com/sdm/project/model/resp/WorkspaceReportListResp.java b/project/src/main/java/com/sdm/project/model/resp/WorkspaceReportListResp.java index d63e7675..9dbdec07 100644 --- a/project/src/main/java/com/sdm/project/model/resp/WorkspaceReportListResp.java +++ b/project/src/main/java/com/sdm/project/model/resp/WorkspaceReportListResp.java @@ -30,5 +30,9 @@ public class WorkspaceReportListResp { private String taskUuid; @Schema(description = "审批状态") - private String exeStatus; + private String approvalStatus; + + @Schema(description = "创建人") + private Long creator; + private String creatorName; } diff --git a/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java index 841d1a71..29d2d357 100644 --- a/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java @@ -3759,7 +3759,8 @@ public class ProjectServiceImpl extends BaseService implements IProjectService { reportResp.setCreateTime(file.getCreateTime()); reportResp.setTaskName(task.getTaskName()); reportResp.setTaskUuid(task.getUuid()); - reportResp.setExeStatus(task.getExeStatus()); + reportResp.setApprovalStatus(String.valueOf(task.getApprovalStatus())); + reportResp.setCreator(file.getCreatorId()); allReports.add(reportResp); } }