|
|
@@ -827,15 +827,20 @@
|
|
|
d.school,d.major,d.title,pm.promotion_remarks promotionRemarks,a.mobile,a.fixed_tel fixedTel,
|
|
|
date_format(pm.promotion_time,'%Y-%m-%d') promotionTime,a.id_card idCard,a.birthday,a.employee_id employeeId,
|
|
|
date_format(pm.contract_start_time, '%Y-%m-%d') contractStart,date_format(pm.contract_end_time,'%Y-%m-%d')contractEnd,
|
|
|
- a.certification_authority certificationAuthority, a.residence_province residenceProvince,
|
|
|
- a.residence_city residenceCity,a.residence_area residenceArea, a.residence_address residenceAddress,
|
|
|
- a.native_place_province nativePlaceProvince, a.native_place_city nativePlaceCity,a.now_province nowProvince,
|
|
|
- a.now_city nowCity,a.now_area nowArea, a.now_address nowAddress,date_format(pm.quit_time,'%Y-%m-%d') quitTime,
|
|
|
+ a.certification_authority certificationAuthority, a.residence_address residenceAddress,a.now_address nowAddress,
|
|
|
+ a.residence_province residenceProvince, a.residence_city residenceCity,a.residence_area residenceArea,
|
|
|
+ da1.name rpName,da2.name rcName,da3.name raName,db1.name nppName,db2.name npcName,dc1.name npName,dc2.name ncName,
|
|
|
+ dc3.name naName,a.native_place_province nativePlaceProvince, a.native_place_city nativePlaceCity,
|
|
|
+ a.now_province nowProvince, a.now_city nowCity,a.now_area nowArea, date_format(pm.quit_time,'%Y-%m-%d') quitTime,
|
|
|
pm.emergency_contact emergencyContact,pm.emergency_mobile emergencyMobile,
|
|
|
date_format(pm.insurance_start_time,'%Y-%m-%d') insuranceStartTimes,date_format(pm.insurance_end_time,'%Y-%m-%d') insuranceEndTimes,
|
|
|
date_format(pm.fund_start_time,'%Y-%m-%d') fundStartTimes,date_format(pm.fund_end_time,'%Y-%m-%d') fundEndTimes
|
|
|
from personnel_dossier a left join admin_level b on a.jobs=b.jobs and a.star=b.lvl left join department dep on a.company = dep.id
|
|
|
- left join personnel_entry d on a.id=d.id left join personnel_mid pm on a.id=pm.id
|
|
|
+ left join personnel_entry d on a.id=d.id left join personnel_mid pm on a.id=pm.id left join district_glossory da1 on a.residence_province=da1.id
|
|
|
+ left join district_glossory da2 on a.residence_city=da2.id left join district_glossory da3 on a.residence_area=da3.id
|
|
|
+ left join district_glossory db1 on a.native_place_province=db1.id left join district_glossory db2 on a.native_place_city=db2.id
|
|
|
+ left join district_glossory dc1 on a.now_province=dc1.id left join district_glossory dc2 on a.now_city=dc2.id
|
|
|
+ left join district_glossory dc3 on a.now_area=dc3.id
|
|
|
<if test="aid !=null">
|
|
|
left join admin ad on dep.id=ad.department_id
|
|
|
</if>
|
|
|
@@ -968,7 +973,8 @@
|
|
|
a.job_nature_remarks jobNatureRemarks, b.jobs_name jobsName,a.lvl,b.lvl_name starName,date_format(a.entry_time,'%Y-%m-%d')entryTimes,
|
|
|
date_format(a.promotion_time,'%Y-%m-%d')promotionTimes,date_format(a.birthday,'%Y-%m-%d')birthdays,a.star,a.jobs,
|
|
|
a.entry_time entryTime, a.sex,a.son,a.girl,a.political_outlook politicalOutlook,d.education,a.employee_id employeeId,
|
|
|
- d.school,d.major,d.title,m.promotion_remarks promotionRemarks,a.mobile,a.fixed_tel fixedTel,
|
|
|
+ d.school,d.major,d.title,m.promotion_remarks promotionRemarks,a.mobile,a.fixed_tel fixedTel,da1.name rpName,da2.name rcName,
|
|
|
+ da3.name raName,db1.name nppName,db2.name npcName,dc1.name npName,dc2.name ncName, dc3.name naName,
|
|
|
date_format(m.promotion_time,'%Y-%m-%d') promotionTime,a.id_card idCard,a.birthday,a.allowance,m.welfare_remarks welfareRemarks,
|
|
|
a.certification_authority certificationAuthority, a.residence_province residenceProvince,m.welfare_annex_name welfareAnnexName,
|
|
|
a.residence_city residenceCity,a.residence_area residenceArea, a.residence_address residenceAddress,
|
|
|
@@ -976,7 +982,11 @@
|
|
|
a.now_city nowCity,a.now_area nowArea, a.now_address nowAddress,m.welfare_annex_url welfareAnnexUrl
|
|
|
from personnel_dossier a left join admin_level b on a.jobs=b.jobs and a.star=b.lvl
|
|
|
left join department dep on a.company = dep.id left join personnel_mid m on a.id=m.id
|
|
|
- left join personnel_entry d on a.id=d.id
|
|
|
+ left join personnel_entry d on a.id=d.id left join district_glossory da1 on a.residence_province=da1.id
|
|
|
+ left join district_glossory da2 on a.residence_city=da2.id left join district_glossory da3 on a.residence_area=da3.id
|
|
|
+ left join district_glossory db1 on a.native_place_province=db1.id left join district_glossory db2 on a.native_place_city=db2.id
|
|
|
+ left join district_glossory dc1 on a.now_province=dc1.id left join district_glossory dc2 on a.now_city=dc2.id
|
|
|
+ left join district_glossory dc3 on a.now_area=dc3.id
|
|
|
where 1=1
|
|
|
and a.id= #{id}
|
|
|
</select>
|