bug修复

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

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;
 
 
 

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<BusiEvaluateMapper,Busi
     private BusiEvaluateMapper busiEvaluateMapper;
     @Autowired
     private ISysUserService sysUserService;
+    @Autowired
+    private BusiNoticeSignMapper busiNoticeSignMapper;
 
     @Override
     public IPage<BusiEvaluate> queryListPage(BusiEvaluate pageReqVO, Page<BusiEvaluate> page) {
@@ -70,11 +76,18 @@ public class BusiEvaluateServiceImpl extends ServiceImpl<BusiEvaluateMapper,Busi
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void saveVo(BusiEvaluate busiEvaluate) {
         Long userId = SecurityUtils.getUserId();
         SysUser sysUser = sysUserService.selectUserById(userId);
         busiEvaluate.setToUserId(sysUser.getUserId());
         busiEvaluate.setNickname(sysUser.getNickName());
         this.save(busiEvaluate);
+        //处理报名是否评价的状态
+        if (StringUtils.isNotEmpty(busiEvaluate.getSignId())){
+            BusiNoticeSign busiNoticeSign = busiNoticeSignMapper.selectById(busiEvaluate.getSignId());
+            busiNoticeSign.setIsEvaluate("1");
+            busiNoticeSignMapper.updateById(busiNoticeSign);
+        }
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java

@@ -25,7 +25,6 @@ import com.ruoyi.busi.vo.BusiNoticeVo;
 import com.ruoyi.busi.vo.SubScribeQuery;
 import com.ruoyi.busi.vo.SubscribeDataObj;
 import com.ruoyi.common.config.WxAppConfig;
-import com.ruoyi.common.core.domain.DlBaseEntity;
 
 import java.util.stream.Collectors;
 
@@ -38,15 +37,12 @@ import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.busi.query.BusiNoticeQuery;
 import com.ruoyi.constant.DictConstants;
-import com.ruoyi.member.domain.MemberApply;
 import com.ruoyi.member.domain.MemberPoints;
 import com.ruoyi.member.domain.MemberUser;
 import com.ruoyi.member.service.*;
 import com.ruoyi.member.vo.MemberUserVO;
 import com.ruoyi.payConfig.WechatPayConfig;
-import com.ruoyi.system.service.ISysConfigService;
 import com.ruoyi.system.service.ISysDictDataService;
-import com.ruoyi.system.service.ISysDictTypeService;
 import com.ruoyi.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
@@ -394,10 +390,17 @@ public class BusiNoticeServiceImpl extends ServiceImpl<BusiNoticeMapper,BusiNoti
             queryWrapper.eq(BaseCity::getCityId,query.getCityId()).last("limit 1");
             BaseCity city = cityService.getOne(queryWrapper);
             query.setCityName(city.getName());
+        }
+        try {
+            query.setUserId(SecurityUtils.getUserId());
+        }catch (Exception ignored){
+
         }
         IPage<BusiNoticeVo> pageList = busiNoticeMapper.queryAppListPage(query,page);
         //打乱records的排列顺序
-
+        List<BusiNoticeVo> records = pageList.getRecords();
+        Collections.shuffle(records);
+        pageList.setRecords(records);
         List<String> idList = pageList.getRecords().stream().map(BusiNotice::getId).collect(Collectors.toList());
         if(!idList.isEmpty()){
             //查博主类型字典

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

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
+        <if test="entity.userId!=null and entity.userId!=''">
+            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}
+        </if>
         WHERE
             dbn.del_flag = 0 and dbn.end_date &gt;= CURDATE()
           AND (dbn.approval_status = '1')
+        <if test="entity.userId!=null and entity.userId!=''">
+            and blacklist.id is null
+        </if>
         <if test="entity.gift!=null and entity.gift!=''">
             AND ( dbn.gift_detail IS NOT NULL AND dbn.gift_detail != ''  )
         </if>
@@ -127,7 +133,7 @@ order by dbns.create_time desc
              </when>
              <otherwise>
                  -- 默认正序排列 --
-                 RAND()
+                 dbn.create_time DESC
              </otherwise>
          </choose>
 
@@ -306,7 +312,9 @@ order by dbns.create_time desc
         WHEN mySign.status = '02' THEN '已通过'
         WHEN mySign.status = '01' AND dbn.end_date &lt; 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