From 1f64cee827ed7c9b7bf95b412ca7ca40f2877a62 Mon Sep 17 00:00:00 2001 From: wangxy <1481820854@qq.com> Date: Fri, 22 Nov 2024 11:26:42 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E4=BC=9A=E8=AE=AE=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/meet/TdMeetingController.java | 17 +++++++++++++++++ .../templates/system/tdmeeting/tdmeeting.html | 6 +++--- .../java/com/ruoyi/system/domain/TdMeeting.java | 9 +++++++++ 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/meet/TdMeetingController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/meet/TdMeetingController.java index 9184bd9..e5dd9b8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/meet/TdMeetingController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/meet/TdMeetingController.java @@ -5,7 +5,10 @@ import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.system.domain.TdMeeting; +import com.ruoyi.system.domain.check.TdCheckReport; +import com.ruoyi.system.domain.check.dto.CheckReportDTO; import com.ruoyi.web.controller.manager.TdMeetingManager; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.stereotype.Controller; @@ -54,6 +57,20 @@ public class TdMeetingController extends BaseController { } + /** + * 导出列表 + */ + @RequiresPermissions("system:tdmeeting:export") + @Log(title = "涉密会议导出", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(TdMeeting tdMeeting) { + List tdMeetings = meetingManager.selectTdMeetingList(tdMeeting); + ExcelUtil util = new ExcelUtil<>(TdMeeting.class); + return util.exportExcel(tdMeetings, "涉密会议数据"); + } + + /** * 新增会议 */ diff --git a/ruoyi-admin/src/main/resources/templates/system/tdmeeting/tdmeeting.html b/ruoyi-admin/src/main/resources/templates/system/tdmeeting/tdmeeting.html index 1face36..afda0d7 100644 --- a/ruoyi-admin/src/main/resources/templates/system/tdmeeting/tdmeeting.html +++ b/ruoyi-admin/src/main/resources/templates/system/tdmeeting/tdmeeting.html @@ -47,9 +47,9 @@ 删除 - - - + + 导出 +
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdMeeting.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdMeeting.java index 7ed9136..e677f90 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdMeeting.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdMeeting.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import java.util.Date; +import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -27,36 +28,43 @@ public class TdMeeting extends BaseEntity { /** * 主题 */ + @Excel(name = "会议主题") private String meetingTitle; /** * 时间 */ + @Excel(name = "会议时间", width = 30, dateFormat = "yyyy-MM-dd") private Date meetingTime; /** * 地点 */ + @Excel(name = "地点") private String meetingAddress; /** * 参会人数 */ + @Excel(name = "参会人数") private Integer meetingUsernum; /** * 主办方 */ + @Excel(name = "主办方") private String meetingHost; /** * 会议类型 */ + @Excel(name = "会议类型",readConverterExp = "0=线上会议,1=线下会议") private String meetingType; /** * 会议状态(未召开,已召开) */ + @Excel(name = "会议状态",readConverterExp = "0=未召开,1=已召开") private String meetingState; /** @@ -67,6 +75,7 @@ public class TdMeeting extends BaseEntity { /** * 会议纪要 */ + @Excel(name = "会议纪要") private String summary; /**