diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/PointTodoInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/PointTodoInfoDAO.java index bd399527a..2755f131c 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/PointTodoInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/PointTodoInfoDAO.java @@ -1,8 +1,12 @@ package com.cool.store.dao; +import com.cool.store.entity.PointInfoDO; import com.cool.store.entity.PointTodoInfoDO; import com.cool.store.enums.NodeNoEnum; import com.cool.store.mapper.PointTodoInfoMapper; +import com.cool.store.request.PointTodoPageRequest; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Repository; @@ -42,4 +46,9 @@ public class PointTodoInfoDAO { } return pointTodoInfoMapper.getPointToDoByUserIdAndPointId(userId, pointId); } + + public Page getUserTodoList(PointTodoPageRequest request) { + PageHelper.startPage(request.getPageNum(), request.getPageSize()); + return pointTodoInfoMapper.getUserTodoList(request); + } } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/PointTodoInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/PointTodoInfoMapper.java index 7ebaca2e6..c6543289a 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/PointTodoInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/PointTodoInfoMapper.java @@ -1,6 +1,9 @@ package com.cool.store.mapper; +import com.cool.store.entity.PointInfoDO; import com.cool.store.entity.PointTodoInfoDO; +import com.cool.store.request.PointTodoPageRequest; +import com.github.pagehelper.Page; import org.apache.ibatis.annotations.Param; import tk.mybatis.mapper.common.Mapper; @@ -46,4 +49,11 @@ public interface PointTodoInfoMapper extends Mapper { * @return */ PointTodoInfoDO getPointToDoByUserIdAndPointId(String userId, Long pointId); + + /** + * 获取待办 + * @param request + * @return + */ + Page getUserTodoList(@Param("request") PointTodoPageRequest request); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/PointInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/PointInfoMapper.xml index 7a512d2ce..016a08304 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/PointInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/PointInfoMapper.xml @@ -26,7 +26,7 @@ - id, point_code, point_name, region_id, shop_id, line_id, point_area, longitude, latitude, address, development_manager, operate_user_id, development_time, point_status, point_score, select_status, submit_audit_count, is_line_upload + id, point_code, point_name, region_id, shop_id, line_id, point_area, longitude, latitude, address, development_manager, operate_user_id, development_time, point_status, point_score, select_status, submit_audit_count, is_line_upload, deleted, create_time, update_time diff --git a/coolstore-partner-dao/src/main/resources/mapper/PointTodoInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/PointTodoInfoMapper.xml index ce7a45627..6ab3ccf57 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/PointTodoInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/PointTodoInfoMapper.xml @@ -68,4 +68,31 @@ update xfsg_point_todo_info set status = if(handler_user_id = #{handlerUserId}, 1, 2), update_time = now() where point_id = #{pointId} and node_no = #{nodeNo} and cycle_count = #{cycleCount} and deleted = 0 + + \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/PointPageRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/PointPageRequest.java index ba78a3aef..003619416 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/PointPageRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/PointPageRequest.java @@ -1,12 +1,15 @@ package com.cool.store.request; import com.cool.store.common.PageBasicInfo; +import com.cool.store.enums.point.PointStatusEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.Max; import javax.validation.constraints.Min; import javax.validation.constraints.NotNull; +import java.util.ArrayList; +import java.util.List; /** * @author zhangchenbiao @@ -32,7 +35,6 @@ public class PointPageRequest extends PageBasicInfo { @ApiModelProperty(value = "拓展专员", hidden = true) private String developmentManager; - @NotNull @Min(1)@Max(2) @ApiModelProperty("必传参数:1已入库 2暂未入库") private Integer storageStatus; @@ -40,4 +42,18 @@ public class PointPageRequest extends PageBasicInfo { @ApiModelProperty("1.采集中、2.已评估、3.待审核、5.已审核、6.已签约、7.已失效") private Integer pointStatus; + @ApiModelProperty(value = "铺位状态列表", hidden = true) + private List pointStatusList; + + public List getPointStatusList() { + List pointStatusList = new ArrayList<>(); + if (pointStatus != null) { + pointStatusList.add(pointStatus); + } + if(PointStatusEnum.POINT_STATUS_3.getCode().equals(pointStatus)){ + pointStatusList.add(PointStatusEnum.POINT_STATUS_4.getCode()); + } + return pointStatusList; + } + } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/PointTodoPageRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/PointTodoPageRequest.java new file mode 100644 index 000000000..9ddb04897 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/PointTodoPageRequest.java @@ -0,0 +1,19 @@ +package com.cool.store.request; + +import com.cool.store.common.PageBasicInfo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author zhangchenbiao + * @FileName: TodoPageRequest + * @Description: + * @date 2024-04-11 14:30 + */ +@Data +public class PointTodoPageRequest extends PageBasicInfo { + + @ApiModelProperty(value = "扩展经理", hidden = true) + private String developmentManager; + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/RecommendPointPageRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/RecommendPointPageRequest.java index 1da65fd2f..434437153 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/RecommendPointPageRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/RecommendPointPageRequest.java @@ -1,9 +1,13 @@ package com.cool.store.request; import com.cool.store.common.PageBasicInfo; +import com.cool.store.enums.point.PointStatusEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; +import java.util.List; + /** * @author zhangchenbiao * @FileName: RecommendPointPageRequest @@ -19,4 +23,18 @@ public class RecommendPointPageRequest extends PageBasicInfo { @ApiModelProperty(value = "拓展专员", hidden = true) private String developmentManager; + @ApiModelProperty(value = "铺位状态列表", hidden = true) + private List pointStatusList; + + public List getPointStatusList() { + List pointStatusList = new ArrayList<>(); + if (pointStatus != null) { + pointStatusList.add(pointStatus); + } + if(PointStatusEnum.POINT_STATUS_3.getCode().equals(pointStatus)){ + pointStatusList.add(PointStatusEnum.POINT_STATUS_4.getCode()); + } + return pointStatusList; + } + } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointDetailVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointDetailVO.java index e493c0cd6..4d0eab9f0 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointDetailVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointDetailVO.java @@ -2,6 +2,7 @@ package com.cool.store.vo.point; import com.cool.store.entity.PointDetailInfoDO; import com.cool.store.entity.PointInfoDO; +import com.cool.store.enums.point.PointStatusEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -31,7 +32,7 @@ public class PointDetailVO { @ApiModelProperty("详细地址") private String address; - @ApiModelProperty("铺位状态 1.采集中、2.已评估、3.待审核、4.待审核可推荐、5.已审核、6.已签约、7.已失效") + @ApiModelProperty("铺位状态 1.采集中、2.已评估、3.待审核、5.已审核、6.已签约、7.已失效") private Integer pointStatus; @ApiModelProperty("铺位得分") @@ -236,6 +237,9 @@ public class PointDetailVO { result.setLatitude(pointInfo.getLatitude()); result.setAddress(pointInfo.getAddress()); result.setPointStatus(pointInfo.getPointStatus()); + if(PointStatusEnum.POINT_STATUS_4.getCode().equals(pointInfo.getPointStatus())){ + result.setPointStatus(PointStatusEnum.POINT_STATUS_3.getCode()); + } result.setPointScore(pointInfo.getPointScore()); result.setBussinessStatus(pointDetailInfo.getBussinessStatus()); result.setNineFlowRate(pointDetailInfo.getNineFlowRate()); diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointPageVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointPageVO.java index 2ad4dafe6..2b8e9a0cf 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointPageVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointPageVO.java @@ -1,7 +1,7 @@ package com.cool.store.vo.point; -import com.cool.store.entity.PointDetailInfoDO; import com.cool.store.entity.PointInfoDO; +import com.cool.store.enums.point.PointStatusEnum; import com.google.common.collect.Lists; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -30,7 +30,7 @@ public class PointPageVO { @ApiModelProperty("所属站区") private String regionNodeName; - @ApiModelProperty("铺位状态 1.采集中、2.已评估、3.待审核、4.待审核可推荐、5.已审核、6.已签约、7.已失效") + @ApiModelProperty("铺位状态 1.采集中、2.已评估、3.待审核、5.已审核、6.已签约、7.已失效") private Integer pointStatus; @ApiModelProperty("铺位得分") @@ -48,6 +48,15 @@ public class PointPageVO { @ApiModelProperty("选择状态0.未选择, 1.已被选择") private Integer selectStatus; + @ApiModelProperty("铺位地址") + private String address; + + @ApiModelProperty("创建时间") + private Date createTime; + + @ApiModelProperty("更新时间") + private Date updateTime; + public static List convertVO(List pointList, Map usernameMap, Map regionNameMap) { @@ -63,11 +72,17 @@ public class PointPageVO { pointPageVO.setRegionId(pointInfo.getRegionId()); pointPageVO.setRegionNodeName(regionNameMap.get(pointInfo.getRegionId())); pointPageVO.setPointStatus(pointInfo.getPointStatus()); + if(PointStatusEnum.POINT_STATUS_4.getCode().equals(pointInfo.getPointStatus())){ + pointPageVO.setPointStatus(PointStatusEnum.POINT_STATUS_3.getCode()); + } pointPageVO.setPointScore(pointInfo.getPointScore()); pointPageVO.setPointArea(pointInfo.getPointArea()); pointPageVO.setDevelopmentManagerUsername(usernameMap.get(pointInfo.getDevelopmentManager())); pointPageVO.setDevelopmentTime(pointInfo.getDevelopmentTime()); pointPageVO.setSelectStatus(pointInfo.getSelectStatus()); + pointPageVO.setAddress(pointInfo.getAddress()); + pointPageVO.setCreateTime(pointInfo.getCreateTime()); + pointPageVO.setUpdateTime(pointInfo.getUpdateTime()); resultList.add(pointPageVO); } return resultList; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointRecommendPageVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointRecommendPageVO.java index 1658accef..779a5f706 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointRecommendPageVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointRecommendPageVO.java @@ -2,6 +2,7 @@ package com.cool.store.vo.point; import com.cool.store.entity.PointInfoDO; import com.cool.store.entity.PointRecommendDO; +import com.cool.store.enums.point.PointStatusEnum; import com.google.common.collect.Lists; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -35,7 +36,7 @@ public class PointRecommendPageVO { @ApiModelProperty("所属站区") private String regionNodeName; - @ApiModelProperty("铺位状态 1.采集中、2.已评估、3.待审核、4.待审核可推荐、5.已审核、6.已签约、7.已失效") + @ApiModelProperty("铺位状态 1.采集中、2.已评估、3.待审核、5.已审核、6.已签约、7.已失效") private Integer pointStatus; @ApiModelProperty("铺位得分") @@ -71,6 +72,9 @@ public class PointRecommendPageVO { recommend.setRegionId(pointInfo.getRegionId()); recommend.setRegionNodeName(regionNameMap.get(pointInfo.getRegionId())); recommend.setPointStatus(pointInfo.getPointStatus()); + if(PointStatusEnum.POINT_STATUS_4.getCode().equals(pointInfo.getPointStatus())){ + recommend.setPointStatus(PointStatusEnum.POINT_STATUS_3.getCode()); + } recommend.setPointScore(pointInfo.getPointScore()); recommend.setPointArea(pointInfo.getPointArea()); recommend.setDevelopmentManagerUsername(usernameMap.get(pointInfo.getDevelopmentManager())); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/PointService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/PointService.java index 7d0cfc90c..52fc90f6a 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/PointService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/PointService.java @@ -185,4 +185,12 @@ public interface PointService { * @return */ Integer updateWantShopNum(UpdateWantShopNumRequest request); + + /** + * 获取待办列表 + * @param request + * @return + */ + PageInfo getTodoList(PointTodoPageRequest request); + } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/RegionService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/RegionService.java index 8908b7aa0..5999ec489 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/RegionService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/RegionService.java @@ -4,6 +4,7 @@ import com.cool.store.entity.RegionDO; import com.cool.store.vo.RegionPathNameVO; import java.util.List; +import java.util.Map; public interface RegionService { @@ -16,6 +17,13 @@ public interface RegionService { */ String getBelongWarRegionName(Long regionId); + /** + * 获取所属战区 + * @param regionIds + * @return + */ + Map getBelongWarRegionNameMap(List regionIds); + /** * 根据意向区域找大区id * @param wantShopAreaId diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java index 807d2cf7d..246e38a69 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java @@ -122,7 +122,7 @@ public class PointServiceImpl implements PointService { if(Objects.isNull(pointInfo) || Objects.isNull(pointDetailInfo)){ throw new ServiceException(ErrorCodeEnum.POINT_NOT_EXIST); } - if(!pointDetailInfo.isCanSubmitEvaluable()){ + if(!pointDetailInfo.isCanSubmitEvaluable() || StringUtils.isBlank(pointInfo.getPointArea())){ throw new ServiceException(ErrorCodeEnum.POINT_NOT_COMPLETE); } Integer totalPointScore = pointDetailInfo.getTotalPointScore(); @@ -216,7 +216,7 @@ public class PointServiceImpl implements PointService { if(Objects.isNull(auditSetting)){ throw new ServiceException(ErrorCodeEnum.POINT_AUDIT_NOT_SETTING); } - List auditNode = dealAuditNode(auditSetting, pointInfo); + List auditNode = dealAuditNode(auditSetting, pointInfo.getRegionId(), request.getOperateUserId(), pointInfo.getDevelopmentManager()); //获取审批节点上的数据 List recordList = AuditNodeDTO.convertDO(pointId, submitAuditCount, auditNode); pointAuditRecordDAO.addPointAuditRecord(recordList); @@ -399,16 +399,13 @@ public class PointServiceImpl implements PointService { @Override public PageInfo getMyPointPage(PointPageRequest request) { - if(Objects.nonNull(request.getPointStatus()) && PointStatusEnum.POINT_STATUS_3.getCode().equals(request.getPointStatus())){ - request.setPointStatus(CommonConstants.ONE == request.getStorageStatus() ? PointStatusEnum.POINT_STATUS_4.getCode() : PointStatusEnum.POINT_STATUS_3.getCode()); - } List resultList = new ArrayList(); Page pointPage = pointInfoDAO.getMyPointPage(request); if(Objects.nonNull(pointPage) && CollectionUtils.isNotEmpty(pointPage.getResult())){ List regionIds = pointPage.stream().map(PointInfoDO::getRegionId).distinct().collect(Collectors.toList()); List developmentManagers = pointPage.stream().map(PointInfoDO::getDevelopmentManager).distinct().collect(Collectors.toList()); Map userNameMap = enterpriseUserDAO.getUserNameMap(developmentManagers); - Map regionNameMap = new HashMap<>(); + Map regionNameMap = regionService.getBelongWarRegionNameMap(regionIds); resultList = PointPageVO.convertVO(pointPage.getResult(), userNameMap, regionNameMap); } PageInfo resultPage = new PageInfo(pointPage); @@ -441,16 +438,13 @@ public class PointServiceImpl implements PointService { @Override public PageInfo getRecommendPointList(RecommendPointPageRequest request) { - if(Objects.nonNull(request.getPointStatus()) && PointStatusEnum.POINT_STATUS_3.getCode().equals(request.getPointStatus())){ - request.setPointStatus(PointStatusEnum.POINT_STATUS_4.getCode()); - } List resultList = new ArrayList(); Page pointPage = pointInfoDAO.getRecommendPointList(request); if(Objects.nonNull(pointPage) && CollectionUtils.isNotEmpty(pointPage.getResult())){ List regionIds = pointPage.stream().map(PointInfoDO::getRegionId).distinct().collect(Collectors.toList()); List developmentManagers = pointPage.stream().map(PointInfoDO::getDevelopmentManager).distinct().collect(Collectors.toList()); Map userNameMap = enterpriseUserDAO.getUserNameMap(developmentManagers); - Map regionNameMap = new HashMap<>(); + Map regionNameMap = regionService.getBelongWarRegionNameMap(regionIds); resultList = PointPageVO.convertVO(pointPage.getResult(), userNameMap, regionNameMap); } PageInfo resultPage = new PageInfo(pointPage); @@ -500,7 +494,23 @@ public class PointServiceImpl implements PointService { return lineInfoDAO.updateLineInfo(updateLine); } - public List dealAuditNode(AuditSettingVO auditSetting, PointInfoDO pointInfo) { + @Override + public PageInfo getTodoList(PointTodoPageRequest request) { + Page pointPage = pointTodoInfoDAO.getUserTodoList(request); + List resultList = new ArrayList<>(); + if(Objects.nonNull(pointPage) && CollectionUtils.isNotEmpty(pointPage.getResult())){ + List regionIds = pointPage.stream().map(PointInfoDO::getRegionId).distinct().collect(Collectors.toList()); + List developmentManagers = pointPage.stream().map(PointInfoDO::getDevelopmentManager).distinct().collect(Collectors.toList()); + Map userNameMap = enterpriseUserDAO.getUserNameMap(developmentManagers); + Map regionNameMap = regionService.getBelongWarRegionNameMap(regionIds); + resultList = PointPageVO.convertVO(pointPage.getResult(), userNameMap, regionNameMap); + } + PageInfo resultPage = new PageInfo(pointPage); + resultPage.setList(resultList); + return resultPage; + } + + public List dealAuditNode(AuditSettingVO auditSetting, Long regionId, String operateUserId, String developmentManager) { List roleIds = new ArrayList<>(); //审核人 Pair, List> firstApproval = getUserIdsAndPositionIds(auditSetting.getFirstApproval()); @@ -520,17 +530,17 @@ public class PointServiceImpl implements PointService { roleIds.addAll(fifthApproval.getValue()); } List resultList = new ArrayList<>(); - Map> userIdsMap = userAuthMappingService.getUserIdByRoleIdAndRegionId(roleIds, pointInfo.getRegionId()); + Map> userIdsMap = userAuthMappingService.getUserIdByRoleIdAndRegionId(roleIds, regionId); List firstApprovalUserIds = getUserIdsByPositionIds(firstApproval, userIdsMap); List thirdApprovalUserIds = getUserIdsByPositionIds(thirdApproval, userIdsMap); List fourthApprovalUserIds = getUserIdsByPositionIds(fourthApproval, userIdsMap); List fifthApprovalUserIds = getUserIdsByPositionIds(fifthApproval, userIdsMap); - resultList.add(new AuditNodeDTO(NodeNoEnum.NODE_NO_0.getCode(), PointAuditRecordDO.SUBMIT_TASK, Boolean.FALSE, Arrays.asList(pointInfo.getDevelopmentManager()))); + resultList.add(new AuditNodeDTO(NodeNoEnum.NODE_NO_0.getCode(), PointAuditRecordDO.SUBMIT_TASK, Boolean.FALSE, Arrays.asList(developmentManager))); if(CollectionUtils.isNotEmpty(firstApprovalUserIds)){ resultList.add(new AuditNodeDTO(NodeNoEnum.NODE_NO_1.getCode(), PointAuditRecordDO.RECEIVE_TASK, Boolean.TRUE, firstApprovalUserIds)); - resultList.add(new AuditNodeDTO(NodeNoEnum.NODE_NO_2.getCode(), Arrays.asList(pointInfo.getOperateUserId()))); + resultList.add(new AuditNodeDTO(NodeNoEnum.NODE_NO_2.getCode(), Arrays.asList(operateUserId))); }else{ - resultList.add(new AuditNodeDTO(NodeNoEnum.NODE_NO_2.getCode(), PointAuditRecordDO.RECEIVE_TASK, Boolean.TRUE, Arrays.asList(pointInfo.getOperateUserId()))); + resultList.add(new AuditNodeDTO(NodeNoEnum.NODE_NO_2.getCode(), PointAuditRecordDO.RECEIVE_TASK, Boolean.TRUE, Arrays.asList(operateUserId))); } if(CollectionUtils.isNotEmpty(thirdApprovalUserIds)){ diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/RegionServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/RegionServiceImpl.java index 3a442d2f5..27945b33f 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/RegionServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/RegionServiceImpl.java @@ -15,6 +15,7 @@ import com.cool.store.utils.RedisConstantUtil; import com.cool.store.utils.RedisUtilPool; import com.cool.store.utils.poi.constant.Constants; import com.cool.store.vo.RegionPathNameVO; +import com.google.common.collect.Maps; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -100,6 +101,18 @@ public class RegionServiceImpl implements RegionService { return ""; } + @Override + public Map getBelongWarRegionNameMap(List regionIds) { + if(CollectionUtils.isEmpty(regionIds)){ + return Maps.newHashMap(); + } + Map regionNameMap = Maps.newHashMap(); + for (Long regionId : regionIds) { + regionNameMap.put(regionId, getBelongWarRegionName(regionId)); + } + return regionNameMap; + } + /** * 根据意向区域找大区id * @param wantShopAreaId diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PointController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PointController.java index b31f67288..d5ac8a4d4 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PointController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PointController.java @@ -51,7 +51,7 @@ public class PointController { } @ApiOperation("生成评估报告") - @GetMapping("/generateEvaluationReport") + @PostMapping("/generateEvaluationReport") public ResponseResult generateEvaluationReport(@RequestBody PointIdRequest request) { return ResponseResult.success(pointService.generateEvaluationReport(request.getPointId())); } @@ -68,13 +68,13 @@ public class PointController { return ResponseResult.success(pointService.pointUnbind(request.getPointId())); } - @ApiOperation("配置评估报告") + @ApiOperation("配置高德评估报告") @PostMapping("/addMapEvaluationReport") public ResponseResult addMapEvaluationReport(@RequestBody AddMapEvaluationReportRequest request) { return ResponseResult.success(pointService.addMapEvaluationReport(request)); } - @ApiOperation("提交审批") + @ApiOperation("选址人员提交审批") @PostMapping("/submitAudit") public ResponseResult submitAudit(@RequestBody @Validated SubmitPointAuditRequest request) { return ResponseResult.success(pointService.submitAudit(request)); @@ -187,5 +187,11 @@ public class PointController { return ResponseResult.success(ShopStageVO.getShopStageList()); } + @ApiOperation("获取待办列表") + @PostMapping("/getTodoList") + public ResponseResult> getTodoList(@RequestBody PointTodoPageRequest request) { + request.setDevelopmentManager(CurrentUserHolder.getUserId()); + return ResponseResult.success(pointService.getTodoList(request)); + } }