dianliang/dl_admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
13405411873 2025-05-12 13:59:03 +08:00
parent 14dbc4b927
commit 08dbef58eb
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/busi/vo/BusiNoticeVo.java
View File

@ -42,5 +42,7 @@ public class BusiNoticeVo extends BusiNotice {
*/ */
private String isEvaluate; private String isEvaluate;
private String signId; private String signId;
//报名卡片名称
private String cardName;
} }

8
ruoyi-admin/src/main/resources/mapper/busi/BusiNoticeMapper.xml
View File

@ -109,13 +109,13 @@ order by dbns.create_time desc
AND ( dbn.have_gift = '1' ) AND ( dbn.have_gift = '1' )
</if> </if>
<if test="entity.fansUp!=null"> <if test="entity.fansUp!=null">
AND ( dbn.fans_up &gt;= #{entity.fansUp} ) AND ( dbn.fans_up &lt;= #{entity.fansUp} )
</if> </if>
<if test="entity.fansDown!=null"> <if test="entity.fansDown!=null">
AND ( dbn.fans_down &lt;= #{entity.fansDown} ) AND ( dbn.fans_down &lt;= #{entity.fansDown} )
</if> </if>
<if test="entity.feeUp!=null"> <if test="entity.feeUp!=null">
AND ( dbn.fee_up &gt;=#{entity.feeUp} ) AND ( dbn.fee_up &lt;= #{entity.feeUp} )
</if> </if>
<if test="entity.feeDown!=null"> <if test="entity.feeDown!=null">
AND ( dbn.fee_down &lt;=#{entity.feeDown} ) AND ( dbn.fee_down &lt;=#{entity.feeDown} )
@ -307,6 +307,7 @@ order by dbns.create_time desc
su.nick_name AS userNickName, su.nick_name AS userNickName,
count(sign.id) as reportNum, count(sign.id) as reportNum,
mySign.create_time as signTime, mySign.create_time as signTime,
card.account_name as cardName,
CASE CASE
WHEN mySign.status = '01' AND dbn.end_date &gt;= CURDATE() THEN '审核中' WHEN mySign.status = '01' AND dbn.end_date &gt;= CURDATE() THEN '审核中'
WHEN mySign.status = '02' 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 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 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_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 WHERE
dbn.del_flag = 0 dbn.del_flag = 0
AND (dbn.approval_status = '1') AND (dbn.approval_status = '1')
@ -342,7 +344,7 @@ order by dbns.create_time desc
</choose> </choose>
</if> </if>
group by dbn.id group by dbn.id,mySign.id
ORDER BY ORDER BY
dbn.create_time DESC dbn.create_time DESC
</select> </select>