diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/OpeningOperationPlanListVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/OpeningOperationPlanListVO.java index 60d2eb4b9..e321410c6 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/OpeningOperationPlanListVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/OpeningOperationPlanListVO.java @@ -47,4 +47,7 @@ public class OpeningOperationPlanListVO { @ApiModelProperty("审核结果,0待审核,1通过,2拒绝") private Integer resultType; + + @ApiModelProperty("阶段状态") + private Integer subStageStatus; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java index 943c58d3f..6a179b932 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java @@ -136,13 +136,14 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService { log.error("查询运营方案列表没有数据"); return new PageInfo<>(); } - List lines = openPlanShopInfoDTOS.stream().map(OpenPlanShopInfoDTO::getLineId).collect(Collectors.toList()); + List lines = openPlanShopInfoDTOS.stream().filter(o -> o.getLineId() != null).map(OpenPlanShopInfoDTO::getLineId).collect(Collectors.toList()); List lineInfos = lineInfoDAO.getLines(lines); + List shopIds = openPlanShopInfoDTOS.stream().filter(o -> o.getShopId() != null).map(OpenPlanShopInfoDTO::getShopId).collect(Collectors.toList()); Map lineInfoMap = lineInfos.stream().collect(Collectors.toMap(PlanLineDTO::getLineId, dto -> dto)); for (OpenPlanShopInfoDTO openPlanShopInfoDTO : openPlanShopInfoDTOS) { - openPlanShopInfoDTO.setPartnerName(lineInfoMap.getOrDefault(openPlanShopInfoDTO.getLineId(),new PlanLineDTO()).getUsername()); - openPlanShopInfoDTO.setMobile(lineInfoMap.getOrDefault(openPlanShopInfoDTO.getLineId(),new PlanLineDTO()).getMobile()); - openPlanShopInfoDTO.setInvestmentManagerId(lineInfoMap.getOrDefault(openPlanShopInfoDTO.getLineId(),new PlanLineDTO()).getInvestmentManagerId()); + openPlanShopInfoDTO.setPartnerName(lineInfoMap.getOrDefault(openPlanShopInfoDTO.getLineId(), new PlanLineDTO()).getUsername()); + openPlanShopInfoDTO.setMobile(lineInfoMap.getOrDefault(openPlanShopInfoDTO.getLineId(), new PlanLineDTO()).getMobile()); + openPlanShopInfoDTO.setInvestmentManagerId(lineInfoMap.getOrDefault(openPlanShopInfoDTO.getLineId(), new PlanLineDTO()).getInvestmentManagerId()); } PageInfo pageInfo = new PageInfo<>(openPlanShopInfoDTOS); //开店负责人id,督导id,招商经理id // @@ -165,6 +166,9 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService { List regionIds = openPlanShopInfoDTOS.stream() .filter(dto -> dto.getRegionId() != null).map(OpenPlanShopInfoDTO::getRegionId).collect(Collectors.toList()); Map regionNameMap = regionService.getBelongWarRegionNameMap(regionIds); + //阶段状态 + List subStageList = shopStageInfoDAO.getSubStageList(shopIds, ShopSubStageEnum.SHOP_STAGE_14.getShopSubStage()); + Map subStageMap = subStageList.stream().collect(Collectors.toMap(ShopStageInfoDO::getShopId, dto -> dto)); List openingOperationPlanListVOList = new ArrayList<>(); openPlanShopInfoDTOS.forEach(x -> { OpeningOperationPlanListVO openingOperationPlanListVO = new OpeningOperationPlanListVO(); @@ -182,6 +186,7 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService { vonameMap.get(x.getSupervisorUserId())); openingOperationPlanListVO.setSubmissionTime(x.getSubmissionTime()); openingOperationPlanListVO.setResultType(x.getResultType()); + openingOperationPlanListVO.setSubStageStatus(subStageMap.getOrDefault(x.getShopId(),new ShopStageInfoDO()).getShopSubStageStatus()); openingOperationPlanListVOList.add(openingOperationPlanListVO); }); pageInfo.setList(openingOperationPlanListVOList);