liuc/biz_service_ebtp_extend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'uat_partyMemberEvent' into uat_code

Browse Source
This commit is contained in:
517612449@qq.com
2022-06-27 17:30:43 +08:00
parent 54f00c400f a30156e61b
commit c3d3efdf89
4 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyMemberEventController.java
View File

@ -58,8 +58,8 @@ public class PartyMemberEventController {
@ApiOperation("活动课题列表")
@GetMapping("/eventSubject/list")
public BaseResponse<List<EventSubject>> getEventSubjectList() {
return BaseResponse.success(eventSubjectService.getEventSubjectList());
public BaseResponse<List<EventSubject>> getEventSubjectList(@RequestParam(value = "param", required = false) String param) {
return BaseResponse.success(eventSubjectService.getEventSubjectList(param));
}
@ApiOperation("活动联系人列表-按公司分组")

2
src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventSubjectService.java
View File

@ -13,5 +13,5 @@ import java.util.List;
public interface EventSubjectService extends IService<EventSubject>{
List<EventSubject> getEventSubjectList();
List<EventSubject> getEventSubjectList(String param);
}

11
src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventMockDataServiceImpl.java
View File

@ -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<EventMockDataMapper, EventMockData> implements EventMockDataService {
@Resource
private EventPartyBranchService eventPartyBranchService;
@Override
public List<EventMockData> getProfessionalDataList() {
@ -30,8 +34,15 @@ public class EventMockDataServiceImpl extends ServiceImpl<EventMockDataMapper, E
List<EventMockData> returnList = list.stream().filter(f -> StrUtil.isBlank(f.getParentClass()) ).collect(Collectors.toList());
Map<String, List<EventMockData>> map = list.stream().filter(f -> StrUtil.isNotBlank(f.getParentClass())).collect(Collectors.groupingBy(EventMockData::getParentClass));
Map<String, Integer> 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<EventMockData> dataList = map.get(f.getDataPy());
if (ObjectUtil.isNotNull(dataList) && !dataList.isEmpty()) {
List<MockDataValue> newList = new ArrayList<>();

4
src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventSubjectServiceImpl.java
View File

@ -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<EventSubjectMapper, Eve
private EventContactService contactService;
@Override
public List<EventSubject> getEventSubjectList() {
public List<EventSubject> getEventSubjectList(String param) {
LambdaQueryWrapper<EventSubject> query = Wrappers.lambdaQuery();
query.eq(EventSubject::getStatus, "1");
query.like(StrUtil.isNotBlank(param), EventSubject::getTitle, param);
List<EventSubject> list = this.list(query);
List<String> subjectIdList = list.stream().map(EventSubject::getId).collect(Collectors.toList());
List<String> teamLeaderIdList = list.stream().map(EventSubject::getTeamLeader).distinct().collect(Collectors.toList());