From 27fff67070616dacd6c5af18d07a988d28a04de7 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 02 九月 2025 17:35:58 +0800
Subject: [PATCH] 个人记事本新增结束时间
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZIdeaController.java | 7 +++++++
zhang-content/src/main/java/com/ruoyi/domain/ZSelfNote.java | 8 ++++++++
2 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZIdeaController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZIdeaController.java
index 109fc10..a6ca3f3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZIdeaController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZIdeaController.java
@@ -89,6 +89,13 @@
@PostMapping("/export")
public void export(HttpServletResponse response)
{
+ SysUser user = SecurityUtils.getLoginUser().getUser();
+ Boolean userStatus = sysUserService.findUserStatus(user.getUserId());
+
+ if(userStatus) {
+ throw new IllegalArgumentException("鎮ㄧ殑璇曠敤鏈熷凡缁忕粨鏉燂紝璇蜂粯璐圭户缁娇鐢�");
+
+ }
List<ZIdea> list = zIdeaService.selectByCondition();
log.info("瀵煎嚭璁板綍涓�:{}",list);
ExcelUtil<ZIdea> util = new ExcelUtil<>(ZIdea.class);
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZSelfNote.java b/zhang-content/src/main/java/com/ruoyi/domain/ZSelfNote.java
index b9174ac..ab4ddb7 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZSelfNote.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZSelfNote.java
@@ -72,6 +72,14 @@
private Date happenTime;
/**
+ * 缁撴潫鏃堕棿
+ */
+ @Excel(name = "缁撴潫鏃堕棿",dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date endTime;
+
+
+ /**
* 鐢靛瓙鏂囦欢璺緞
*/
@Excel(name = "鐢靛瓙鏂囦欢璺緞")
--
Gitblit v1.9.1