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-01-14 19:03:29 +08:00
parent a98828529a
commit 73a3ab769d
3 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml
View File

@@ -318,7 +318,7 @@
<select id="getChildrenListByParentIds" resultType="java.lang.Long">
select id from xfsg_open_area_info where 1=1
<if test="parentIds!=null and parentIds.size>0">
parent_id in
and parent_id in
<foreach collection="parentIds" item="parentId" separator="," open="(" close=")">
#{parentId}
</foreach>

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

@@ -309,14 +309,23 @@
<if test="request.openTimeEnd != null ">
<![CDATA[and DATE_ADD(a.create_time, INTERVAL 50 DAY) <= #{request.openTimeEnd}]]>
</if>
<if test="request.joinMode!=null">
and a.join_mode = #{request.joinMode}
<if test="request.joinMode!=null and request.joinMode.size >0">
and a.join_mode in
<foreach collection="request.joinMode" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="request.franchiseBrand!=null">
and a.franchise_brand = #{request.franchiseBrand}
<if test="request.franchiseBrand!=null and request.franchiseBrand.size>0">
and a.franchise_brand in
<foreach collection="request.franchiseBrand" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="request.shopStatus!=null">
and a.shop_status = #{request.shopStatus}
<if test="request.shopStatus!=null and request.shopStatus.size>0">
and a.shop_status in
<foreach collection="request.shopStatus" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="request.wantShopAreaAllIds != null and request.wantShopAreaAllIds.size() > 0">
and a.want_shop_area_id in

6
coolstore-partner-model/src/main/java/com/cool/store/request/BranchShopRequest.java
View File

@@ -26,11 +26,11 @@ public class BranchShopRequest extends PageBasicInfo{
@ApiModelProperty("意向开店区域")
private List<Long> wantShopAreaId;
@ApiModelProperty("加盟模式")
private Integer joinMode;
private List<Integer> joinMode;
@ApiModelProperty("加盟品牌")
private Integer franchiseBrand;
private List<Integer> franchiseBrand;
@ApiModelProperty("开店状态")
private Integer shopStatus;
private List<Integer> shopStatus;
@ApiModelProperty("计划开业日期开始")
private Date openTimeStart;
@ApiModelProperty("计划开业日期结束")