diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiNoticeSignController.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiNoticeSignController.java index d03b44c..6bbe98f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiNoticeSignController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiNoticeSignController.java @@ -76,7 +76,7 @@ public class BusiNoticeSignController extends BaseController Page page = new Page<>(1, 5000); List records = noticeService.reportList(query, page).getRecords(); ExcelUtil util = new ExcelUtil(BusiNoticeSign.class); - util.exportExcel(response, records, "通告:"+notice.getTitle()+"报名名称"); + util.exportExcel(response, records, "通告"+notice.getTitle()+"报名名单"); } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiNoticeSign.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiNoticeSign.java index 9ef1251..1664993 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiNoticeSign.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiNoticeSign.java @@ -1,6 +1,7 @@ package com.ruoyi.busi.domain; import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -9,6 +10,7 @@ import lombok.*; import com.ruoyi.common.core.domain.DlBaseEntity; import java.math.BigDecimal; +import java.util.Date; /** * 通告报名对象 dl_busi_notice_sign @@ -32,29 +34,29 @@ public class BusiNoticeSign extends DlBaseEntity private String id; /** 通告 */ - @Excel(name = "通告") + private String noticeId; /** 报名用户 */ private Long userId; /** 报名用户昵称 */ - @Excel(name = "报名用户昵称") + @Excel(name = "报名用户昵称",sort=1) private String nickname; /** 报名用户头像 */ - @Excel(name = "报名用户头像", cellType = Excel.ColumnType.IMAGE) + @Excel(name = "报名用户头像", cellType = Excel.ColumnType.IMAGE,sort = 0) private String avatar; private String isSuper; /** 联系方式 */ - @Excel(name = "联系方式") + @Excel(name = "联系方式",sort = 5) private String tel; /** 收货地址 */ - @Excel(name = "收货地址") + private String addrId; /** 通告合作状态 */ @@ -96,9 +98,29 @@ public class BusiNoticeSign extends DlBaseEntity @TableField(exist = false) private String accountName; @TableField(exist = false) + @Excel(name = "粉丝数量",sort=2) private Long fansNum; @TableField(exist = false) + @Excel(name = "主页链接",sort=3) private String indexUrl; + @TableField(exist = false) + @Excel(name = "平台id",sort=4) + private String accountNumber; + + + /** 收货地址 */ + @Excel(name = "收货地址",sort=6) + @TableField(exist = false) + private String addrName; + + /** 收货地址 */ + @Excel(name = "微信号",sort=7) + @TableField(exist = false) + private String wxNum; + + @TableField(exist = false) + @Excel(name = "报名时间",sort=8, width = 30, dateFormat = "yyyy-MM-dd HH:mm") + private Date signTime; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/domain/MemberBusiCard.java b/ruoyi-admin/src/main/java/com/ruoyi/member/domain/MemberBusiCard.java index 8a56117..8c8b181 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/domain/MemberBusiCard.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/domain/MemberBusiCard.java @@ -58,6 +58,10 @@ public class MemberBusiCard extends DlBaseEntity * 平台主页链接 */ private String indexUrl; + /** + * 微信账号 + */ + private String wxNum; /** 粉丝数量 */ @Excel(name = "粉丝数量") diff --git a/ruoyi-admin/src/main/resources/mapper/busi/BusiNoticeSignMapper.xml b/ruoyi-admin/src/main/resources/mapper/busi/BusiNoticeSignMapper.xml index aefbed8..70e9578 100644 --- a/ruoyi-admin/src/main/resources/mapper/busi/BusiNoticeSignMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/busi/BusiNoticeSignMapper.xml @@ -58,9 +58,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"