merge-code

This commit is contained in:
pserimal
2023-06-09 18:08:03 +08:00
parent 94a7dfda58
commit 545c8a4b3f
3 changed files with 8 additions and 11 deletions

View File

@@ -23,7 +23,6 @@ public interface HyPartnerInterviewMapper {
* dateTime:2023-06-09 05:51 * dateTime:2023-06-09 05:51
*/ */
int updateByPrimaryKeySelective(HyPartnerInterviewDO record); int updateByPrimaryKeySelective(HyPartnerInterviewDO record);
int updateByPrimaryKeySelective(@Param("record") HyPartnerInterviewDO record);
/** /**
* 根据加盟商id查询面试信息 * 根据加盟商id查询面试信息

View File

@@ -246,19 +246,19 @@
<!-- 根据加盟商id查询面试信息 --> <!-- 根据加盟商id查询面试信息 -->
<select id="queryByPartnerId" resultMap="PartnerInterviewInfoVO"> <select id="queryByPartnerId" resultMap="PartnerInterviewInfoVO">
SELECT t1.id interviewId, `status`, start_time, end_time, room_id, t1.partner_id partnerId, t1.interviewer interviewerId SELECT t1.id interviewId, `status`, start_time, end_time, room_id, t1.partner_id partnerId, t1.interviewer interviewerId
FROM hy_partner_interview t1 FROM hy_partner_interview t1
LEFT JOIN hy_partner_interview_plan t2 ON t1.interview_arrangement_id = t2.id LEFT JOIN hy_partner_interview_plan t2 ON t1.interview_plan_id = t2.id
WHERE t1.partner_id = #{partnerId} WHERE t1.partner_id = #{partnerId}
</select> </select>
<select id="queryPartnerName" resultType="string"> <select id="queryPartnerName" resultType="string">
SELECT username SELECT username
FROM hy_partner_user_info FROM hy_partner_user_info
WHERE partner_id = #{partnerId} WHERE partner_id = #{partnerId}
</select> </select>
<select id="queryInterviewerName" resultType="string"> <select id="queryInterviewerName" resultType="string">
SELECT name SELECT name
FROM enterprise_user FROM enterprise_user
WHERE deleted = 0 WHERE deleted = 0
AND user_id = #{interview} AND user_id = #{interview}
</select> </select>
</mapper> </mapper>

View File

@@ -4,8 +4,6 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.util.Date;
/** /**
* @Author suzhuhong * @Author suzhuhong
* @Date 2023/5/30 20:28 * @Date 2023/5/30 20:28