From 99edffd9e82d31fdc45372836868a6c67f6fabfb Mon Sep 17 00:00:00 2001 From: YXY <932687738@qq.com> Date: Thu, 24 Aug 2023 21:35:51 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E8=AE=BA=E5=A2=9E=E5=8A=A0=E5=A4=B4?= =?UTF-8?q?=E5=83=8F=E5=92=8C=E6=97=B6=E9=97=B4=20=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E9=A2=84=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/larkactive/LarkInviteVo.java | 1 + .../LarkUserActiveInviteRelatoinMapper.java | 3 ++- ...rkUserActiveInviteRelatoinServiceImpl.java | 25 ++++++++++++++----- .../LarkUserActiveInviteRelatoinMapper.xml | 11 ++++---- 4 files changed, 27 insertions(+), 13 deletions(-) diff --git a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/domain/larkactive/LarkInviteVo.java b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/domain/larkactive/LarkInviteVo.java index 47c8297..c47ca21 100644 --- a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/domain/larkactive/LarkInviteVo.java +++ b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/domain/larkactive/LarkInviteVo.java @@ -15,4 +15,5 @@ public class LarkInviteVo { private String text; private String type; private String badge = "0"; + private String total; } diff --git a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/mapper/LarkUserActiveInviteRelatoinMapper.java b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/mapper/LarkUserActiveInviteRelatoinMapper.java index 07f79f8..faf5a98 100644 --- a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/mapper/LarkUserActiveInviteRelatoinMapper.java +++ b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/mapper/LarkUserActiveInviteRelatoinMapper.java @@ -1,6 +1,7 @@ package com.ruoyi.flyingbook.mapper; import com.ruoyi.flyingbook.domain.LarkUserActiveInviteRelatoin; +import com.ruoyi.flyingbook.domain.larkactive.LarkInviteVo; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -29,7 +30,7 @@ public interface LarkUserActiveInviteRelatoinMapper { public List selectLarkUserActiveInviteRelatoinList(LarkUserActiveInviteRelatoin larkUserActiveInviteRelatoin); public List queryByInviteList(@Param("inviteList") List inviteList,@Param("flag") Long flag,@Param("inviteStage") String inviteStage); public int updateStage(@Param("idList") List idList,@Param("inviteStage") String inviteStage); - public List queryTopTen(LarkUserActiveInviteRelatoin larkUserActiveInviteRelatoin); + public List queryTopTen(LarkUserActiveInviteRelatoin larkUserActiveInviteRelatoin); /** * 新增【请填写功能名称】 diff --git a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/impl/LarkUserActiveInviteRelatoinServiceImpl.java b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/impl/LarkUserActiveInviteRelatoinServiceImpl.java index 664d6dd..8d8cd31 100644 --- a/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/impl/LarkUserActiveInviteRelatoinServiceImpl.java +++ b/ruoyi-flyingbook/src/main/java/com/ruoyi/flyingbook/service/impl/LarkUserActiveInviteRelatoinServiceImpl.java @@ -57,18 +57,18 @@ public class LarkUserActiveInviteRelatoinServiceImpl implements ILarkUserActiveI public List queryTopTen(LarkUserActiveInviteRelatoin larkUserActiveInviteRelatoin) { larkUserActiveInviteRelatoin.setFlag(FlagStatus.OK.getCode()); larkUserActiveInviteRelatoin.setInviteStage(LarkActiveInviteStageEnum.ACTIVE.getCode()); - List larkUserActiveInviteRelatoins = larkUserActiveInviteRelatoinMapper.queryTopTen(larkUserActiveInviteRelatoin); + List larkUserActiveInviteRelatoins = larkUserActiveInviteRelatoinMapper.queryTopTen(larkUserActiveInviteRelatoin); Map userInfoMap = queryUserInfoMap(larkUserActiveInviteRelatoins); List result = larkUserActiveInviteRelatoins.stream() .filter(r -> { - return userInfoMap.containsKey(r.getUserName()); + return userInfoMap.containsKey(r.getText()); }) .map(r -> { LarkInviteVo larkInviteVo = new LarkInviteVo(); - String userName = r.getUserName(); - LarkLoginLog larkLoginLog = userInfoMap.get(userName); + LarkLoginLog larkLoginLog = userInfoMap.get(r.getText()); larkInviteVo.setUrl(larkLoginLog.getImageUrl()); larkInviteVo.setText(larkLoginLog.getUserName()); + larkInviteVo.setTotal(r.getTotal()); return larkInviteVo; }).collect(Collectors.toList()); return result; @@ -92,7 +92,7 @@ public class LarkUserActiveInviteRelatoinServiceImpl implements ILarkUserActiveI public List queryMyInviteList(LarkUserActiveInviteRelatoin larkUserActiveInviteRelatoin) { larkUserActiveInviteRelatoin.setFlag(FlagStatus.OK.getCode()); List larkUserActiveInviteRelatoins = larkUserActiveInviteRelatoinMapper.selectLarkUserActiveInviteRelatoinList(larkUserActiveInviteRelatoin); - Map userInfoMap = queryUserInfoMap(larkUserActiveInviteRelatoins); + Map userInfoMap = queryInviteUserInfoMap(larkUserActiveInviteRelatoins); List result = larkUserActiveInviteRelatoins.stream().map(r -> { LarkInviteVo larkInviteVo = new LarkInviteVo(); String inviteUserName = r.getInviteUserName(); @@ -110,7 +110,20 @@ public class LarkUserActiveInviteRelatoinServiceImpl implements ILarkUserActiveI return result; } - private Map queryUserInfoMap(List larkUserActiveInviteRelatoins) { + private Map queryUserInfoMap(List larkUserActiveInviteRelatoins) { + if (CollectionUtils.isEmpty(larkUserActiveInviteRelatoins)) { + return new HashMap<>(); + } + List openIdList = larkUserActiveInviteRelatoins.stream() + .filter(r -> { + return StringUtils.isNotBlank(r.getText()); + }) + .map(LarkInviteVo::getText) + .distinct().collect(Collectors.toList()); + return larkLoginLogService.queryByOpenId(openIdList); + } + + private Map queryInviteUserInfoMap(List larkUserActiveInviteRelatoins) { if (CollectionUtils.isEmpty(larkUserActiveInviteRelatoins)) { return new HashMap<>(); } diff --git a/ruoyi-flyingbook/src/main/resources/mapper/LarkUserActiveInviteRelatoinMapper.xml b/ruoyi-flyingbook/src/main/resources/mapper/LarkUserActiveInviteRelatoinMapper.xml index ca9b8a2..a7b424f 100644 --- a/ruoyi-flyingbook/src/main/resources/mapper/LarkUserActiveInviteRelatoinMapper.xml +++ b/ruoyi-flyingbook/src/main/resources/mapper/LarkUserActiveInviteRelatoinMapper.xml @@ -35,14 +35,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - SELECT - id, - company_id, - company_name, user_name, - invite_user_name, - invite_stage, COUNT(id) as total FROM lark_user_active_invite_relatoin