From 9f2ab0fa1a46e68fefb8df8f906ae0f652be31bf Mon Sep 17 00:00:00 2001 From: buerjun Date: Mon, 10 Jul 2023 12:01:30 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=8E=A8=E8=8D=90=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xboe/module/boecase/dao/CasesRecordDao.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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 a251471a..672a0885 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 @@ -20,8 +20,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) " + + " where b.deleted=0 and a.push_status = 3 and a.deleted=0 and a.push_user_id= :#{#condition.userId}" + " 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,8 +36,7 @@ public interface CasesRecordDao extends JpaRepository, JpaSpecifi " order by a.sys_create_time DESC, a.read_flag ASC) as c group by c.id", 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) " + + " where b.deleted=0 and a.push_status = 3 and a.deleted=0 and a.push_user_id= :#{#condition.userId}" + " 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},'%')" + From 45aa99aa32317b6a7a31d7045bf9b928338e795c Mon Sep 17 00:00:00 2001 From: buerjun Date: Mon, 10 Jul 2023 16:12:45 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=A8=E8=8D=90=EF=BC=8C=E8=BF=87=E6=BB=A4=E6=8E=89=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E7=9A=84=E6=8E=A8=E8=8D=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/module/boecase/service/impl/CasesServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java index 47f33d69..7ec76b9c 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java @@ -951,7 +951,7 @@ public class CasesServiceImpl implements ICasesService { String accountId = current.getAccountId(); List result = new ArrayList<>(); try { - String hql = "select a.caseId FROM CasesRecommendPushRecord a left join Cases b ON a.caseId = b.id WHERE a.pushUserId=?1 and a.pushStatus=3 and b.deleted = false group by a.caseId ORDER By a.pushTime DESC"; + String hql = "select a.caseId FROM CasesRecommendPushRecord a left join Cases b ON a.caseId = b.id WHERE a.pushUserId=?1 and a.pushStatus=3 and a.deleted = false and b.deleted = false group by a.caseId ORDER By a.pushTime DESC"; List listFields = casesRecommendDao.findListFields(hql, CASE_LEN, ListUtil.toList(accountId)); // List listFields = new ArrayList<>(); List caseIds = new ArrayList<>(); From a39db1d37ff5acc99fdfe40abd903834ed412122 Mon Sep 17 00:00:00 2001 From: Guava Date: Thu, 13 Jul 2023 10:11:17 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E4=B8=8D=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CasesRecommendPushRecordServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendPushRecordServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendPushRecordServiceImpl.java index 55f1cdf7..11f3ca36 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendPushRecordServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendPushRecordServiceImpl.java @@ -211,6 +211,7 @@ public class CasesRecommendPushRecordServiceImpl implements ICasesRecommendPushR .addUpdateField("readFlag", 1) .addUpdateField("readStartTime", new Date()) .addFilter(FieldFilters.eq("id", caseRecommendId)) + .addFilter(FieldFilters.eq("readFlag", 0)) .builder()) > 0; } From ef81de8ec91f3ec0094df702e21cda3b3aac7749 Mon Sep 17 00:00:00 2001 From: boolean Date: Thu, 13 Jul 2023 11:13:12 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=8E=A8=E8=8D=90=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=BF=94=E5=9B=9E=E6=8E=A8=E8=8D=90=E6=98=8E?= =?UTF-8?q?=E7=BB=86id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xboe/module/boecase/entity/Cases.java | 10 +++++----- .../boecase/entity/CasesRecommendPushRecord.java | 3 ++- .../module/boecase/service/impl/CasesServiceImpl.java | 3 ++- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/Cases.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/Cases.java index 10d21b31..43c8b18c 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/Cases.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/Cases.java @@ -268,14 +268,14 @@ public class Cases extends BaseEntity { private String recommendOrgName; @Transient - private Long recommendId; + private String refId; - public Long getRecommendId() { - return recommendId; + public String getRefId() { + return refId; } - public void setRecommendId(Long recommendId) { - this.recommendId = recommendId; + public void setRefId(String refId) { + this.refId = refId; } public String getTitle() { diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/CasesRecommendPushRecord.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/CasesRecommendPushRecord.java index 78233e86..d3e73305 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/CasesRecommendPushRecord.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/CasesRecommendPushRecord.java @@ -94,7 +94,8 @@ public class CasesRecommendPushRecord extends BaseEntity { public CasesRecommendPushRecord() { } - public CasesRecommendPushRecord(String recommendId,String caseId) { + public CasesRecommendPushRecord(String id,String recommendId,String caseId) { + this.setId(id); this.recommendId = recommendId; this.caseId = caseId; } diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java index 7ec76b9c..b9bafeb2 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java @@ -341,7 +341,7 @@ public class CasesServiceImpl implements ICasesService { String userId = caseVo.getUserId(); if (CollUtil.isNotEmpty(caseIds)) { QueryBuilder recommendCasesQuery = QueryBuilder.from(CasesRecommendPushRecord.class); - recommendCasesQuery.addField("new CasesRecommendPushRecord(recommendId,caseId)"); + recommendCasesQuery.addField("new CasesRecommendPushRecord(id,recommendId,caseId)"); List subFilters = new ArrayList<>(); subFilters.add(FieldFilters.eq("pushUserId", userId)); subFilters.add(FieldFilters.in("caseId", caseIds)); @@ -367,6 +367,7 @@ public class CasesServiceImpl implements ICasesService { if (Objects.nonNull(one)) { CasesRecommend recommend = collect.get(one.getRecommendId()); it.setBreCommend(1); + it.setRefId(one.getId()); it.setRecommendOrgName(recommend.getRecommendOrgName()); it.setSysCreateTime(recommend.getRecommendTime()); } From b1ca82c7b9b3eefcfe4f34a6423e784d57b3ac72 Mon Sep 17 00:00:00 2001 From: boolean Date: Thu, 13 Jul 2023 11:41:23 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=8E=A8=E8=8D=90=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=BF=94=E5=9B=9E=E6=8E=A8=E8=8D=90=E6=98=8E?= =?UTF-8?q?=E7=BB=86id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/module/boecase/service/impl/CasesServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java index b9bafeb2..66a808e8 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java @@ -288,7 +288,7 @@ public class CasesServiceImpl implements ICasesService { if (CollUtil.isNotEmpty(list) && StrUtil.isNotBlank(caseVo.getUserId())) { List caseIds = list.stream().map(Cases::getId).collect(Collectors.toList()); QueryBuilder recommendCasesQuery = QueryBuilder.from(CasesRecommendPushRecord.class); - recommendCasesQuery.addField("new CasesRecommendPushRecord(recommendId,caseId)"); + recommendCasesQuery.addField("new CasesRecommendPushRecord(id,recommendId,caseId)"); List subFilters = new ArrayList<>(); subFilters.add(FieldFilters.eq("pushUserId", caseVo.getUserId())); subFilters.add(FieldFilters.in("caseId", caseIds));