diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/vo/BusiNoticeVo.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/vo/BusiNoticeVo.java index 462809e..a794fba 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/vo/BusiNoticeVo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/vo/BusiNoticeVo.java @@ -42,5 +42,7 @@ public class BusiNoticeVo extends BusiNotice { */ private String isEvaluate; private String signId; + //报名卡片名称 + private String cardName; } diff --git a/ruoyi-admin/src/main/resources/mapper/busi/BusiNoticeMapper.xml b/ruoyi-admin/src/main/resources/mapper/busi/BusiNoticeMapper.xml index 49d337b..7432ab1 100644 --- a/ruoyi-admin/src/main/resources/mapper/busi/BusiNoticeMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/busi/BusiNoticeMapper.xml @@ -109,13 +109,13 @@ order by dbns.create_time desc AND ( dbn.have_gift = '1' ) - AND ( dbn.fans_up >= #{entity.fansUp} ) + AND ( dbn.fans_up <= #{entity.fansUp} ) AND ( dbn.fans_down <= #{entity.fansDown} ) - AND ( dbn.fee_up >=#{entity.feeUp} ) + AND ( dbn.fee_up <= #{entity.feeUp} ) AND ( dbn.fee_down <=#{entity.feeDown} ) @@ -307,6 +307,7 @@ order by dbns.create_time desc su.nick_name AS userNickName, count(sign.id) as reportNum, mySign.create_time as signTime, + card.account_name as cardName, CASE WHEN mySign.status = '01' AND dbn.end_date >= CURDATE() THEN '审核中' WHEN mySign.status = '02' THEN '已通过' @@ -321,6 +322,7 @@ order by dbns.create_time desc LEFT JOIN sys_user su ON dbn.user_id = su.user_id LEFT join dl_busi_notice_sign sign on sign.notice_id = dbn.id and sign.del_flag = 0 inner join dl_busi_notice_sign mySign on dbn.id = mySign.notice_id and dbn.del_flag = 0 and mySign.user_id = #{entity.userId} + inner join dl_member_busi_card card on card.id = mySign.card_id and card.del_flag = 0 WHERE dbn.del_flag = 0 AND (dbn.approval_status = '1') @@ -342,7 +344,7 @@ order by dbns.create_time desc - group by dbn.id + group by dbn.id,mySign.id ORDER BY dbn.create_time DESC