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

Merge #63 into master from cc_20260313_standard

Browse Source 
feat：新增筛选

* cc_20260313_standard: (1 commits squashed)

  - feat：新增筛选

Signed-off-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/63
This commit is contained in:
正新
2026-03-13 14:53:25 +00:00
parent 70b41d6783
commit f1f0295906
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -345,6 +345,9 @@
<if test="request.investmentManagerUserId != null and request.investmentManagerUserId != ''"> <if test="request.investmentManagerUserId != null and request.investmentManagerUserId != ''">
and a.investment_manager = #{request.investmentManagerUserId} and a.investment_manager = #{request.investmentManagerUserId}
</if> </if>
<if test="request.useStandardStore != null ">
and a.use_standard_store = #{request.useStandardStore}
</if>
<if test="request.openTimeStart != null "> <if test="request.openTimeStart != null ">
and DATE_ADD(a.create_time, INTERVAL 50 DAY) >= #{request.openTimeStart} and DATE_ADD(a.create_time, INTERVAL 50 DAY) >= #{request.openTimeStart}
</if> </if>

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

@@ -44,6 +44,9 @@ public class BranchShopRequest extends PageBasicInfo{
@NotNull @NotNull
private Integer flag; private Integer flag;
@ApiModelProperty("使用标准店型")
private Integer useStandardStore;
@ApiModelProperty("合同开始时间") @ApiModelProperty("合同开始时间")
private Date contractStartTime; private Date contractStartTime;
@ApiModelProperty("合同结束时间") @ApiModelProperty("合同结束时间")