From 7298d5354963a88643a543b51b90192dc9fc934c Mon Sep 17 00:00:00 2001 From: doum <doum> Date: 星期四, 11 九月 2025 18:43:14 +0800 Subject: [PATCH] 最新版本541200007 --- server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsCloudController.java | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsCloudController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsCloudController.java index b2e49ca..26a3e56 100644 --- a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsCloudController.java +++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsCloudController.java @@ -7,10 +7,10 @@ import com.doumee.config.annotation.CloudRequiredPermission; import com.doumee.core.annotation.excel.ExcelExporter; import com.doumee.core.annotation.pr.PreventRepeat; -import com.doumee.core.model.ApiResponse; -import com.doumee.core.model.LoginUserInfo; -import com.doumee.core.model.PageData; -import com.doumee.core.model.PageWrap; +import com.doumee.service.business.third.model.ApiResponse; +import com.doumee.service.business.third.model.LoginUserInfo; +import com.doumee.service.business.third.model.PageData; +import com.doumee.service.business.third.model.PageWrap; import com.doumee.core.utils.Constants; import com.doumee.core.utils.DateUtil; import com.doumee.dao.business.model.Bookings; @@ -98,6 +98,7 @@ @PostMapping("/page") @CloudRequiredPermission("business:bookings:query") public ApiResponse<PageData<Bookings>> findPage (@RequestBody PageWrap<Bookings> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ + pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token)); return ApiResponse.success(bookingsService.findPage(pageWrap)); } @@ -105,6 +106,7 @@ @PostMapping("/exportExcel") @CloudRequiredPermission("business:bookings:exportExcel") public void exportExcel (@RequestBody PageWrap<Bookings> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ + pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token)); ExcelExporter.build(Bookings.class).export(bookingsService.findPage(pageWrap).getRecords(), "浼氳瀹ら瀹氫俊鎭〃", response); } @@ -149,7 +151,6 @@ @PostMapping("/exportUserStatistics") @CloudRequiredPermission("business:bookings:exportExcel") public void exportUserStatistics (@RequestBody PageWrap<UserStatisticsDTO> pageWrap,HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){ - List<UserStatisticsVo> records = bookingsService.getUserStatistics(pageWrap).getRecords(); if (!CollectionUtils.isEmpty(records)){ JSONArray o = (JSONArray) JSON.toJSON(records); -- Gitblit v1.9.3