From 0f1b40f21f487b04e2167f1b72499b086b31b616 Mon Sep 17 00:00:00 2001
From: "shuo.wang" <shuo.wang@hao168.com>
Date: Wed, 28 May 2025 20:00:06 +0800
Subject: [PATCH] fix

---
 .../com/cool/store/dao/ShopStageRemarkInfoDAO.java  | 13 +++++++++++++
 .../cool/store/vo/OpeningOperationPlanListVO.java   |  3 +++
 .../service/impl/OpeningOperationPlanImpl.java      |  7 +++++++
 3 files changed, 23 insertions(+)

diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageRemarkInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageRemarkInfoDAO.java
index b92e8cec4..7ddcc7a2f 100644
--- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageRemarkInfoDAO.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageRemarkInfoDAO.java
@@ -69,6 +69,19 @@ public class ShopStageRemarkInfoDAO {
         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) {
         if (CollectionUtils.isEmpty(lineIds) || CollectionUtils.isEmpty(workflowSubStageStatusList)){
             return new ArrayList<>();
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 a2031e9f5..4c28558cf 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
@@ -53,4 +53,7 @@ public class OpeningOperationPlanListVO {
 
     @ApiModelProperty("阶段状态")
     private Integer subStageStatus;
+
+    @ApiModelProperty("业务备注")
+    private String businessRemark;
 }
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 1a6525540..7db6b86f7 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
@@ -45,6 +45,8 @@ import java.util.stream.Collectors;
 @Slf4j
 public class OpeningOperationPlanImpl implements OpeningOperationPlanService {
 
+    @Resource
+    private ShopStageRemarkInfoDAO shopStageRemarkInfoDAO;
     @Resource
     private OpeningOperationPlanDAO openingOperationPlanDAO;
     @Resource
@@ -217,6 +219,8 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService {
         //阶段状态
         List<ShopStageInfoDO> subStageList = shopStageInfoDAO.getSubStageList(shopIds, ShopSubStageEnum.SHOP_STAGE_14.getShopSubStage());
         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<>();
         openPlanShopInfoDTOS.forEach(x -> {
             OpeningOperationPlanListVO openingOperationPlanListVO = new OpeningOperationPlanListVO();
@@ -236,6 +240,9 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService {
             openingOperationPlanListVO.setSubmissionTime(x.getSubmissionTime());
             openingOperationPlanListVO.setResultType(x.getResultType());
             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);
         });
         pageInfo.setList(openingOperationPlanListVOList);