From b020afb0a6036b7ac9dd47bd3b26497bc7c65b8f Mon Sep 17 00:00:00 2001 From: 13405411873 <1994398261@qq.com> Date: Fri, 9 May 2025 16:15:59 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/busi/domain/BusiEvaluate.java | 3 +++ .../java/com/ruoyi/busi/domain/BusiNoticeSign.java | 4 ++++ .../busi/service/impl/BusiEvaluateServiceImpl.java | 13 +++++++++++++ .../busi/service/impl/BusiNoticeServiceImpl.java | 13 ++++++++----- .../main/java/com/ruoyi/busi/vo/BusiNoticeVo.java | 6 +++++- .../main/resources/mapper/busi/BusiNoticeMapper.xml | 12 ++++++++++-- 6 files changed, 43 insertions(+), 8 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiEvaluate.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiEvaluate.java index 00d0aae..fec1b27 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiEvaluate.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiEvaluate.java @@ -1,5 +1,6 @@ package com.ruoyi.busi.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.ruoyi.common.annotation.Excel; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -62,5 +63,7 @@ public class BusiEvaluate extends DlBaseEntity * 是否匿名评价0否1是 */ private String isAnonymous; + @TableField(exist = false) + private String signId; } 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 1664993..858ad81 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 @@ -121,6 +121,10 @@ public class BusiNoticeSign extends DlBaseEntity @TableField(exist = false) @Excel(name = "报名时间",sort=8, width = 30, dateFormat = "yyyy-MM-dd HH:mm") private Date signTime; + /** + * 是否评价 0否 1是 + */ + private String isEvaluate; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiEvaluateServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiEvaluateServiceImpl.java index 95fcba7..0abea0b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiEvaluateServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiEvaluateServiceImpl.java @@ -5,14 +5,18 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.busi.domain.BusiEvaluate; +import com.ruoyi.busi.domain.BusiNoticeSign; import com.ruoyi.busi.mapper.BusiEvaluateMapper; +import com.ruoyi.busi.mapper.BusiNoticeSignMapper; import com.ruoyi.busi.service.IBusiEvaluateService; import com.ruoyi.busi.vo.BusiEvaluateVO; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.system.service.ISysUserService; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.*; import java.util.function.Function; @@ -31,6 +35,8 @@ public class BusiEvaluateServiceImpl extends ServiceImpl queryListPage(BusiEvaluate pageReqVO, Page page) { @@ -70,11 +76,18 @@ public class BusiEvaluateServiceImpl extends ServiceImpl pageList = busiNoticeMapper.queryAppListPage(query,page); //打乱records的排列顺序 - + List records = pageList.getRecords(); + Collections.shuffle(records); + pageList.setRecords(records); List idList = pageList.getRecords().stream().map(BusiNotice::getId).collect(Collectors.toList()); if(!idList.isEmpty()){ //查博主类型字典 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 62fc315..462809e 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 @@ -37,6 +37,10 @@ public class BusiNoticeVo extends BusiNotice { private Date signTime; //状态 private String reportStatusText; - + /** + * 是否评价 0否 1是 + */ + private String isEvaluate; + private String signId; } diff --git a/ruoyi-admin/src/main/resources/mapper/busi/BusiNoticeMapper.xml b/ruoyi-admin/src/main/resources/mapper/busi/BusiNoticeMapper.xml index 34311bd..ddcfb49 100644 --- a/ruoyi-admin/src/main/resources/mapper/busi/BusiNoticeMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/busi/BusiNoticeMapper.xml @@ -75,9 +75,15 @@ order by dbns.create_time desc LEFT JOIN dl_busi_notice_view dbnv ON dbn.id = dbnv.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_member_blacklist blacklist on blacklist.black_user_id = dbn.user_id and blacklist.del_flag = 0 and blacklist.user_id = #{entity.userId} + WHERE dbn.del_flag = 0 and dbn.end_date >= CURDATE() AND (dbn.approval_status = '1') + + and blacklist.id is null + AND ( dbn.gift_detail IS NOT NULL AND dbn.gift_detail != '' ) @@ -127,7 +133,7 @@ order by dbns.create_time desc -- 默认正序排列 -- - RAND() + dbn.create_time DESC @@ -306,7 +312,9 @@ order by dbns.create_time desc WHEN mySign.status = '02' THEN '已通过' WHEN mySign.status = '01' AND dbn.end_date < CURDATE() THEN '未合作' ELSE '已过期' - END AS signStatus + END AS signStatus, + mySign.is_evaluate as isEvaluate, + mySign.id as signId FROM dl_busi_notice dbn LEFT JOIN dl_busi_notice_view dbnv ON dbn.id = dbnv.id