公告增加类型

This commit is contained in:
张松
2025-01-09 15:32:38 +08:00
parent 7724d2ec65
commit 693c7b0abc
3 changed files with 8 additions and 8 deletions

View File

@@ -19,8 +19,8 @@ public class AnnouncementController {
} }
@GetMapping("/list") @GetMapping("/list")
public Result list(@RequestParam(required = false) String title, @RequestParam(required = false) Integer state, @RequestParam(required = false) Integer id) { public Result list(@RequestParam(required = false) String title, @RequestParam(required = false) Integer state, @RequestParam(required = false) Integer id, @RequestParam(required = false) Integer type) {
return Result.success().put("data", announcementService.listInfo(title, state, id)); return Result.success().put("data", announcementService.listInfo(title, state, id, type));
} }
@PostMapping @PostMapping

View File

@@ -17,6 +17,6 @@ public interface AnnouncementService extends IService<Announcement> {
Object updateInfo(UpdateAnnouncementDTO updateAnnouncementDTO); Object updateInfo(UpdateAnnouncementDTO updateAnnouncementDTO);
Object listInfo(String title, Integer state, Integer id); Object listInfo(String title, Integer state, Integer id, Integer type);
} }

View File

@@ -23,21 +23,21 @@ public class AnnouncementServiceImpl extends ServiceImpl<AnnouncementMapper, Ann
implements AnnouncementService{ implements AnnouncementService{
@Override @Override
public Object listInfo(String title, Integer state, Integer id) { public Object listInfo(String title, Integer state, Integer id, Integer type) {
LambdaQueryWrapper<Announcement> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<Announcement> queryWrapper = new LambdaQueryWrapper<>();
boolean flag = false;
if (StrUtil.isNotBlank(title)) { if (StrUtil.isNotBlank(title)) {
queryWrapper.like(Announcement::getTitle, title); queryWrapper.like(Announcement::getTitle, title);
flag = true; }
if (type != null) {
queryWrapper.eq(Announcement::getType, type);
} }
if (state != null) { if (state != null) {
queryWrapper.eq(Announcement::getState, state); queryWrapper.eq(Announcement::getState, state);
flag = true;
} }
if (id != null) { if (id != null) {
queryWrapper.eq(Announcement::getId, id); queryWrapper.eq(Announcement::getId, id);
} }
return flag ? list(queryWrapper) : list(); return queryWrapper.isEmptyOfWhere() ? list() : list(queryWrapper);
} }
@Override @Override