From 205f0d54c52498400d92006b1a4a59eddd158f25 Mon Sep 17 00:00:00 2001 From: shahaibo <1023316923@qq.com> Date: Wed, 22 May 2024 14:09:16 +0800 Subject: [PATCH] BUGFIX:workspace; --- .../ai/da/controller/WorkspaceController.java | 4 ++-- .../com/ai/da/service/WorkspaceService.java | 2 +- .../da/service/impl/WorkspaceServiceImpl.java | 23 +++++++++++++++++-- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/ai/da/controller/WorkspaceController.java b/src/main/java/com/ai/da/controller/WorkspaceController.java index b0c089f0..d44abf2e 100644 --- a/src/main/java/com/ai/da/controller/WorkspaceController.java +++ b/src/main/java/com/ai/da/controller/WorkspaceController.java @@ -44,8 +44,8 @@ public class WorkspaceController { @GetMapping("/detail") @ApiOperationSupport(order = 1) @ApiOperation(value = "详情", notes = "传入workspace") - public Response detail(@ApiParam(value = "主键集合", required = true) @RequestParam Long id) { - Workspace detail = workspaceService.getByIdNew(id); + public Response detail(@ApiParam(value = "主键集合", required = true) @RequestParam Long id) { + WorkspaceVO detail = workspaceService.getByIdNew(id); return Response.success(detail); } diff --git a/src/main/java/com/ai/da/service/WorkspaceService.java b/src/main/java/com/ai/da/service/WorkspaceService.java index 17a66f29..a60395ca 100644 --- a/src/main/java/com/ai/da/service/WorkspaceService.java +++ b/src/main/java/com/ai/da/service/WorkspaceService.java @@ -35,7 +35,7 @@ public interface WorkspaceService extends IService { List getEnumValues(String enumName); - Workspace getByIdNew(Long id); + WorkspaceVO getByIdNew(Long id); List getMannequins(String sex); diff --git a/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java b/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java index 6d1478ec..34b7bf9a 100644 --- a/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java @@ -249,7 +249,7 @@ public class WorkspaceServiceImpl extends ServiceImpl qwOld = new QueryWrapper<>(); qwOld.lambda().eq(Workspace::getAccountId, accountId); @@ -260,7 +260,26 @@ public class WorkspaceServiceImpl extends ServiceImpl