Merge branch 'uat_partyMemberEvent' into uat_code
This commit is contained in:
@ -10,9 +10,7 @@ import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventPartyBranch
|
|||||||
import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.EventContactService;
|
import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.EventContactService;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import java.util.Comparator;
|
import java.util.*;
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -28,7 +26,7 @@ public class EventContactServiceImpl extends ServiceImpl<EventContactMapper, Eve
|
|||||||
public Map<String, List<EventContact>> getEventContactGroup() {
|
public Map<String, List<EventContact>> getEventContactGroup() {
|
||||||
LambdaQueryWrapper<EventContact> query = Wrappers.lambdaQuery();
|
LambdaQueryWrapper<EventContact> query = Wrappers.lambdaQuery();
|
||||||
query.eq(EventContact::getStatus, "1");
|
query.eq(EventContact::getStatus, "1");
|
||||||
return this.list(query).stream().sorted(Comparator.comparing(EventContact::getSort)).collect(Collectors.groupingBy(EventContact::getContactUnit));
|
return this.list(query).stream().sorted(Comparator.comparing(EventContact::getSort)).collect(Collectors.groupingBy(EventContact::getContactUnit,LinkedHashMap::new,Collectors.toList()));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
Reference in New Issue
Block a user