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

Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner

Browse Source 
# Conflicts:
#	coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerBaseInfoDAO.java
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerBaseInfoMapper.java
#	coolstore-partner-dao/src/main/resources/mapper/HyPartnerBaseInfoMapper.xml
This commit is contained in:
苏竹红
2023-06-21 15:58:53 +08:00
parent 72a3bcc850 bd1998e536
commit 2f1774c2ea
21 changed files with 174 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
coolstore-partner-dao/src/main/resources/mapper/HyPartnerBaseInfoMapper.xml
View File

@@ -221,6 +221,18 @@
where id = #{record.id}
</update>
<update id="updateByPrimaryKey">
update hy_partner_base_info
set
nation = #{record.nation},
birthdate = #{record.birthdate},
id_card = #{record.idCard},
id_card_photo_front = #{record.idCardPhotoFront},
id_card_photo_black = #{record.idCardPhotoBlack},
live_address = #{record.liveAddress}
where id = #{record.id}
</update>
<update id="updateByPartnerId">
update hy_partner_base_info
@@ -262,9 +274,9 @@
</where>
</select>
<select id="getLineIdByIdCard" resultType="java.lang.Long">
<select id="getByIdCard" resultMap="BaseResultMap">
select
partner_line_id
<include refid="Base_Column_List"></include>
from hy_partner_base_info
where id_card = #{idCard}
</select>

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

@@ -323,7 +323,7 @@
<include refid="Base_Column_List"></include>
from hy_partner_line_info
<where>
<if test="userId">
<if test="userId != null">
and investment_manager = #{userId}
</if>
<if test="lastMonthTodayDate!=null">