From 8dd0d55f5e473bae9fadd027a833f45b44cab6cf Mon Sep 17 00:00:00 2001 From: maxiangong <298222784@qq.com> Date: Mon, 22 Jun 2026 16:39:24 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=85=AC=E5=91=8A=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=88=9B=E5=BB=BA=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springblade/desk/pojo/vo/NoticeVO.java | 3 ++ .../notice/controller/NoticeController.java | 10 ++++- .../desk/notice/mapper/NoticeMapper.java | 40 ++++++++++++------- .../desk/notice/mapper/NoticeMapper.xml | 11 +++++ .../desk/notice/service/INoticeService.java | 8 ++++ .../service/impl/NoticeServiceImpl.java | 6 +++ 6 files changed, 61 insertions(+), 17 deletions(-) diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/pojo/vo/NoticeVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/pojo/vo/NoticeVO.java index d1923a72c..4f3bdb23c 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/pojo/vo/NoticeVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/pojo/vo/NoticeVO.java @@ -20,4 +20,7 @@ public class NoticeVO extends Notice { @Schema(description = "租户编号") private String tenantId; + @Schema(description = "创建人") + private String createUserName; + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/notice/controller/NoticeController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/notice/controller/NoticeController.java index 9a608e804..fcc0a431d 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/notice/controller/NoticeController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/notice/controller/NoticeController.java @@ -48,6 +48,8 @@ import org.springblade.desk.feign.INoticeClient; import org.springblade.desk.notice.service.INoticeService; import org.springblade.desk.pojo.vo.NoticeVO; import org.springblade.desk.notice.wrapper.NoticeWrapper; +import org.springblade.system.cache.DictCache; +import org.springblade.system.pojo.enums.DictEnum; import org.springframework.web.bind.annotation.*; import java.util.Map; @@ -91,8 +93,12 @@ public class NoticeController extends BladeController { @Operation(summary = "分页", description = "传入notice") public R> list(@Parameter(hidden = true) @RequestParam Map notice, Query query) { NoticeWrapper.build().noticeQuery(notice); - IPage pages = noticeService.page(Condition.getPage(query), Condition.getQueryWrapper(notice, Notice.class)); - return R.data(NoticeWrapper.build().pageVO(pages)); + IPage pages = noticeService.selectPageEw(Condition.getPage(query), Condition.getQueryWrapper(notice, Notice.class)); + for (NoticeVO noticeVO : pages.getRecords()) { + String dictValue = DictCache.getValue(DictEnum.NOTICE, noticeVO.getCategory()); + noticeVO.setCategoryName(dictValue); + } + return R.data(pages); } /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/notice/mapper/NoticeMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/notice/mapper/NoticeMapper.java index bb8a0cf47..f5011f21e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/notice/mapper/NoticeMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/notice/mapper/NoticeMapper.java @@ -25,8 +25,10 @@ */ package org.springblade.desk.notice.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; import org.springblade.desk.pojo.entity.Notice; import org.springblade.desk.pojo.vo.NoticeVO; @@ -39,21 +41,29 @@ import java.util.List; */ public interface NoticeMapper extends BaseMapper { - /** - * 前N条数据 - * - * @param number 数量 - * @return List - */ - List topList(Integer number); + /** + * 前N条数据 + * + * @param number 数量 + * @return List + */ + List topList(Integer number); - /** - * 自定义分页 - * - * @param page 分页 - * @param notice 实体 - * @return List - */ - List selectNoticePage(IPage page, NoticeVO notice); + /** + * 自定义分页 + * + * @param page 分页 + * @param notice 实体 + * @return List + */ + List selectNoticePage(IPage page, NoticeVO notice); + + /** + * 自定义分页 + * @param page + * @param queryWrapper + * @return + */ + List selectPageEw(IPage page, @Param("ew") QueryWrapper queryWrapper); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/notice/mapper/NoticeMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/notice/mapper/NoticeMapper.xml index 6383cfd48..006a47f79 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/notice/mapper/NoticeMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/notice/mapper/NoticeMapper.xml @@ -28,6 +28,7 @@ + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/notice/service/INoticeService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/notice/service/INoticeService.java index 5c84384ec..04d763854 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/notice/service/INoticeService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/notice/service/INoticeService.java @@ -25,6 +25,7 @@ */ package org.springblade.desk.notice.service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; import org.springblade.desk.pojo.entity.Notice; @@ -45,4 +46,11 @@ public interface INoticeService extends BaseService { */ IPage selectNoticePage(IPage page, NoticeVO notice); + /** + * 自定义分页查询 + * @param page + * @param queryWrapper + * @return + */ + IPage selectPageEw(IPage page, QueryWrapper queryWrapper); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/notice/service/impl/NoticeServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/notice/service/impl/NoticeServiceImpl.java index c9c11c8cb..647cb3a3a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/notice/service/impl/NoticeServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/notice/service/impl/NoticeServiceImpl.java @@ -25,6 +25,7 @@ */ package org.springblade.desk.notice.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.secure.utils.AuthUtil; @@ -49,4 +50,9 @@ public class NoticeServiceImpl extends BaseServiceImpl imp return page.setRecords(baseMapper.selectNoticePage(page, notice)); } + @Override + public IPage selectPageEw(IPage page, QueryWrapper queryWrapper) { + return page.setRecords(baseMapper.selectPageEw(page, queryWrapper)); + } + }