数据分析-服务措施分析-柱状图

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java

@@ -25,6 +25,7 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.enums.DemandAnalysisLegendEnum;
 import com.epmet.commons.tools.enums.DictTypeEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
@@ -262,6 +263,10 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         } else {
             formDTO.setGridPids(staffInfo.getAgencyPIds().concat(StrConstant.COLON).concat(staffInfo.getAgencyId()));
         }
+        //服务方=志愿者的，查询的是居民信息的志愿者+爱心互助的志愿者服务的
+        if(UserDemandConstant.IC_USER_VOLUNTEER.equals(formDTO.getServiceType())){
+            formDTO.setServiceType(UserDemandConstant.VOLUNTEER);
+        }
         PageInfo<DemandRecResultDTO> pageInfo= PageHelper.startPage(formDTO.getPageNo(),
                 formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.pageSelect(formDTO));
         List<DemandRecResultDTO> list=pageInfo.getList();
@@ -947,19 +952,25 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
             return new CategoryAnalysisResDTO(Collections.EMPTY_LIST,Collections.EMPTY_LIST);
         }
         //2、没有服务类型直接退出
-        Result<Map<String, String>> serviceTypeRes=adminOpenFeignClient.dictMap(DictTypeEnum.USER_DEMAND_SERVICE_TYPE.getCode());
+        /*Result<Map<String, String>> serviceTypeRes=adminOpenFeignClient.dictMap(DictTypeEnum.USER_DEMAND_SERVICE_TYPE.getCode());
         if(!serviceTypeRes.success()||MapUtils.isEmpty(serviceTypeRes.getData())){
             throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(),"查询服务方类型异常，请检查是否已经配置字典信息");
         }
-        List<LegendDTO> legend=new ArrayList<>();
         serviceTypeRes.getData().forEach((code,name)->{
             LegendDTO legendDTO=new LegendDTO(code,name);
             legend.add(legendDTO);
         });
         LegendDTO unfinishLegend = new LegendDTO("unfinished", "未完成");
-        legend.add(unfinishLegend);
+        legend.add(unfinishLegend);*/
-
+        List<LegendDTO> legend=new ArrayList<>();
-        log.info("阶段性胜利1："+ JSON.toJSONString(legend));
+        DemandAnalysisLegendEnum[] values = DemandAnalysisLegendEnum.values();
+        for (DemandAnalysisLegendEnum value : values) {
+            LegendDTO legendDTO=new LegendDTO();
+            legendDTO.setLegendCode(value.getCode());
+            legendDTO.setLegendName(value.getName());
+            legend.add(legendDTO);
+        }
+        // log.info("阶段性胜利1："+ JSON.toJSONString(legend));
         // 3、传进来的是组织id的话，查询出全路径
         if("agency".equals(formDTO.getOrgType())){
             //找到当前组织的所有上级，再拼接上自己