From 615cfca7f6dab94645ce9f731ffdf0787ce7abfe Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 10 九月 2024 15:20:19 +0800
Subject: [PATCH] 代码提交
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TNoticeController.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TNoticeController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TNoticeController.java
index fdadabc..4c66c0e 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TNoticeController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TNoticeController.java
@@ -1,6 +1,7 @@
package com.ruoyi.other.controller;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.other.api.domain.TNotice;
@@ -11,7 +12,9 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.util.List;
/**
* <p>
@@ -71,8 +74,21 @@
.ge(TNotice::getEndTime, LocalDateTime.now())
.like(query.getContent()!=null&&query.getContent()!="",TNotice::getContent,query.getContent())
.page(Page.of(query.getPageCurr(),query.getPageSize())));
- }
- return AjaxResult.success();
+ }else{
+ return AjaxResult.success(noticeService.lambdaQuery()
+ .like(query.getContent()!=null&&query.getContent()!="",TNotice::getContent,query.getContent())
+ .page(Page.of(query.getPageCurr(),query.getPageSize())));
+ }
+
+
+ }
+
+ @ApiOperation(tags = {"小程序-首页-公告管理"},value = "查询")
+ @GetMapping(value = "/list")
+ public AjaxResult<List<TNotice>> list() {
+ return AjaxResult.success(noticeService.list(Wrappers.lambdaQuery(TNotice.class)
+ .le(TNotice::getStartTime, LocalDate.now())
+ .ge(TNotice::getEndTime,LocalDate.now())));
}
--
Gitblit v1.7.1