From ef81de8ec91f3ec0094df702e21cda3b3aac7749 Mon Sep 17 00:00:00 2001 From: boolean Date: Thu, 13 Jul 2023 11:13:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E8=8D=90=E5=88=97=E8=A1=A8=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E8=BF=94=E5=9B=9E=E6=8E=A8=E8=8D=90=E6=98=8E=E7=BB=86?= =?UTF-8?q?id?= 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()); }