From f9e9bd38b2255c5cb201c8ee0123b7dbaec52938 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 22 十月 2024 16:54:06 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TNoticeController.java | 24 ++++++++++++++++++++++--
1 files changed, 22 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..ff18893 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,8 +1,11 @@
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.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.other.api.domain.TNotice;
import com.ruoyi.other.api.dto.NoticeQueryDto;
import com.ruoyi.other.mapper.SysNoticeMapper;
@@ -11,7 +14,9 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.util.List;
/**
* <p>
@@ -29,6 +34,7 @@
@ApiOperation(tags = {"后台-内容设置-公告管理"},value = "新增修改")
@PostMapping(value = "/saveOrUpdate")
+ @Log(title = "【公告管理】新增修改公告", businessType = BusinessType.INSERT)
public AjaxResult saveOrUpdate(@RequestBody TNotice notice) {
noticeService.saveOrUpdate(notice);
return AjaxResult.success();
@@ -36,6 +42,7 @@
@ApiOperation(tags = {"后台-内容设置-公告管理"},value = "删除")
@DeleteMapping(value = "/deleteById")
+ @Log(title = "【公告管理】删除公告", businessType = BusinessType.DELETE)
public AjaxResult deleteById(String ids) {
String[] split = ids.split(",");
for (String id : split) {
@@ -71,8 +78,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