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

fix

Browse Source
This commit is contained in:
shuo.wang
2025-05-28 20:00:06 +08:00
parent f8e4f985f7
commit 0f1b40f21f
3 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,6 +69,19 @@ public class ShopStageRemarkInfoDAO {
return result ; return result ;
} }
public List<ShopStageRemarkInfoDO> getByShopIdsAndStages(List<Long> shopIds, List<Integer> shopSubStageList) {
if (CollectionUtils.isEmpty(shopIds) || CollectionUtils.isEmpty(shopSubStageList)){
return new ArrayList<>();
}
Example example = new Example(ShopStageRemarkInfoDO.class);
example.createCriteria().andIn("shopId", shopIds).andIn("shopSubStage", shopSubStageList);
List<ShopStageRemarkInfoDO> result = shopStageRemarkInfoMapper.selectByExample(example);
if (CollectionUtils.isEmpty(result)){
return new ArrayList<>();
}
return result ;
}
public List<ShopStageRemarkInfoDO> getByLineIdsAndStage(List<Long> lineIds, List<Integer> workflowSubStageStatusList) { public List<ShopStageRemarkInfoDO> getByLineIdsAndStage(List<Long> lineIds, List<Integer> workflowSubStageStatusList) {
if (CollectionUtils.isEmpty(lineIds) || CollectionUtils.isEmpty(workflowSubStageStatusList)){ if (CollectionUtils.isEmpty(lineIds) || CollectionUtils.isEmpty(workflowSubStageStatusList)){
return new ArrayList<>(); return new ArrayList<>();

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

@@ -53,4 +53,7 @@ public class OpeningOperationPlanListVO {
@ApiModelProperty("阶段状态") @ApiModelProperty("阶段状态")
private Integer subStageStatus; private Integer subStageStatus;
@ApiModelProperty("业务备注")
private String businessRemark;
} }

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

@@ -45,6 +45,8 @@ import java.util.stream.Collectors;
@Slf4j @Slf4j
public class OpeningOperationPlanImpl implements OpeningOperationPlanService { public class OpeningOperationPlanImpl implements OpeningOperationPlanService {
@Resource
private ShopStageRemarkInfoDAO shopStageRemarkInfoDAO;
@Resource @Resource
private OpeningOperationPlanDAO openingOperationPlanDAO; private OpeningOperationPlanDAO openingOperationPlanDAO;
@Resource @Resource
@@ -217,6 +219,8 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService {
//阶段状态 //阶段状态
List<ShopStageInfoDO> subStageList = shopStageInfoDAO.getSubStageList(shopIds, ShopSubStageEnum.SHOP_STAGE_14.getShopSubStage()); List<ShopStageInfoDO> subStageList = shopStageInfoDAO.getSubStageList(shopIds, ShopSubStageEnum.SHOP_STAGE_14.getShopSubStage());
Map<Long, ShopStageInfoDO> subStageMap = subStageList.stream().collect(Collectors.toMap(ShopStageInfoDO::getShopId, dto -> dto)); Map<Long, ShopStageInfoDO> subStageMap = subStageList.stream().collect(Collectors.toMap(ShopStageInfoDO::getShopId, dto -> dto));
List<ShopStageRemarkInfoDO> shopStageRemarkInfoDOList = shopStageRemarkInfoDAO.getByShopIdsAndStages(shopIds, Arrays.asList(ShopSubStageEnum.SHOP_STAGE_14.getShopSubStage()));
Map<Long, List<ShopStageRemarkInfoDO>> remarkInfoMap = shopStageRemarkInfoDOList.stream().collect(Collectors.groupingBy(ShopStageRemarkInfoDO::getShopId));
List<OpeningOperationPlanListVO> openingOperationPlanListVOList = new ArrayList<>(); List<OpeningOperationPlanListVO> openingOperationPlanListVOList = new ArrayList<>();
openPlanShopInfoDTOS.forEach(x -> { openPlanShopInfoDTOS.forEach(x -> {
OpeningOperationPlanListVO openingOperationPlanListVO = new OpeningOperationPlanListVO(); OpeningOperationPlanListVO openingOperationPlanListVO = new OpeningOperationPlanListVO();
@@ -236,6 +240,9 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService {
openingOperationPlanListVO.setSubmissionTime(x.getSubmissionTime()); openingOperationPlanListVO.setSubmissionTime(x.getSubmissionTime());
openingOperationPlanListVO.setResultType(x.getResultType()); openingOperationPlanListVO.setResultType(x.getResultType());
openingOperationPlanListVO.setSubStageStatus(subStageMap.getOrDefault(x.getShopId(),new ShopStageInfoDO()).getShopSubStageStatus()); openingOperationPlanListVO.setSubStageStatus(subStageMap.getOrDefault(x.getShopId(),new ShopStageInfoDO()).getShopSubStageStatus());
List<ShopStageRemarkInfoDO> remarkInfoMapOrDefault = remarkInfoMap.getOrDefault(x.getShopId(), new ArrayList<>());
Map<Integer,String> remarkInfoMapByStageStatus = remarkInfoMapOrDefault.stream().collect(Collectors.toMap(ShopStageRemarkInfoDO::getShopSubStageStatus, ShopStageRemarkInfoDO::getRemark));
openingOperationPlanListVO.setBusinessRemark(remarkInfoMapByStageStatus.getOrDefault(openingOperationPlanListVO.getSubStageStatus(), ""));
openingOperationPlanListVOList.add(openingOperationPlanListVO); openingOperationPlanListVOList.add(openingOperationPlanListVO);
}); });
pageInfo.setList(openingOperationPlanListVOList); pageInfo.setList(openingOperationPlanListVOList);