From fb1ffa5826c8d797e882c6a371872ed34f082b62 Mon Sep 17 00:00:00 2001 From: buerjun Date: Mon, 3 Jul 2023 16:50:30 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=8E=A8=E8=8D=90?= =?UTF-8?q?=E6=A1=88=E4=BE=8Bicon=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= 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 1d1ab529..d0c7548e 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 @@ -289,7 +289,7 @@ public class CasesServiceImpl implements ICasesService { List subFilters = new ArrayList<>(); subFilters.add(FieldFilters.eq("pushUserId", caseVo.getUserId())); subFilters.add(FieldFilters.in("caseId", caseIds)); - subFilters.add(FieldFilters.eq("pushStatus", 4)); + subFilters.add(FieldFilters.eq("pushStatus", 3)); subFilters.add(FieldFilters.eq("deleted", Boolean.FALSE)); QueryBuilder queryBuilder = recommendCasesQuery.addFilters(subFilters) From 5a990606103e0a61e2bbdb52cd653b24ac7f8b16 Mon Sep 17 00:00:00 2001 From: buerjun Date: Mon, 3 Jul 2023 17:59:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=8E=A8=E8=8D=90?= =?UTF-8?q?=E6=A1=88=E4=BE=8Bicon=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98222?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/boecase/service/impl/CasesServiceImpl.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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 d0c7548e..47f33d69 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 @@ -282,6 +282,9 @@ public class CasesServiceImpl implements ICasesService { query.setPageSize(caseVo.getPageSize()); page = casesDao.findPage(query.builder()); List list = page.getList(); + list.forEach(it->{ + it.setBreCommend(0); + }); if (CollUtil.isNotEmpty(list) && StrUtil.isNotBlank(caseVo.getUserId())) { List caseIds = list.stream().map(Cases::getId).collect(Collectors.toList()); QueryBuilder recommendCasesQuery = QueryBuilder.from(CasesRecommendPushRecord.class); @@ -294,10 +297,10 @@ public class CasesServiceImpl implements ICasesService { QueryBuilder queryBuilder = recommendCasesQuery.addFilters(subFilters) .addOrder("sysCreateTime", OrderDirection.DESC) - .addGroupBy("recommendId"); + .addGroupBy("caseId"); List pushRecords = casesRecommendPushRecordDao.findList(queryBuilder.builder()); if (CollUtil.isNotEmpty(pushRecords)) { - List rIds = pushRecords.stream().map(CasesRecommendPushRecord::getRecommendId).collect(Collectors.toList()); + List rIds = pushRecords.stream().map(CasesRecommendPushRecord::getRecommendId).distinct().collect(Collectors.toList()); QueryBuilder builder = QueryBuilder.from(CasesRecommend.class); builder.addField("new CasesRecommend(id,recommendOrgName)"); List recommendFilters = new ArrayList<>(); @@ -350,7 +353,7 @@ public class CasesServiceImpl implements ICasesService { .addGroupBy("caseId"); List pushRecords = casesRecommendPushRecordDao.findList(queryBuilder.builder()); if (CollUtil.isNotEmpty(pushRecords)) { - List rIds = pushRecords.stream().map(CasesRecommendPushRecord::getRecommendId).collect(Collectors.toList()); + List rIds = pushRecords.stream().map(CasesRecommendPushRecord::getRecommendId).distinct().collect(Collectors.toList()); QueryBuilder builder = QueryBuilder.from(CasesRecommend.class); List recommendFilters = new ArrayList<>(); recommendFilters.add(FieldFilters.eq("deleted", Boolean.FALSE));