From e3afce6e24c800f81099cedd60ecad9697b690d1 Mon Sep 17 00:00:00 2001 From: HAHA Date: Thu, 26 May 2022 14:59:31 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=BD=91=E6=A0=BC=E5=85=9A=E5=BB=BA?= =?UTF-8?q?=E5=B9=B3=E9=9D=A2=E5=9B=BE=E3=80=91=E9=A5=BC=E5=9B=BE=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcVolunteerPolyServiceImpl.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVolunteerPolyServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVolunteerPolyServiceImpl.java index a2d33d2db2..c773873eed 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVolunteerPolyServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVolunteerPolyServiceImpl.java @@ -42,6 +42,8 @@ import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.ListUtils; +import org.apache.commons.collections4.MapUtils; +import org.apache.commons.compress.utils.Lists; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -447,6 +449,7 @@ public class IcVolunteerPolyServiceImpl extends BaseServiceImpl getStatistics(VolunteerPolyPieFormDTO form) { List list = baseDao.getStatistics(form); + Map map = list.stream().collect(Collectors.toMap(VolunteerPolyPieResultDTO::getCode, VolunteerPolyPieResultDTO::getValue)); //获取志愿者类别 IcFormOptionsQueryFormDTO optionsForm = new IcFormOptionsQueryFormDTO(); @@ -457,13 +460,15 @@ public class IcVolunteerPolyServiceImpl extends BaseServiceImpl data = volunteerMap.getData(); - return list.stream().map(item -> { + List result = Lists.newArrayList(); + data.forEach((key, label) -> { VolunteerPolyPieResultDTO dto = new VolunteerPolyPieResultDTO(); - dto.setCode(item.getCode()); - dto.setValue(item.getValue()); - dto.setLabel(data.get(item.getCode())); - return dto; - }).collect(Collectors.toList()); + dto.setCode(key); + dto.setLabel(label); + dto.setValue(MapUtils.getString(map, key, NumConstant.ZERO_STR)); + result.add(dto); + }); + return result; } /**