饼图

epmet-user/epmet-user-client/src/main/java/com/epmet/enums/CustomizeEnum.java

@@ -0,0 +1,35 @@
+package com.epmet.enums;
+
+import com.epmet.commons.tools.enums.IcFormCodeEnum;
+
+public enum CustomizeEnum {
+    QI_TA("qita","其他"),
+    LAO_YOU_JV_LE_BU("laoyoujulebu","老友俱乐部"),
+    LOU_WEI_HUI("louweihui","楼委会"),
+    WEN_HUA_DUI_WU("wenhuaduiwu","文化队伍")
+    ;
+    private String code;
+    private String name;
+
+    CustomizeEnum(String code,String name) {
+        this.code = code;
+        this.name = name;
+    }
+
+    public static IcFormCodeEnum getEnum(String code) {
+        IcFormCodeEnum[] values = IcFormCodeEnum.values();
+        for (IcFormCodeEnum value : values) {
+            if (value.getCode().equals(code)) {
+                return value;
+            }
+        }
+        return null;
+    }
+
+    public String getCode() {
+        return code;
+    }
+    public String getName(){
+        return name;
+    }
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVolunteerPolyServiceImpl.java

@@ -28,6 +28,11 @@ import com.epmet.dto.result.VolunteerPolyListResultDTO;
 import com.epmet.dto.result.VolunteerPolyMapDataResultDTO;
 import com.epmet.dto.result.VolunteerPolyPieResultDTO;
 import com.epmet.entity.*;
+import com.epmet.entity.IcResiUserEntity;
+import com.epmet.entity.IcVolunteerPolyCategoryEntity;
+import com.epmet.entity.IcVolunteerPolyEntity;
+import com.epmet.entity.UserBaseInfoEntity;
+import com.epmet.enums.CustomizeEnum;
 import com.epmet.feign.EpmetHeartOpenFeignClient;
 import com.epmet.feign.OperCustomizeOpenFeignClient;
 import com.epmet.service.IcVolunteerPolyCategoryService;
@@ -44,10 +49,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -207,6 +209,7 @@ public class IcVolunteerPolyServiceImpl extends BaseServiceImpl<IcVolunteerPolyD
         if (CollectionUtils.isNotEmpty(appVolunteerList)) {
             //获取居民信息
             List<String> userIds = appVolunteerList.stream().map(IcVolunteerPolyDTO::getUserId).collect(Collectors.toList());
+
             //根据志愿者的userId获取居民信息并转成map
             List<UserBaseInfoEntity> userList = new ArrayList<>();
             List<List<String>> partition = ListUtils.partition(userIds, NumConstant.FIFTY);
@@ -484,6 +487,10 @@ public class IcVolunteerPolyServiceImpl extends BaseServiceImpl<IcVolunteerPolyD
         Result<Map<String, String>> volunteerMap = operCustomizeOpenFeignClient.getOptionsMap(optionsForm);
 
         Map<String, String> data = volunteerMap.getData();
+        data.remove(CustomizeEnum.LAO_YOU_JV_LE_BU.getCode());
+        data.remove(CustomizeEnum.LOU_WEI_HUI.getCode());
+        data.remove(CustomizeEnum.WEN_HUA_DUI_WU.getCode());
+        data.put(CustomizeEnum.QI_TA.getCode(),NumConstant.ZERO_STR);
 
         List<VolunteerPolyPieResultDTO> result = Lists.newArrayList();
         data.forEach((key, label) -> {