From 489801409cf1a5994be6f3f7a302f43b52e8c067 Mon Sep 17 00:00:00 2001 From: hhyykk Date: Thu, 18 Jul 2024 09:08:12 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20=E4=BB=A3=E7=A0=81=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectuser/ProjectUserController.java | 31 ------------------- .../projectuser/ProjectUserService.java | 11 ------- .../projectuser/ProjectUserServiceImpl.java | 5 --- 3 files changed, 47 deletions(-) diff --git a/yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/projectuser/ProjectUserController.java b/yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/projectuser/ProjectUserController.java index a26ee7d69..f6088325b 100644 --- a/yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/projectuser/ProjectUserController.java +++ b/yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/projectuser/ProjectUserController.java @@ -1,12 +1,7 @@ package cn.iocoder.yudao.module.pms.controller.admin.projectuser; -import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; -import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; -import cn.iocoder.yudao.module.pms.controller.admin.projectuser.vo.ProjectUserPageReqVO; import cn.iocoder.yudao.module.pms.controller.admin.projectuser.vo.ProjectUserRespVO; import cn.iocoder.yudao.module.pms.controller.admin.projectuser.vo.ProjectUserSaveReqVO; import cn.iocoder.yudao.module.pms.dal.dataobject.projectuser.ProjectUserDO; @@ -15,16 +10,11 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; -import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.io.IOException; -import java.util.List; - -import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; @Tag(name = "管理后台 - 项目与人员关联关系") @@ -69,25 +59,4 @@ public class ProjectUserController { return success(BeanUtils.toBean(projectUser, ProjectUserRespVO.class)); } - @GetMapping("/page") - @Operation(summary = "获得项目与人员关联关系分页") - @PreAuthorize("@ss.hasPermission('pms:project-user:query')") - public CommonResult> getProjectUserPage(@Valid ProjectUserPageReqVO pageReqVO) { - PageResult pageResult = projectUserService.getProjectUserPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, ProjectUserRespVO.class)); - } - - @GetMapping("/export-excel") - @Operation(summary = "导出项目与人员关联关系 Excel") - @PreAuthorize("@ss.hasPermission('pms:project-user:export')") - @ApiAccessLog(operateType = EXPORT) - public void exportProjectUserExcel(@Valid ProjectUserPageReqVO pageReqVO, - HttpServletResponse response) throws IOException { - pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = projectUserService.getProjectUserPage(pageReqVO).getList(); - // 导出 Excel - ExcelUtils.write(response, "项目与人员关联关系.xls", "数据", ProjectUserRespVO.class, - BeanUtils.toBean(list, ProjectUserRespVO.class)); - } - } \ No newline at end of file diff --git a/yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/projectuser/ProjectUserService.java b/yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/projectuser/ProjectUserService.java index ba93b7a9e..8b957beab 100644 --- a/yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/projectuser/ProjectUserService.java +++ b/yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/projectuser/ProjectUserService.java @@ -1,7 +1,5 @@ package cn.iocoder.yudao.module.pms.service.projectuser; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.pms.controller.admin.projectuser.vo.ProjectUserPageReqVO; import cn.iocoder.yudao.module.pms.controller.admin.projectuser.vo.ProjectUserSaveReqVO; import cn.iocoder.yudao.module.pms.dal.dataobject.projectuser.ProjectUserDO; import jakarta.validation.Valid; @@ -42,13 +40,4 @@ public interface ProjectUserService { * @return 项目与人员关联关系 */ ProjectUserDO getProjectUser(Long id); - - /** - * 获得项目与人员关联关系分页 - * - * @param pageReqVO 分页查询 - * @return 项目与人员关联关系分页 - */ - PageResult getProjectUserPage(ProjectUserPageReqVO pageReqVO); - } \ No newline at end of file diff --git a/yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/projectuser/ProjectUserServiceImpl.java b/yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/projectuser/ProjectUserServiceImpl.java index aa6811e80..930bb42a0 100644 --- a/yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/projectuser/ProjectUserServiceImpl.java +++ b/yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/projectuser/ProjectUserServiceImpl.java @@ -62,9 +62,4 @@ public class ProjectUserServiceImpl implements ProjectUserService { return projectUserMapper.selectById(id); } - @Override - public PageResult getProjectUserPage(ProjectUserPageReqVO pageReqVO) { - return projectUserMapper.selectPage(pageReqVO); - } - } \ No newline at end of file