From e3c820271dc5e2919f5e770250b2801f5210daa6 Mon Sep 17 00:00:00 2001 From: ziin Date: Thu, 4 Sep 2025 20:51:59 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=B7=BB=E5=8A=A0=E5=91=98?= =?UTF-8?q?=E5=B7=A5=E5=AF=BC=E5=87=BA=E4=B8=BB=E6=92=AD=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../employeehosts/EmployeeHostsController.java | 15 +++++++++++++++ .../employeehosts/EmployeeHostsServiceImpl.java | 11 +++-------- .../yudao/framework/common/pojo/PageParam.java | 2 +- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/EmployeeHostsController.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/EmployeeHostsController.java index 6171231..43b8c40 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/EmployeeHostsController.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/employeehosts/EmployeeHostsController.java @@ -112,6 +112,21 @@ public class EmployeeHostsController { BeanUtils.toBean(list, EmployeeHostsRespVO.class)); } + @GetMapping("/export-employee-excel") + @Operation(summary = "导出员工分配主播Excel") + @PreAuthorize("@ss.hasPermission('server:employee-self-hosts:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportEmployeeSelfHostsExcel(@Valid EmployeeHostsPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + PageResult employeeHostsPageWithSelf = employeeHostsService.getEmployeeHostsPageWithSelf(pageReqVO); + List list = employeeHostsPageWithSelf.getList(); + // 导出 Excel + ExcelUtils.write(response, "员工分配主播.xls", "数据", EmployeeHostsRespVO.class, + BeanUtils.toBean(list, EmployeeHostsRespVO.class)); + } + + @PostMapping("/allocation") @Operation(summary = "批量分配主播给员工") @PreAuthorize("@ss.hasPermission('server:employee-hosts:allocation')") diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeehosts/EmployeeHostsServiceImpl.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeehosts/EmployeeHostsServiceImpl.java index 39b2e67..a52f7ca 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeehosts/EmployeeHostsServiceImpl.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/service/employeehosts/EmployeeHostsServiceImpl.java @@ -110,15 +110,10 @@ public class EmployeeHostsServiceImpl implements EmployeeHostsService { @Override public PageResult getEmployeeHostsPage(EmployeeHostsPageReqVO pageReqVO) { - LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); pageReqVO.setTenantId(TenantContextHolder.getTenantId()); - if (loginUser != null) { - pageReqVO.setUserId(loginUser.getId()); - IPage iPage = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()); - IPage newHostsDOIPage = employeeHostsMapper.selectPageWithXMLWithSelf(iPage, pageReqVO); - return new PageResult<>(newHostsDOIPage.getRecords(), newHostsDOIPage.getTotal()); - } - return null; + IPage iPage = new Page<>(pageReqVO.getPageNo(),pageReqVO.getPageSize()); + IPage newHostsDOIPage = employeeHostsMapper.selectPageWithXML(iPage, pageReqVO); + return new PageResult<>(newHostsDOIPage.getRecords(),newHostsDOIPage.getTotal()); } @Override diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/PageParam.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/PageParam.java index 7e5db7d..fbb9516 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/PageParam.java +++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/PageParam.java @@ -29,7 +29,7 @@ public class PageParam implements Serializable { @Schema(description = "每页条数，最大值为 1000", requiredMode = Schema.RequiredMode.REQUIRED, example = "10") @NotNull(message = "每页条数不能为空") - @Min(value = 1, message = "每页条数最小值为 1") +// @Min(value = 1, message = "每页条数最小值为 1") @Max(value = 1000, message = "每页条数最大值为 1000") private Integer pageSize = PAGE_SIZE;