From a30156e61bd35ead5cb779080e3ffc952481f5e3 Mon Sep 17 00:00:00 2001 From: "517612449@qq.com" Date: Mon, 27 Jun 2022 17:22:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E6=B4=BB=E5=8A=A8=20?= =?UTF-8?q?=E5=85=9A=E6=94=AF=E9=83=A8=E5=85=9A=E5=91=98=E6=95=B0=E9=87=8F?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E8=AF=BE=E9=A2=98=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PartyMemberEventController.java | 4 ++-- .../partyMemberEvent/service/EventSubjectService.java | 2 +- .../service/impl/EventMockDataServiceImpl.java | 11 +++++++++++ .../service/impl/EventSubjectServiceImpl.java | 4 +++- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyMemberEventController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyMemberEventController.java index 8e2d643..456e40b 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyMemberEventController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyMemberEventController.java @@ -58,8 +58,8 @@ public class PartyMemberEventController { @ApiOperation("活动课题列表") @GetMapping("/eventSubject/list") - public BaseResponse> getEventSubjectList() { - return BaseResponse.success(eventSubjectService.getEventSubjectList()); + public BaseResponse> getEventSubjectList(@RequestParam(value = "param", required = false) String param) { + return BaseResponse.success(eventSubjectService.getEventSubjectList(param)); } @ApiOperation("活动联系人列表-按公司分组") diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventSubjectService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventSubjectService.java index 004671d..d6b897f 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventSubjectService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventSubjectService.java @@ -13,5 +13,5 @@ import java.util.List; public interface EventSubjectService extends IService{ - List getEventSubjectList(); + List getEventSubjectList(String param); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventMockDataServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventMockDataServiceImpl.java index 101c3eb..3436ab1 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventMockDataServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventMockDataServiceImpl.java @@ -8,8 +8,10 @@ import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.dao.EventMockDataMapper import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventMockData; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.MockDataValue; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.EventMockDataService; +import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.EventPartyBranchService; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -23,6 +25,8 @@ import java.util.stream.Collectors; @Service public class EventMockDataServiceImpl extends ServiceImpl implements EventMockDataService { + @Resource + private EventPartyBranchService eventPartyBranchService; @Override public List getProfessionalDataList() { @@ -30,8 +34,15 @@ public class EventMockDataServiceImpl extends ServiceImpl returnList = list.stream().filter(f -> StrUtil.isBlank(f.getParentClass()) ).collect(Collectors.toList()); Map> map = list.stream().filter(f -> StrUtil.isNotBlank(f.getParentClass())).collect(Collectors.groupingBy(EventMockData::getParentClass)); + Map partyBranchMemberCount = eventPartyBranchService.getPartyBranchMemberCount(); returnList.forEach(f -> { + if ("dysl".equals(f.getDataPy())) { + f.setDataValue(partyBranchMemberCount.get("member").toString()); + } + if ("dzbsl".equals(f.getDataPy())) { + f.setDataValue(partyBranchMemberCount.get("branch").toString()); + } List dataList = map.get(f.getDataPy()); if (ObjectUtil.isNotNull(dataList) && !dataList.isEmpty()) { List newList = new ArrayList<>(); diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventSubjectServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventSubjectServiceImpl.java index 4af6632..0c622db 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventSubjectServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventSubjectServiceImpl.java @@ -1,6 +1,7 @@ package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.impl; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -35,9 +36,10 @@ public class EventSubjectServiceImpl extends ServiceImpl getEventSubjectList() { + public List getEventSubjectList(String param) { LambdaQueryWrapper query = Wrappers.lambdaQuery(); query.eq(EventSubject::getStatus, "1"); + query.like(StrUtil.isNotBlank(param), EventSubject::getTitle, param); List list = this.list(query); List subjectIdList = list.stream().map(EventSubject::getId).collect(Collectors.toList()); List teamLeaderIdList = list.stream().map(EventSubject::getTeamLeader).distinct().collect(Collectors.toList());