Commit 8c1362ee by wenyang Committed by jianan

报聘审批完成后,“间接辅导人”自动赋值为“直接辅导人”的辅导人

parent aaa5a7c3
......@@ -779,6 +779,13 @@ public class AgmsHiringServiceImpl implements AgmsHiringService {
practitioner.setEducationLevel(basicInfo.getLastGraduateCode());
practitioner.setGraduatedUniversity(basicInfo.getLastGraduateSchool());
practitioner.setMentorId(membership.getMentorPractitionerId());
if(practitioner.getMentorId() != null){
AclPractitioner aclPractitionerMentor = aclPractitionerDalService.findById(practitioner.getMentorId());
if(aclPractitionerMentor != null && aclPractitionerMentor.getMentorId() != null){
practitioner.setInMentorId(aclPractitionerMentor.getMentorId());
}
}
practitioner.setIntroducerId(membership.getIntroducerPractitionerId());
practitioner.setGender(basicInfo.getGender());
practitioner.setHiringBasicInfoId(hiringBasicInfoId);
......
......@@ -208,6 +208,11 @@ public class AclPractitioner {
private Long mentorId;
/**
* FK ag_acl_practitioner.id 间接辅导人
*/
private Long inMentorId;
/**
* FK ag_acl_practitioner.id 介绍人
*/
private Long introducerId;
......
......@@ -44,6 +44,7 @@
<result column="education_level" jdbcType="VARCHAR" property="educationLevel" />
<result column="graduated_university" jdbcType="VARCHAR" property="graduatedUniversity" />
<result column="mentor_id" jdbcType="BIGINT" property="mentorId" />
<result column="in_mentor_id" jdbcType="BIGINT" property="inMentorId" />
<result column="introducer_id" jdbcType="BIGINT" property="introducerId" />
<result column="gender" jdbcType="INTEGER" property="gender" />
<result column="contract_oss_path" jdbcType="VARCHAR" property="contractOssPath" />
......@@ -66,7 +67,7 @@
employee_no, contract_no, is_active, created_at, created_by, updated_at, updated_by,
province_id, province_name, city_id, city_name, cert_list, bio_intro, bio_intro_two, wechat_id,
qq_id, is_profile_show, is_name_show, is_mobile_show, education_level, graduated_university,
mentor_id, introducer_id, gender, contract_oss_path, hiring_basic_info_id, can_login_dyd,
mentor_id,in_mentor_id, introducer_id, gender, contract_oss_path, hiring_basic_info_id, can_login_dyd,
can_see_salary_list,raise_id,s1_id,s2_id,s3_id,email,email_is_active
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
......@@ -95,7 +96,7 @@
city_id, city_name, cert_list,
bio_intro,bio_intro_two, wechat_id, qq_id,
is_profile_show, is_name_show, is_mobile_show,
education_level, graduated_university, mentor_id,
education_level, graduated_university, mentor_id, in_mentor_id,
introducer_id, gender, contract_oss_path,
hiring_basic_info_id, can_login_dyd, can_see_salary_list,
detail_address,account_bank,bank_card_no,email,s1_id,s2_id,s3_id
......@@ -112,7 +113,7 @@
#{cityId,jdbcType=BIGINT}, #{cityName,jdbcType=VARCHAR}, #{certList,jdbcType=VARCHAR},
#{bioIntro,jdbcType=LONGVARCHAR},#{bioIntroTwo,jdbcType=LONGVARCHAR}, #{wechatId,jdbcType=VARCHAR}, #{qqId,jdbcType=VARCHAR},
#{isProfileShow,jdbcType=INTEGER}, #{isNameShow,jdbcType=INTEGER}, #{isMobileShow,jdbcType=INTEGER},
#{educationLevel,jdbcType=VARCHAR}, #{graduatedUniversity,jdbcType=VARCHAR}, #{mentorId,jdbcType=BIGINT},
#{educationLevel,jdbcType=VARCHAR}, #{graduatedUniversity,jdbcType=VARCHAR}, #{mentorId,jdbcType=BIGINT}, #{inMentorId,jdbcType=BIGINT},
#{introducerId,jdbcType=BIGINT}, #{gender,jdbcType=INTEGER}, #{contractOssPath,jdbcType=VARCHAR},
#{hiringBasicInfoId,jdbcType=BIGINT}, #{canLoginDyd,jdbcType=BIGINT}, #{canSeeSalaryList,jdbcType=BIGINT},
#{detailAddress},#{accountBank,jdbcType=VARCHAR}, #{bankCardNo,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR},
......@@ -240,6 +241,9 @@
<if test="mentorId != null">
mentor_id,
</if>
<if test="inMentorId != null">
in_mentor_id,
</if>
<if test="introducerId != null">
introducer_id,
</if>
......@@ -380,6 +384,9 @@
<if test="mentorId != null">
#{mentorId,jdbcType=BIGINT},
</if>
<if test="inMentorId != null">
#{inMentorId,jdbcType=BIGINT},
</if>
<if test="introducerId != null">
#{introducerId,jdbcType=BIGINT},
</if>
......@@ -524,6 +531,9 @@
<if test="mentorId != null">
mentor_id = #{mentorId,jdbcType=BIGINT},
</if>
<if test="inMentorId != null">
in_mentor_id = #{inMentorId,jdbcType=BIGINT},
</if>
<if test="introducerId != null">
introducer_id = #{introducerId,jdbcType=BIGINT},
</if>
......@@ -587,6 +597,7 @@
education_level = #{educationLevel,jdbcType=VARCHAR},
graduated_university = #{graduatedUniversity,jdbcType=VARCHAR},
mentor_id = #{mentorId,jdbcType=BIGINT},
in_mentor_id = #{inMentorId,jdbcType=BIGINT},
introducer_id = #{introducerId,jdbcType=BIGINT},
gender = #{gender,jdbcType=INTEGER},
contract_oss_path = #{contractOssPath,jdbcType=VARCHAR},
......@@ -1152,7 +1163,7 @@
employee_no, contract_no, is_active, created_at, created_by, updated_at, updated_by,
province_id, province_name, city_id, city_name, cert_list, bio_intro,bio_intro_two, wechat_id,
qq_id, is_profile_show, is_name_show, is_mobile_show, education_level, graduated_university,
mentor_id, introducer_id, gender, contract_oss_path, hiring_basic_info_id, can_login_dyd,
mentor_id,in_mentor_id, introducer_id, gender, contract_oss_path, hiring_basic_info_id, can_login_dyd,
can_see_salary_list)
values
<foreach collection="list" item="item" separator=",">
......@@ -1169,7 +1180,7 @@
#{item.cityName,jdbcType=VARCHAR}, #{item.certList,jdbcType=VARCHAR}, #{item.bioIntro,jdbcType=LONGVARCHAR},#{item.bioIntroTwo,jdbcType=LONGVARCHAR},
#{item.wechatId,jdbcType=VARCHAR}, #{item.qqId,jdbcType=VARCHAR}, #{item.isProfileShow,jdbcType=INTEGER},
#{item.isNameShow,jdbcType=INTEGER}, #{item.isMobileShow,jdbcType=INTEGER}, #{item.educationLevel,jdbcType=VARCHAR},
#{item.graduatedUniversity,jdbcType=VARCHAR}, #{item.mentorId,jdbcType=BIGINT},
#{item.graduatedUniversity,jdbcType=VARCHAR}, #{item.mentorId,jdbcType=BIGINT},#{item.inMentorId,jdbcType=BIGINT},
#{item.introducerId,jdbcType=BIGINT}, #{item.gender,jdbcType=INTEGER}, #{item.contractOssPath,jdbcType=VARCHAR},
#{item.hiringBasicInfoId,jdbcType=BIGINT}, #{item.canLoginDyd,jdbcType=BIGINT},
#{item.canSeeSalaryList,jdbcType=BIGINT})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment