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

Merge #13 into master from cc_20251211_jinjian

Browse Source 
feat:进件

* cc_20251211_jinjian: (3 commits squashed)

  - feat:进件

  - Merge branch 'master' into cc_20251211_jinjian

  - feat:进件

Signed-off-by: 苏竹红 <570057076@qq.com>
Merged-by: 苏竹红 <570057076@qq.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/13
This commit is contained in:
苏竹红
2025-12-15 09:43:50 +00:00
parent 9769aba30c
commit cf5d16b822
7 changed files with 157 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
coolstore-partner-dao/src/main/resources/mapper/ShopAccountMapper.xml
View File

@@ -214,4 +214,52 @@
WHERE `password` is null and `system_name` = '火码POS'
</select>
<select id="getEntryPendingList" resultMap="BaseResultMap">
select
*
from xfsg_shop_account a
left join xfsg_shop_info si on a.shop_id = si.id
<if test="request.signTypes != null and request.signTypes.size() >0">
left join xfsg_sign_franchise sign on a.shop_id = sign.shop_id
</if>
<where>
si.deleted = 0 and si.shop_status !=2 and a.`entry_status` in (2,3,4,6)
<if test="systemName!=null and systemName!=''">
and a.system_name = #{systemName}
</if>
<if test="request.shopKeyword !=null and request.shopKeyword !=''">
and (si.shop_name like concat('%',#{request.shopKeyword},'%') or si.shop_code like concat('%',#{request.shopKeyword},'%'))
</if>
<if test="request.regionIds !=null and request.regionIds.size()>0">
and si.region_id in
<foreach collection="request.regionIds" item="regionId" index="index" open="(" separator="," close=")">
#{regionId}
</foreach>
</if>
<if test="request.storeTypes !=null and request.storeTypes.size()>0">
and si.store_type in
<foreach collection="request.storeTypes" item="storeType" index="index" open="(" separator="," close=")">
#{storeType}
</foreach>
</if>
<if test="request.signTypes !=null and request.signTypes.size()>0">
and sign.sign_type in
<foreach collection="request.signTypes" item="signType" index="index" open="(" separator="," close=")">
#{signType}
</foreach>
</if>
<if test="request.supervisorId != null and request.supervisorId!= ''">
and si.investment_manager = #{request.supervisorId}
</if>
<if test="request.joinModes !=null and request.joinModes.size()>0">
and si.join_mode in
<foreach collection="request.joinModes" item="joinMode" index="index" open="(" separator="," close=")">
#{joinMode}
</foreach>
</if>
order by a.create_time desc
</where>
</select>
</mapper>