Merge #89 into master from cc_20260402_minor_req
fix:诸多小需求 * cc_20260402_minor_req: (6 commits squashed) - fix:PC端新增租赁合同相关接口 - fix:新发标签不过滤私域码 - fix:开店管理新增签约阶段完成时间筛选条件 - fix:删除多余接口 - fix:网商激活短链显示 - fix:开店管理导出去除限制 Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com> Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com> CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/89
This commit is contained in:
@@ -324,6 +324,9 @@
|
||||
<if test="request.contractStartTime !=null and request.contractEndTime != null">
|
||||
left join xfsg_sign_franchise c on a.id = c.shop_id
|
||||
</if>
|
||||
<if test="request.signStageStartTime != null and request.signStageEndTime">
|
||||
left join xfsg_shop_stage_info d on a.id = d.shop_id and d.shop_stage = 2 and d.shop_sub_stage = 80
|
||||
</if>
|
||||
where a.deleted = 0
|
||||
<if test="request.contractStartTime !=null and request.contractEndTime !=null">
|
||||
and c.create_time between #{request.contractStartTime} and #{request.contractEndTime}
|
||||
@@ -394,6 +397,9 @@
|
||||
</foreach>
|
||||
)
|
||||
</if>
|
||||
<if test="request.signStageStartTime != null and request.signStageEndTime">
|
||||
and d.actual_complete_time between #{request.signStageStartTime} and #{request.signStageEndTime}
|
||||
</if>
|
||||
order by a.update_time desc
|
||||
</select>
|
||||
<select id="getShopListByRegion" resultType="com.cool.store.entity.ShopInfoDO">
|
||||
|
||||
Reference in New Issue
Block a user