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/mapper/HyPartnerInterviewPlanMapper.java
#	coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml
This commit is contained in:
俞扬
2023-06-17 18:19:17 +08:00
parent dcb3d1097c 4bdfc0b271
commit a3c94a6543
43 changed files with 580 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml
View File

@@ -252,28 +252,28 @@
left join hy_partner_line_info hpll on hpip.partner_line_id = hpll.id
left join hy_partner_user_info hpui on hpui.partner_id = hpip.partner_id
<where>
<if test="record.partnerName !=null and partnerName!=''">
<if test="record.partnerName !=null and record.partnerName!=''">
hpui.username like concat('%',#{record.partnerName},'%')
</if>
<if test="record.partnerMobile !=null and partnerMobile!=''">
<if test="record.partnerMobile !=null and record.partnerMobile!=''">
hpui.mobile like concat('%',#{record.partnerMobile},'%')
</if>
<if test="record.roomId !=null and roomId!=''">
<if test="record.roomId !=null and record.roomId!=''">
hpip.room_id = #{record.roomId}
</if>
<if test="record.interviewerName !=null and interviewerName!=''">
<if test="record.interviewerName !=null and record.interviewerName!=''">
hpui.username like concat('%',#{record.interviewerName},'%')
</if>
<if test="record.interviewerMobile !=null and interviewerMobile!=''">
<if test="record.interviewerMobile !=null and record.interviewerMobile!=''">
hpui.mobile like concat('%',#{record.interviewerMobile},'%')
</if>
<if test="record.roomStatus !=null and roomStatus!=''">
<if test="record.roomStatus !=null and record.roomStatus!=''">
hpip.room_status = #{record.roomStatus}
</if>
<if test="record.startTime !=null and startTime!=''">
<if test="record.startTime !=null and record.startTime!=''">
hpip.start_time &lt;= #{record.startTime}
</if>
<if test="record.endTime !=null and endTime!=''">
<if test="record.endTime !=null and record.endTime!=''">
hpip.end_time &gt;= #{record.endTime}
</if>
</where>
@@ -281,6 +281,17 @@
</select>
<select id="getInterviewInfo" resultType="com.cool.store.vo.interview.InterviewVO">
select hpip.id as interviewId,
hpi.qualify_verify_id as qualifyVerifyId,
hpi.pass_time as passTime,
hpi.pass_reason as passReason,
hpi.recorder as recorderId,
hpi.record_time as recordTime,
hpi.summary as summary,
hpi.process_info as processInfo,
hpi.auth_code as processInfo,
hpi.expiry_date as expiryDate,
hpi.pass_pdf_url as passPdfUrl,
hpi.pass_image_url as passImageUrl,
hpui.username as partnerName,
hpui.mobile as partnerMobile,
hpip.room_id as roomId,
@@ -336,4 +347,11 @@
</where>
</select>
<!-- 查询用户基本信息 -->
<select id="getEnterpriseUserBaseInfo" resultType="com.cool.store.vo.EnterpriseUserBaseInfoVO">
select name, mobile
from enterprise_user
where user_id = #{userId}
</select>
</mapper>