Compare commits

...

2 Commits

Author SHA1 Message Date
1f1ce826ed Merge remote-tracking branch 'origin/master'
# Conflicts:
#	ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiNoticeSignController.java
2025-04-25 16:08:36 +08:00
7ed7c41435 通告功能 2025-04-25 16:07:54 +08:00
4 changed files with 34 additions and 7 deletions

View File

@ -76,7 +76,7 @@ public class BusiNoticeSignController extends BaseController
Page<BusiNoticeSign> page = new Page<>(1, 5000);
List<BusiNoticeSign> records = noticeService.reportList(query, page).getRecords();
ExcelUtil<BusiNoticeSign> util = new ExcelUtil<BusiNoticeSign>(BusiNoticeSign.class);
util.exportExcel(response, records, "通告-"+notice.getTitle()+"报名名");
util.exportExcel(response, records, "通告"+notice.getTitle()+"报名名");
}
/**

View File

@ -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;

View File

@ -58,6 +58,10 @@ public class MemberBusiCard extends DlBaseEntity
* 平台主页链接
*/
private String indexUrl;
/**
* 微信账号
*/
private String wxNum;
/** 粉丝数量 */
@Excel(name = "粉丝数量")

View File

@ -58,9 +58,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="reportList" resultType="com.ruoyi.busi.domain.BusiNoticeSign">
select sign.*,card.platform_name as platformName,
card.account_name as accountName,card.fans_num as fansNum
,card.platform_code as platformCode,card.index_url
,card.platform_code as platformCode,card.index_url,card.account_number,CONCAT(address.city_name, ' ', address.detail) as addrName,card.wx_num,sign.create_time as signTime
from dl_busi_notice_sign sign
inner join dl_member_busi_card card on sign.card_id = card.id
left join dl_member_address address on address.id = sign.addr_id
<where>
<if test="entity.noticeId != null and entity.noticeId != ''"> and sign.notice_id like concat('%', #{entity.noticeId}, '%')</if>