From 992bcc6551b0efcf2a29de2070c13efc56925766 Mon Sep 17 00:00:00 2001
From: "shuo.wang" <shuo.wang@hao168.com>
Date: Mon, 20 May 2024 15:26:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=86=E8=A7=89=E9=AA=8C?=
 =?UTF-8?q?=E6=94=B6sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/cool/store/mapper/ShopInfoMapper.java   | 2 +-
 .../src/main/resources/mapper/ShopInfoMapper.xml          | 8 ++++----
 .../com/cool/store/request/AcceptanceListRequest.java     | 2 +-
 .../cool/store/service/impl/DecorationServiceImpl.java    | 2 +-
 .../cool/store/service/impl/SeeAcceptanceServiceImpl.java | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java
index 2456073af..5d7552c2b 100644
--- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java
@@ -86,7 +86,7 @@ public interface ShopInfoMapper extends Mapper<ShopInfoDO> {
      * @Date: 2024/5/3
      * @description:根据区域id查询所有处于XXX的店铺
      */
-    List<ShopInfoDO> selectShopListByRegionId(@Param("regionIds") List<Long> regionIds,@Param("subStageStatus")List<Integer> subStageStatus,@Param("request")String request);
+    List<ShopInfoDO> selectShopListByRegionId(@Param("regionIds") List<Long> regionIds,@Param("shopSubStage") Integer shopSubStage,@Param("subStageStatus")List<Integer> subStageStatus,@Param("keyWord")String keyWord);
 
 
 }
diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
index ca08c09b5..527eeabf2 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
@@ -151,7 +151,7 @@
       select
       xsi.id,xsi.line_id as lineId,xsi.region_id as regionId,xsi.shop_name as shopName,xsi.store_num as storeNum
       from xfsg_shop_info xsi
-      join xfsg_shop_stage_info xssi on xssi.shop_id = xsi.id
+      left join xfsg_shop_stage_info xssi on xssi.shop_id = xsi.id
       where
        xsi.deleted = 0
       <if test="regionIds != null and regionIds.size() > 0">
@@ -161,15 +161,15 @@
         </foreach>
       </if>
       AND xssi.shop_sub_stage_status != -100
-      and xssi.shop_sub_stage = 120
+      and xssi.shop_sub_stage = #{shopSubStage}
       <if test="subStageStatus != null and subStageStatus.size()>0">
           and xssi.shop_sub_stage_status in
         <foreach collection="subStageStatus" item="item" index="index" open="(" separator="," close=")">
           #{item}
         </foreach>
       </if>
-      <if test="request != null and request != '' ">
-        and xsi.shop_name Like concat("%",#{request},"%") or xsi.shop_num Like concat("%",#{request},"%")
+      <if test="keyWord != null and keyWord != '' ">
+        and xsi.shop_name Like concat("%",#{keyWord},"%") or xsi.store_num Like concat("%",#{keyWord},"%")
       </if>
     </select>
 
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/AcceptanceListRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/AcceptanceListRequest.java
index 51e013126..c89d10d09 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/request/AcceptanceListRequest.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/request/AcceptanceListRequest.java
@@ -16,7 +16,7 @@ import java.util.List;
 @Data
 public class AcceptanceListRequest {
     @ApiModelProperty("门店名称或编码")
-    private String request;
+    private String keyWord;
     @ApiModelProperty("阶段状态")
     private List<Integer> subStageStatus;
     private Integer pageNum;
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java
index 329ef721e..fb7c3c8d5 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java
@@ -484,7 +484,7 @@ public class DecorationServiceImpl implements DecorationService {
         List<fitmentCheckVO> fitmentCheckVOList = new ArrayList<>();
         //shopId,lineid,regionid,shopname,storenum,
 
-        List<ShopInfoDO> shopInfoDOS = shopInfoMapper.selectShopListByRegionId(regions, request.getSubStageStatus(),null);
+        List<ShopInfoDO> shopInfoDOS = shopInfoMapper.selectShopListByRegionId(regions, ShopSubStageEnum.SHOP_STAGE_12.getShopSubStage(),request.getSubStageStatus(),null);
         PageInfo pageInfo = new PageInfo<>(shopInfoDOS);
         if (shopInfoDOS.isEmpty()) {
             log.info("该工程部监理下门店为空");
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SeeAcceptanceServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SeeAcceptanceServiceImpl.java
index 9a5ffaff3..9d98a5496 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SeeAcceptanceServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SeeAcceptanceServiceImpl.java
@@ -150,7 +150,7 @@ public class SeeAcceptanceServiceImpl implements SeeAcceptanceService {
         List<fitmentCheckVO> fitmentCheckVOList = new ArrayList<>();
         //shopId,lineid,regionid,shopname,storenum,
 
-        List<ShopInfoDO> shopInfoDOS = shopInfoMapper.selectShopListByRegionId(regions, request.getSubStageStatus(),request.getRequest());
+        List<ShopInfoDO> shopInfoDOS = shopInfoMapper.selectShopListByRegionId(regions, ShopSubStageEnum.SHOP_STAGE_13.getShopSubStage(),request.getSubStageStatus(),request.getKeyWord());
         PageInfo pageInfo = new PageInfo<>(shopInfoDOS);
         if (shopInfoDOS.isEmpty()) {
             log.info("该工程部监理下门店为空");