suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

开业筹备阶段5.0

Browse Source
This commit is contained in:
shuo.wang
2024-04-28 11:04:45 +08:00
parent e19b50ea64
commit 20c788b218
13 changed files with 129 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java
View File

@@ -8,6 +8,7 @@ import com.cool.store.entity.ShopInfoDO;
import com.cool.store.enums.ErrorCodeEnum;
import com.cool.store.exception.ServiceException;
import com.cool.store.mapper.ShopInfoMapper;
import com.cool.store.request.PlanListRequest;
import com.cool.store.request.PreparationRequest;
import com.cool.store.vo.shop.StageShopCountVO;
import com.github.pagehelper.Page;
@@ -142,9 +143,9 @@ public class ShopInfoDAO {
* @Date: 2024/4/24
* @description: 开业运营方案，根据shopname获取列表
*/
public List<OpenPlanShopInfoDTO>getOpenPlanShopListByShopName( List<Long> shopIdlist,String shopName, String regionId ){
public List<OpenPlanShopInfoDTO>getOpenPlanShopListByShopName( PlanListRequest request ){
return shopInfoMapper.getOpenPlanShopListByShopName(shopIdlist,shopName,regionId);
return shopInfoMapper.getOpenPlanShopListByShopName(request);
}
public Map<Long, Integer> getSelectedShopNumMap(List<Long> lineIds) {
@@ -154,14 +155,6 @@ public class ShopInfoDAO {
List<LineCountDTO> selectedShopNum = shopInfoMapper.getSelectedShopNum(lineIds);
return selectedShopNum.stream().collect(Collectors.toMap(k->k.getLineId(), v->v.getSelectedShopNum()));
}
/**
* @Auther: wangshuo
* @Date: 2024/4/25
* @description:获取筹建阶段shopid
*/
public List<Long> queryShopIdListByStage(){
return shopInfoMapper.queryShopIdListByStage();
};
/**
* @Auther: wangshuo
* @Date: 2024/4/25

4
coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java
View File

@@ -4,6 +4,7 @@ import com.cool.store.dto.Preparation.PreparationDTO;
import com.cool.store.dto.openPreparation.OpenPlanShopInfoDTO;
import com.cool.store.dto.point.LineCountDTO;
import com.cool.store.entity.ShopInfoDO;
import com.cool.store.request.PlanListRequest;
import com.cool.store.request.PreparationRequest;
import com.cool.store.vo.shop.StageShopCountVO;
import com.github.pagehelper.Page;
@@ -70,8 +71,7 @@ public interface ShopInfoMapper extends Mapper<ShopInfoDO> {
* @Date: 2024/4/24
* @description: 开业运营方案，根据shopname获取列表
*/
List<OpenPlanShopInfoDTO> getOpenPlanShopListByShopName(@Param("shopIdlist")List<Long> shopIdlist, @Param("shopName") String shopName,
@Param("regionId") String regionId);
List<OpenPlanShopInfoDTO> getOpenPlanShopListByShopName( @Param("request") PlanListRequest request);
/**
* @Auther: wangshuo
* @Date: 2024/4/25

43
coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
View File

@@ -74,25 +74,32 @@
</select>
<select id="getOpenPlanShopListByShopName" resultType="com.cool.store.dto.openPreparation.OpenPlanShopInfoDTO">
select si.id as shopId, si.line_id as lineId, si.shop_name as shopName,
si.shop_code as shopCode, si.shop_manager_user_id as shopManagerUserId,si.shop_manager_user_id as shopManagerUserId,
xsbs.big_name as bigName, xsbs.fight_name as fightName
from xfsg_shop_info si
join xfsg_line_info li on si.line_id = li.id
join xfsg_system_building_shop xsbs on si.id = xsbs.big_name
where 1=1
<if test="shopIdlist != null and shopIdlist.size>0">
and si.id in
<foreach collection="shopIdlist" item="shopId" separator="," open="(" close=")">
#{shopId}
select si.id as shopId, si.region_id AS regionId,si.line_id as lineId, si.shop_name as shopName,
si.shop_code as shopCode, si.shop_manager_user_id as shopManagerUserId,li.investment_manager AS investmentManagerId,
li.username as partnerName, li.mobile as mobile ,
op.submission_time AS submissionTime , op.result_type AS resultType
from xfsg_shop_info si
join xfsg_line_info li on si.line_id = li.id
join xfsg_opening_operation_plan op on si.id = op.shop_id
where 1=1
<if test="request.shopName != null and request.shopName != '' ">
AND si.shop_name like concat('%', #{request.shopName}, '%')
</if>
<if test="request.resultType != null and request.resultType != ''">
AND op.result_type = #{request.resultType}
</if>
<if test="request.planStartDate != null and request.planStartDate != ''">
and op.create_time >= #{request.planStartDate}
</if>
<if test="request.planEndDate != null and request.planEndDate != ''">
AND op.create_time &lt;= #{request.planEndDate}
</if>
<if test="request.regionIds != null and request.regionIds.size() > 0">
and si.region_id in
<foreach collection="request.regionIds" item="regionId" index="index" open="(" separator="," close=")">
#{regionId}
</foreach>
</if>
<if test="shopName != null and shopName != ''">
AND si.shop_name = #{shopName}
</if>
<if test="regionId != null and regionId != ''">
AND xsbs.fight_code = #{fightCode}
</if>
</if>
</select>
<select id="queryShopIdListByStage" resultType="java.lang.Long">

11
coolstore-partner-model/src/main/java/com/cool/store/dto/openPreparation/OpenPlanShopInfoDTO.java
View File

@@ -1,8 +1,11 @@
package com.cool.store.dto.openPreparation;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* @Auther: WangShuo
* @Date: 2024/04/24/上午9:53
@@ -18,6 +21,8 @@ public class OpenPlanShopInfoDTO {
@ApiModelProperty("线索id")
private Long lineId;
@ApiModelProperty("区域id")
private Long regionId;
@ApiModelProperty("门店名字")
private String shopName;
@@ -45,6 +50,12 @@ public class OpenPlanShopInfoDTO {
@ApiModelProperty("所属战区")
private String fightName;
@ApiModelProperty("方案审核状态")
private Integer resultType;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("提交申请时间")
private Date submissionTime;
}

2
coolstore-partner-model/src/main/java/com/cool/store/dto/openPreparation/UserNameDTO.java
View File

@@ -13,7 +13,7 @@ import lombok.Data;
public class UserNameDTO {
private Long userId;
private String userId;
private String name;

20
coolstore-partner-model/src/main/java/com/cool/store/request/PlanListRequest.java
View File

@@ -1,10 +1,12 @@
package com.cool.store.request;
import com.cool.store.common.PageBasicInfo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDate;
import java.util.Date;
import java.util.List;
/**
* @Auther: WangShuo
@@ -13,19 +15,19 @@ import java.util.Date;
* @注释:
*/
@Data
public class PlanListRequest {
public class PlanListRequest extends PageBasicInfo {
@ApiModelProperty("店铺名称")
private String shopName;
@ApiModelProperty("起始日期")
private Date planStartDate;
private String planStartDate;
@ApiModelProperty("结束日期")
private Date planEndDate;
@ApiModelProperty("地区id")
private String regionId;
private String planEndDate;
@ApiModelProperty("选择区域")
private List<String> regionIds;
@ApiModelProperty("审核状态")
private Integer resultType;
@ApiModelProperty("页数")
private Integer pageNum;
@ApiModelProperty("分页数据量")
private Integer pageSize;
@ApiModelProperty(value = "当前登录用户", hidden = true)
private String curUserId;
@ApiModelProperty(value = "管辖区域",hidden = true)
private List<String> authRegionIds;
}

10
coolstore-partner-model/src/main/java/com/cool/store/vo/OpeningOperationPlanListVO.java
View File

@@ -15,15 +15,9 @@ import java.util.Date;
@Data
public class OpeningOperationPlanListVO {
@ApiModelProperty("方案关联审核id")
private Long auditId;
@ApiModelProperty("门店id")
private Long shopId;
@ApiModelProperty("线索id")
private Long lineId;
@ApiModelProperty("门店名称")
private String shopName;
@@ -33,8 +27,6 @@ public class OpeningOperationPlanListVO {
@ApiModelProperty("开店负责人")
private String shopManagerName;
@ApiModelProperty("开店负责人id")
private String shopManagerUserId;
@ApiModelProperty("加盟商姓名")
private String partnerName;
@@ -51,8 +43,6 @@ public class OpeningOperationPlanListVO {
@ApiModelProperty("招商经理名字")
private String investmentManagerName;
@ApiModelProperty("督导id")
private String supervisorUserId;
@ApiModelProperty("督导")
private String supervisorName;

6
coolstore-partner-service/src/main/java/com/cool/store/service/AuditOpeningOperationPlanService.java
View File

@@ -10,12 +10,6 @@ import com.cool.store.request.OpeningOperationPlanAuditRequest;
*/
public interface AuditOpeningOperationPlanService {
/**
* @Auther: wangshuo
* @Date: 2024/4/22
* @description: 提交方案至审核表
*/
Long addNewPlanAudit(OpeningOperationPlanAuditRequest openingOperationPlanAuditRequest);
/**
* @Auther: wangshuo

3
coolstore-partner-service/src/main/java/com/cool/store/service/OpeningOperationPlanService.java
View File

@@ -5,6 +5,7 @@ import com.cool.store.request.OpeningOperationPlanRequest;
import com.cool.store.request.PlanListRequest;
import com.cool.store.vo.OpeningOperationPlanListVO;
import com.cool.store.vo.OpeningOperationPlanVO;
import com.github.pagehelper.PageInfo;
import java.time.LocalDate;
import java.util.List;
@@ -29,6 +30,6 @@ public interface OpeningOperationPlanService {
* @Date: 2024/4/23
* @description: 根据条件查询方案列表
*/
List<OpeningOperationPlanListVO> getPlanListPage(PlanListRequest request);
PageInfo<OpeningOperationPlanListVO> getPlanListPage(PlanListRequest request);
Boolean flush(Long shopId);
}

13
coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditOpeningOperationPlanImpl.java
View File

@@ -39,20 +39,7 @@ public class AuditOpeningOperationPlanImpl implements AuditOpeningOperationPlanS
@Resource
private PreparationService preparationService;
@Resource
private EnterpriseUserDAO enterpriseUserDAO;
@Resource
private ShopAuditInfoDAO shopAuditInfoDAO;
@Override
public Long addNewPlanAudit(OpeningOperationPlanAuditRequest request) {
log.info("addNewPlanAudit request:{}", JSONObject.toJSONString(request));
String userId = CurrentUserHolder.getUserId();
ShopAuditInfoDO shopAuditInfoDO = request.toShopAuditInfoDO();
EnterpriseUserDO userInfoById = enterpriseUserDAO.getUserInfoById(userId);
shopAuditInfoDO.setSubmittedUserId(userId);
shopAuditInfoDO.setSubmittedUserName(userInfoById.getName());
shopAuditInfoDO.setAuditType(AuditTypeEnum.OPENING_OPERATION_PLAN.getCode());
return shopAuditInfoDAO.addAuditInfo(shopAuditInfoDO);
}
@Override
@Transactional(rollbackFor = Exception.class)

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java
View File

@@ -39,8 +39,6 @@ import java.util.Date;
public class FirstOrderServiceImp implements FirstOrderService {
@Resource
private FirstOrderDAO firstOrderDAO;
@Value("${xfsg.url}")
private String xfsgUrl;
@Resource
private PreparationService preparationService;
@Resource

140
coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java
View File

@@ -5,6 +5,7 @@ import com.cool.store.constants.CommonConstants;
import com.cool.store.context.CurrentUserHolder;
import com.cool.store.context.LoginUserInfo;
import com.cool.store.dao.*;
import com.cool.store.dto.Preparation.PreparationDTO;
import com.cool.store.dto.openPreparation.OpenPlanShopInfoDTO;
import com.cool.store.dto.openPreparation.OpeningOperationPlanDTO;
import com.cool.store.dto.openPreparation.PlanLineDTO;
@@ -17,22 +18,19 @@ import com.cool.store.enums.ErrorCodeEnum;
import com.cool.store.enums.point.ShopSubStageEnum;
import com.cool.store.enums.point.ShopSubStageStatusEnum;
import com.cool.store.exception.ServiceException;
import com.cool.store.request.OpeningOperationPlanAuditRequest;
import com.cool.store.request.OpeningOperationPlanRequest;
import com.cool.store.request.PlanListRequest;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.*;
import com.cool.store.utils.poi.StringUtils;
import com.cool.store.vo.OpeningOperationPlanListVO;
import com.cool.store.vo.OpeningOperationPlanVO;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.lang.reflect.InvocationTargetException;
import java.util.*;
import java.util.stream.Collectors;
@@ -49,14 +47,10 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService {
@Resource
private OpeningOperationPlanDAO openingOperationPlanDAO;
@Resource
private AuditOpeningOperationPlanService auditOpeningOperationPlanService;
@Resource
private EnterpriseUserDAO enterpriseUserDAO;
@Resource
private ShopInfoDAO shopInfoDAO;
@Resource
private LineInfoDAO lineInfoDAO;
@Resource
private ShopStageInfoDAO shopStageInfoDAO;
@Resource
private ShopService shopService;
@@ -64,6 +58,12 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService {
private CoolStoreStartFlowService coolStoreStartFlowService;
@Resource
private PreparationService preparationService;
@Resource
private RegionService regionService;
@Resource
private SysRoleService sysRoleService;
@Resource
private UserAuthMappingService userAuthMappingService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -79,9 +79,6 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService {
}
String userId = userInfo.getUserId();
try {
OpeningOperationPlanAuditRequest openingOperationPlanAuditRequest = new OpeningOperationPlanAuditRequest();
openingOperationPlanAuditRequest.setShopId(request.getShopId());
Long AuditId = auditOpeningOperationPlanService.addNewPlanAudit(openingOperationPlanAuditRequest);
OpeningOperationPlanDO selectByShopId = openingOperationPlanDAO.selectByShopId(request.getShopId());
Long planId;
OpeningOperationPlanDO openingOperationPlanDO = request.toOpeningOperationPlanDO();
@@ -98,7 +95,6 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService {
openingOperationPlanDO.setSubmittedUserId(userId);
openingOperationPlanDO.setCreateTime(new Date());
openingOperationPlanDO.setCreateUserId(userId);
openingOperationPlanDO.setAuditId(AuditId);
planId = openingOperationPlanDAO.insertSelective(openingOperationPlanDO);
}
Integer Stage = shopStageInfoDAO.updateShopStageAndAuditInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_141, request.getShopId());
@@ -135,74 +131,82 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService {
}
@Override
public List<OpeningOperationPlanListVO> getPlanListPage(PlanListRequest request) {
public PageInfo<OpeningOperationPlanListVO> getPlanListPage(PlanListRequest request) {
log.info("getPlanListPage request:{}", JSONObject.toJSONString(request));
//shopId,提交时间，审核状态
Page<OpeningOperationPlanDTO> openingOperationPlanDTOS = openingOperationPlanDAO.
selectConditionPlanList(request.getPlanStartDate(), request.getPlanEndDate(),
request.getResultType(), request.getPageNum(), request.getPageSize());
log.info("getPlanListPage openingOperationPlanDTOS:{}", JSONObject.toJSONString(openingOperationPlanDTOS));
//包装VO
List<OpeningOperationPlanListVO> openingOperationPlanListVOList = openingOperationPlanDTOS.stream().map(dto -> {
OpeningOperationPlanListVO vO = new OpeningOperationPlanListVO();
vO.setShopId(dto.getShopId());
vO.setSubmissionTime(dto.getSubmissionTime());
vO.setResultType(dto.getResultType());
vO.setAuditId(dto.getAuditId());
return vO;
}).collect(Collectors.toList());
log.info("getPlanListPage openingOperationPlanVOList:{}",
JSONObject.toJSONString(openingOperationPlanListVOList));
List<Long> shopIdlist = openingOperationPlanDTOS.stream().map(OpeningOperationPlanDTO::getShopId)
.collect(Collectors.toList());
log.info("getPlanListPage shopIdlist:{}", JSONObject.toJSONString(shopIdlist));
//根据ShopName等查询门店名字1，门店代码1，开店负责人id1，督导id1,大区名称,战区名称,线索id
List<OpenPlanShopInfoDTO> openPlanShopList = shopInfoDAO.
getOpenPlanShopListByShopName(shopIdlist, request.getShopName(), request.getRegionId());
log.info("getPlanListPage openPlanShopList:{}", JSONObject.toJSONString(openPlanShopList));
Map<Long, OpenPlanShopInfoDTO> shopInfoMap = openPlanShopList.stream()
.collect(Collectors.toMap(OpenPlanShopInfoDTO::getShopId, vo -> vo));
log.info("getPlanListPage shopInfoMap:{}", JSONObject.toJSONString(shopInfoMap));
if(!sysRoleService.checkIsAdmin(request.getCurUserId())){
request.setAuthRegionIds(userAuthMappingService.getAuthRegionIdAndSubRegionIdByUserId(request.getCurUserId()));
}
if(CollectionUtils.isNotEmpty(request.getRegionIds())){
if(request.getRegionIds().contains(CommonConstants.ROOT_DEPT_ID_STR)){
request.setRegionIds(null);
}else{
request.setRegionIds(regionService.getSubRegionIdsByRegionIds(request.getRegionIds()));
}
}
PageHelper.startPage(request.getPageNum(), request.getPageSize());
//去shop_info表查询店铺名字，店铺code，开店负责人id，督导id，区域id，lineinfo 加盟商name，手机号，招商经理id,open_plan,提交时间，审核状态
List<OpenPlanShopInfoDTO> openPlanShopInfoDTOS = shopInfoDAO.getOpenPlanShopListByShopName(request);
PageInfo pageInfo = new PageInfo<>(openPlanShopInfoDTOS);
//开店负责人id，督导id,招商经理id
//开店负责人name
List<String> shopManagerUserIdList = openPlanShopList.stream()
List<String> shopManagerUserIdList = openPlanShopInfoDTOS.stream()
.map(OpenPlanShopInfoDTO::getShopManagerUserId)
.collect(Collectors.toList());
List<UserNameDTO> shopManagerList = enterpriseUserDAO.getNameByUserId(shopManagerUserIdList);
log.info("getPlanListPage hopManagerList :{}", JSONObject.toJSONString(shopManagerList));
Map<Long, UserNameDTO> voManagerMap = shopManagerList.stream()
log.info("getPlanListPage shopManagerList :{}", JSONObject.toJSONString(shopManagerList));
Map<String, UserNameDTO> voManagerMap = shopManagerList.stream()
.collect(Collectors.toMap(UserNameDTO::getUserId, vo -> vo));
log.info("getPlanListPage voManagerMap:{}", JSONObject.toJSONString(voManagerMap));
//督导name
List<String> supervisorUserIdList = openPlanShopList.stream()
List<String> supervisorUserIdList = openPlanShopInfoDTOS.stream()
.map(OpenPlanShopInfoDTO::getSupervisorUserId)
.collect(Collectors.toList());
List<UserNameDTO> supervisorList = enterpriseUserDAO.getNameByUserId(supervisorUserIdList);
log.info("getPlanListPage supervisorList :{}", JSONObject.toJSONString(supervisorList));
Map<Long, UserNameDTO> voSupervisorList = supervisorList.stream()
Map<String, UserNameDTO> voSupervisorMap = supervisorList.stream()
.collect(Collectors.toMap(UserNameDTO::getUserId, vo -> vo));
log.info("getPlanListPage openingOperationPlanVOList:{}", JSONObject.toJSONString(openingOperationPlanListVOList));
//加盟商姓名，手机号,招商name
List<Long> lines = openPlanShopList.stream()
.map(OpenPlanShopInfoDTO::getLineId)
log.info("getPlanListPage voSupervisorMap:{}", JSONObject.toJSONString(voSupervisorMap));
//招商经理name
List<String> investmentManagerIdList = openPlanShopInfoDTOS.stream()
.map(OpenPlanShopInfoDTO::getInvestmentManagerId)
.collect(Collectors.toList());
List<PlanLineDTO> getLines = lineInfoDAO.getLines(lines);
log.info("getPlanListPage getLines:{}", JSONObject.toJSONString(getLines));
Map<Long, PlanLineDTO> linemap = getLines.stream()
.collect(Collectors.toMap(PlanLineDTO::getLineId, vo -> vo));
log.info("getPlanListPage linemap:{}", JSONObject.toJSONString(linemap));
for (OpeningOperationPlanListVO vo : openingOperationPlanListVOList) {
vo.setLineId(shopInfoMap.get(vo.getShopId()).getLineId());
vo.setShopName(shopInfoMap.get(vo.getShopId()).getShopName());
vo.setShopCode(shopInfoMap.get(vo.getShopId()).getShopCode());
vo.setBigName(shopInfoMap.get(vo.getShopId()).getBigName());
vo.setFightName(shopInfoMap.get(vo.getShopId()).getFightName());
vo.setShopManagerName(voManagerMap.get(vo.getShopId()).getName());
vo.setSupervisorName(voSupervisorList.get(vo.getSupervisorUserId()).getName());
vo.setPartnerName(linemap.get(vo.getLineId()).getInvestmentManagerName());
vo.setMobile(linemap.get(vo.getLineId()).getMobile());
vo.setPartnerName(linemap.get(vo.getLineId()).getUsername());
}
return openingOperationPlanListVOList;
List<UserNameDTO> voInvestmentManagerList= enterpriseUserDAO.getNameByUserId(investmentManagerIdList);
log.info("getPlanListPage voInvestmentManagerList :{}", JSONObject.toJSONString(voInvestmentManagerList));
Map<String, UserNameDTO> voInvestmentManagerMap = voInvestmentManagerList.stream()
.collect(Collectors.toMap(UserNameDTO::getUserId, vo -> vo));
log.info("getPlanListPage voInvestmentManagerList:{}", JSONObject.toJSONString(voInvestmentManagerList));
//region
List<Long> regionIds = openPlanShopInfoDTOS.stream().map(OpenPlanShopInfoDTO::getRegionId).collect(Collectors.toList());
Map<Long, String> regionNameMap = regionService.getBelongWarRegionNameMap(regionIds);
List<OpeningOperationPlanListVO> openingOperationPlanListVOList = new ArrayList<>();
openPlanShopInfoDTOS.forEach(x->{
OpeningOperationPlanListVO openingOperationPlanListVO = new OpeningOperationPlanListVO();
openingOperationPlanListVO.setShopId(x.getShopId());
openingOperationPlanListVO.setShopName(x.getShopName());
openingOperationPlanListVO.setShopCode(x.getShopCode());
openingOperationPlanListVO.setPartnerName(x.getPartnerName());
openingOperationPlanListVO.setMobile(x.getMobile());
String[] split = regionNameMap.getOrDefault(x.getRegionId(), "").split("-");
if(split.length >0){
openingOperationPlanListVO.setBigName(split[0]);
openingOperationPlanListVO.setFightName(split[1]);
}
if (!StringUtils.isEmpty(x.getInvestmentManagerId())) {
openingOperationPlanListVO.setInvestmentManagerName
(voInvestmentManagerMap.get(x.getInvestmentManagerId()).getName());
}
if (!StringUtils.isEmpty(x.getShopManagerUserId())) {
openingOperationPlanListVO.setShopManagerName
(voInvestmentManagerMap.get(x.getInvestmentManagerId()).getName());
}
if (!StringUtils.isEmpty(x.getSupervisorUserId()))
{openingOperationPlanListVO.setSupervisorName(voSupervisorMap.get(x.getSupervisorUserId()).getName());}
openingOperationPlanListVO.setSubmissionTime(x.getSubmissionTime());
openingOperationPlanListVO.setResultType(x.getResultType());
openingOperationPlanListVOList.add(openingOperationPlanListVO);
});
pageInfo.setList(openingOperationPlanListVOList);
return pageInfo;
}
@Override

3
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenPreparationController.java
View File

@@ -18,6 +18,7 @@ import com.cool.store.response.ResponseResult;
import com.cool.store.service.*;
import com.cool.store.vo.OpeningOperationPlanListVO;
import com.cool.store.vo.OpeningOperationPlanVO;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -72,7 +73,7 @@ public class OpenPreparationController {
@GetMapping("/openingOperationPlan/planList")
@ApiOperation("查询运营方案列表")
public ResponseResult<List<OpeningOperationPlanListVO>> planList(@RequestBody PlanListRequest request) {
public ResponseResult<PageInfo<OpeningOperationPlanListVO>> planList(@RequestBody PlanListRequest request) {
return ResponseResult.success(openingOperationPlanService.getPlanListPage(request));
}