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

修改视觉验收sql

Browse Source
This commit is contained in:
shuo.wang
2024-05-20 15:26:25 +08:00
parent b3e33af5fe
commit 992bcc6551
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);
}

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

@@ -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>

2
coolstore-partner-model/src/main/java/com/cool/store/request/AcceptanceListRequest.java
View File

@@ -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;

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

@@ -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("该工程部监理下门店为空");

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

@@ -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("该工程部监理下门店为空");