diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/ResiPortrayalResult.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/ResiPortrayalResult.java new file mode 100644 index 0000000000..f545e23bae --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/ResiPortrayalResult.java @@ -0,0 +1,17 @@ +package com.epmet.dto.result.resi; + +import lombok.Data; + +import java.util.List; + +/** + * @Description + * @Author yzm + * @Date 2023/4/19 17:26 + */ +@Data +public class ResiPortrayalResult { + private Integer total; + private List list; +} + diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index 68aef04cda..7e6c3d9273 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -1536,8 +1536,8 @@ public class IcResiUserController implements ResultDataResolver { * @return */ @PostMapping("age-distribute") - public Result> queryAgeDistribute(@LoginUser TokenDto tokenDto,@RequestBody ResiPortrayalCommonFormDTO formDTO) { - return new Result>().ok(icResiUserService.queryAgeDistribute(tokenDto.getCustomerId(),tokenDto.getUserId(),formDTO.getOrgId(), formDTO.getOrgType())); + public Result queryAgeDistribute(@LoginUser TokenDto tokenDto,@RequestBody ResiPortrayalCommonFormDTO formDTO) { + return new Result().ok(icResiUserService.queryAgeDistribute(tokenDto.getCustomerId(),tokenDto.getUserId(),formDTO.getOrgId(), formDTO.getOrgType())); } /** @@ -1549,8 +1549,8 @@ public class IcResiUserController implements ResultDataResolver { * @return */ @PostMapping("education-distribute") - public Result> queryEducationDistribute(@LoginUser TokenDto tokenDto,@RequestBody ResiPortrayalCommonFormDTO formDTO) { - return new Result>().ok(icResiUserService.queryEducationDistribute(tokenDto.getCustomerId(),tokenDto.getUserId(),formDTO.getOrgId(), formDTO.getOrgType())); + public Result queryEducationDistribute(@LoginUser TokenDto tokenDto,@RequestBody ResiPortrayalCommonFormDTO formDTO) { + return new Result().ok(icResiUserService.queryEducationDistribute(tokenDto.getCustomerId(),tokenDto.getUserId(),formDTO.getOrgId(), formDTO.getOrgType())); } /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java index ae394a3e98..7ca354f940 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java @@ -29,7 +29,7 @@ import com.epmet.dto.result.*; import com.epmet.dto.result.demand.OptionDTO; import com.epmet.dto.result.resi.IcResiNonDynamicResultDTO; import com.epmet.dto.result.resi.ResiPortrayalDetailDTO; -import com.epmet.dto.result.resi.ResiPortrayalResultDTO; +import com.epmet.dto.result.resi.ResiPortrayalResult; import com.epmet.entity.IcResiUserEntity; import com.epmet.excel.support.ExportResiUserItemDTO; import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO; @@ -562,7 +562,7 @@ public interface IcResiUserService extends BaseService { * @param orgType * @return */ - List queryAgeDistribute(String customerId, String staffId, String orgId, String orgType); + ResiPortrayalResult queryAgeDistribute(String customerId, String staffId, String orgId, String orgType); /** * 烟台需求:https://modao.cc/app/DUshpXWirii6amoDQsb8OP#screen=slfbvoz5w4z9f98 @@ -573,7 +573,7 @@ public interface IcResiUserService extends BaseService { * @param orgType agency/grid * @return */ - List queryEducationDistribute(String customerId, String staffId, String orgId, String orgType); + ResiPortrayalResult queryEducationDistribute(String customerId, String staffId, String orgId, String orgType); /** * 烟台需求:https://modao.cc/app/DUshpXWirii6amoDQsb8OP#screen=slfbvoz5w4z9f98 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 7088071b64..ac9e7e4f8d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -63,6 +63,7 @@ import com.epmet.dto.result.demand.IcResiDemandDictDTO; import com.epmet.dto.result.demand.OptionDTO; import com.epmet.dto.result.resi.IcResiNonDynamicResultDTO; import com.epmet.dto.result.resi.ResiPortrayalDetailDTO; +import com.epmet.dto.result.resi.ResiPortrayalResult; import com.epmet.dto.result.resi.ResiPortrayalResultDTO; import com.epmet.entity.*; import com.epmet.enums.RenHuConditionEnum; @@ -3914,7 +3915,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl queryAgeDistribute(String customerId,String staffId,String orgId, String orgType) { + public ResiPortrayalResult queryAgeDistribute(String customerId, String staffId, String orgId, String orgType) { + ResiPortrayalResult result=new ResiPortrayalResult(); if (StringUtils.isBlank(orgId)) { orgId = CustomerStaffRedis.getStaffInfo(customerId, staffId).getAgencyId(); orgType = OrgTypeEnum.AGENCY.getCode(); @@ -3926,15 +3928,21 @@ public class IcResiUserServiceImpl extends BaseServiceImpl resultList=getDefaultAgeDistribute(); List list=baseDao.selectAgeAgeDistribute(customerId,orgId,orgType,orgIdPath); if(CollectionUtils.isEmpty(list)){ - return resultList; + result.setTotal(NumConstant.ZERO); + result.setList(resultList); + return result; } Map resultMap = list.stream().collect(Collectors.toMap(ResiPortrayalResultDTO::getCode,ResiPortrayalResultDTO::getTotalResi)); - resultList.forEach(result->{ - if (MapUtils.isNotEmpty(resultMap) && resultMap.containsKey(result.getCode())) { - result.setTotalResi(resultMap.get(result.getCode())); + int total=NumConstant.ZERO; + for(ResiPortrayalResultDTO resultDto:resultList){ + if (MapUtils.isNotEmpty(resultMap) && resultMap.containsKey(resultDto.getCode())) { + resultDto.setTotalResi(resultMap.get(resultDto.getCode())); } - }); - return resultList; + total+=resultDto.getTotalResi(); + } + result.setTotal(total); + result.setList(resultList); + return result; } private List getDefaultAgeDistribute() { @@ -3978,7 +3986,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl queryEducationDistribute(String customerId, String staffId, String orgId, String orgType) { + public ResiPortrayalResult queryEducationDistribute(String customerId, String staffId, String orgId, String orgType) { + ResiPortrayalResult result=new ResiPortrayalResult(); if (StringUtils.isBlank(orgId)) { orgId = CustomerStaffRedis.getStaffInfo(customerId, staffId).getAgencyId(); orgType = OrgTypeEnum.AGENCY.getCode(); @@ -3998,17 +4007,21 @@ public class IcResiUserServiceImpl extends BaseServiceImpl totalList = baseDao.queryEducationDistribute(customerId, orgId, orgType,orgIdPath); Map map = totalList.stream().collect(Collectors.toMap(ResiPortrayalResultDTO::getCode,ResiPortrayalResultDTO::getTotalResi)); List resultDTOList = new ArrayList<>(); - dictResult.getData().forEach(dict -> { + int total=NumConstant.ZERO; + for (DictListResultDTO dict : dictResult.getData()) { ResiPortrayalResultDTO resultDTO = new ResiPortrayalResultDTO(); resultDTO.setCode(dict.getValue()); resultDTO.setCodeName(dict.getLabel()); resultDTO.setTotalResi(NumConstant.ZERO); - if(MapUtils.isNotEmpty(map)&&map.containsKey(dict.getValue())){ + if (MapUtils.isNotEmpty(map) && map.containsKey(dict.getValue())) { resultDTO.setTotalResi(map.get(dict.getValue())); } resultDTOList.add(resultDTO); - }); - return resultDTOList; + total += resultDTO.getTotalResi(); + } + result.setTotal(total); + result.setList(resultDTOList); + return result; }