From 0f0ef3b3f7368f8f5380632e2f73f8862b312901 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Fri, 12 Sep 2025 09:17:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E8=BF=94=E5=9B=9Eid?= =?UTF-8?q?/name?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/archive/ProjectController.java | 3 ++- .../main/java/com/bonus/web/domain/SelectDto.java | 13 +++++++++++++ .../java/com/bonus/web/mapper/ProjectMapper.java | 3 ++- .../java/com/bonus/web/service/ProjectService.java | 3 ++- .../bonus/web/service/impl/ProjectServiceImpl.java | 3 ++- .../src/main/resources/mapper/ProjectMapper.xml | 4 ++-- 6 files changed, 23 insertions(+), 6 deletions(-) create mode 100644 bonus-admin/src/main/java/com/bonus/web/domain/SelectDto.java diff --git a/bonus-admin/src/main/java/com/bonus/web/controller/archive/ProjectController.java b/bonus-admin/src/main/java/com/bonus/web/controller/archive/ProjectController.java index 6da7cf3..c37a7ff 100644 --- a/bonus-admin/src/main/java/com/bonus/web/controller/archive/ProjectController.java +++ b/bonus-admin/src/main/java/com/bonus/web/controller/archive/ProjectController.java @@ -10,6 +10,7 @@ import com.bonus.common.enums.OperaType; import com.bonus.system.domain.SysEncryType; import com.bonus.web.domain.ArchivalCatalogueDto; import com.bonus.web.domain.ProjectDto; +import com.bonus.web.domain.SelectDto; import com.bonus.web.service.ProjectService; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -51,7 +52,7 @@ public class ProjectController extends BaseController { @RequiresPermissions("file:catalog:select") public AjaxResult getFileCatalogSelect(ArchivalCatalogueDto dto) { try { - List list = service.getFileCatalogSelect(dto); + List list = service.getFileCatalogSelect(dto); return AjaxResult.success(list); } catch (Exception e) { log.error(e.toString(), e); diff --git a/bonus-admin/src/main/java/com/bonus/web/domain/SelectDto.java b/bonus-admin/src/main/java/com/bonus/web/domain/SelectDto.java new file mode 100644 index 0000000..808d1a8 --- /dev/null +++ b/bonus-admin/src/main/java/com/bonus/web/domain/SelectDto.java @@ -0,0 +1,13 @@ +package com.bonus.web.domain; + +import lombok.Data; + +/** + * @Author：liang.chao + * @Date：2025/9/12 - 9:16 + */ +@Data +public class SelectDto { + private String id; + private String name; +} diff --git a/bonus-admin/src/main/java/com/bonus/web/mapper/ProjectMapper.java b/bonus-admin/src/main/java/com/bonus/web/mapper/ProjectMapper.java index e7731df..71d6eca 100644 --- a/bonus-admin/src/main/java/com/bonus/web/mapper/ProjectMapper.java +++ b/bonus-admin/src/main/java/com/bonus/web/mapper/ProjectMapper.java @@ -3,6 +3,7 @@ package com.bonus.web.mapper; import com.bonus.web.domain.ArchivalCatalogueDto; import com.bonus.web.domain.DaKyProFilesContentsDto; import com.bonus.web.domain.ProjectDto; +import com.bonus.web.domain.SelectDto; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -15,7 +16,7 @@ import java.util.List; public interface ProjectMapper { List list(ProjectDto dto); - List getFileCatalogSelect(ArchivalCatalogueDto dto); + List getFileCatalogSelect(ArchivalCatalogueDto dto); Integer updateContentsName(ProjectDto projectDto); diff --git a/bonus-admin/src/main/java/com/bonus/web/service/ProjectService.java b/bonus-admin/src/main/java/com/bonus/web/service/ProjectService.java index 2b8c17a..0ffb159 100644 --- a/bonus-admin/src/main/java/com/bonus/web/service/ProjectService.java +++ b/bonus-admin/src/main/java/com/bonus/web/service/ProjectService.java @@ -3,6 +3,7 @@ package com.bonus.web.service; import com.bonus.common.core.domain.AjaxResult; import com.bonus.web.domain.ArchivalCatalogueDto; import com.bonus.web.domain.ProjectDto; +import com.bonus.web.domain.SelectDto; import java.util.List; @@ -14,7 +15,7 @@ public interface ProjectService { List list(ProjectDto dto); - List getFileCatalogSelect(ArchivalCatalogueDto dto); + List getFileCatalogSelect(ArchivalCatalogueDto dto); AjaxResult updateContentsName(ProjectDto projectDto); } diff --git a/bonus-admin/src/main/java/com/bonus/web/service/impl/ProjectServiceImpl.java b/bonus-admin/src/main/java/com/bonus/web/service/impl/ProjectServiceImpl.java index e63cd3f..fa18c4a 100644 --- a/bonus-admin/src/main/java/com/bonus/web/service/impl/ProjectServiceImpl.java +++ b/bonus-admin/src/main/java/com/bonus/web/service/impl/ProjectServiceImpl.java @@ -4,6 +4,7 @@ import com.bonus.common.core.domain.AjaxResult; import com.bonus.web.domain.ArchivalCatalogueDto; import com.bonus.web.domain.DaKyProFilesContentsDto; import com.bonus.web.domain.ProjectDto; +import com.bonus.web.domain.SelectDto; import com.bonus.web.mapper.ProjectMapper; import com.bonus.web.service.ProjectService; import org.springframework.beans.factory.annotation.Autowired; @@ -30,7 +31,7 @@ public class ProjectServiceImpl implements ProjectService { } @Override - public List getFileCatalogSelect(ArchivalCatalogueDto dto) { + public List getFileCatalogSelect(ArchivalCatalogueDto dto) { return projectMapper.getFileCatalogSelect(dto); } diff --git a/bonus-admin/src/main/resources/mapper/ProjectMapper.xml b/bonus-admin/src/main/resources/mapper/ProjectMapper.xml index c2c561b..09b71df 100644 --- a/bonus-admin/src/main/resources/mapper/ProjectMapper.xml +++ b/bonus-admin/src/main/resources/mapper/ProjectMapper.xml @@ -79,10 +79,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - SELECT id, - content_name AS contentName + content_name AS name FROM da_ky_files_contents WHERE