From 269c5a0a8d4b90d08aaf7675e1880f2a007a810c Mon Sep 17 00:00:00 2001 From: buerjun Date: Mon, 3 Jul 2023 12:20:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E8=8D=90=E6=A1=88=E4=BE=8B=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E6=8E=A8=E8=8D=90id=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xboe/module/boecase/dao/CasesRecordDao.java | 2 ++ .../main/java/com/xboe/module/boecase/dto/CasePageVo.java | 6 ++++++ .../module/boecase/service/impl/CasesServiceImplTest.java | 1 + 3 files changed, 9 insertions(+) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRecordDao.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRecordDao.java index 68a72eea..a251471a 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRecordDao.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRecordDao.java @@ -21,6 +21,7 @@ public interface CasesRecordDao extends JpaRepository, JpaSpecifi @Query(nativeQuery = true, value = "select c.* from ( select b.*" + " from boe_cases_recommend_push_record a INNER JOIN boe_cases b on a.case_id = b.id" + " where b.deleted=0 and a.push_status = 3 and a.push_user_id= :#{#condition.userId}" + + " and if(IFNULL(:#{#condition.refId},'') !='' ,a.recommend_id = :#{#condition.refId},1=1) " + " and if(IFNULL(:#{#condition.keyWord},'')!='',b.title like CONCAT('%',:#{#condition.keyWord},'%')" + " or b.author_name like CONCAT('%',:#{#condition.keyWord},'%')" + " or b.keyword1 like CONCAT('%',:#{#condition.keyWord},'%')" + @@ -37,6 +38,7 @@ public interface CasesRecordDao extends JpaRepository, JpaSpecifi countQuery = "select count(*) FROM (select c.* from ( select b.*" + " from boe_cases_recommend_push_record a INNER JOIN boe_cases b on a.case_id = b.id " + " where b.deleted=0 and a.push_status = 3 and a.push_user_id= :#{#condition.userId}" + + " and if(IFNULL(:#{#condition.refId},'') !='' ,a.recommend_id = :#{#condition.refId},1=1) " + " and if(IFNULL(:#{#condition.keyWord},'')!='',b.title like CONCAT('%',:#{#condition.keyWord},'%')" + " or b.author_name like CONCAT('%',:#{#condition.keyWord},'%')" + " or b.keyword1 like CONCAT('%',:#{#condition.keyWord},'%')" + diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dto/CasePageVo.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dto/CasePageVo.java index 455eb485..45a20975 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dto/CasePageVo.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dto/CasePageVo.java @@ -2,6 +2,7 @@ package com.xboe.module.boecase.dto; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; +import com.xboe.module.scorm.rte.model.datatype.Int; import lombok.Data; import org.apache.commons.collections4.CollectionUtils; @@ -62,6 +63,11 @@ public class CasePageVo extends PageDto { */ private String userId; + /** + * 推荐id + */ + private Long refId; + public boolean isYearsEmpty() { return CollUtil.isEmpty(this.years); } diff --git a/servers/boe-server-all/src/test/java/com/xboe/module/boecase/service/impl/CasesServiceImplTest.java b/servers/boe-server-all/src/test/java/com/xboe/module/boecase/service/impl/CasesServiceImplTest.java index 9dfc8ac4..5154c915 100644 --- a/servers/boe-server-all/src/test/java/com/xboe/module/boecase/service/impl/CasesServiceImplTest.java +++ b/servers/boe-server-all/src/test/java/com/xboe/module/boecase/service/impl/CasesServiceImplTest.java @@ -46,6 +46,7 @@ class CasesServiceImplTest { mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES,false); CasePageVo pageVo = mapper.readValue(jsonStr, CasePageVo.class); pageVo.setUserId("965342027497607168"); + pageVo.setRefId(1125371361194614787L); PageList casesV2 = casesService.queryRecommendPageCasesV2(pageVo); System.out.println(casesV2); }