Commit 39b425cb authored by fangxinjiang's avatar fangxinjiang

法大大电子签手机号码取值档案的手机号码-fxj

parent 0b70bd3f
...@@ -342,6 +342,7 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr ...@@ -342,6 +342,7 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr
contract.setHuArea(empInfo.getHuArea()); contract.setHuArea(empInfo.getHuArea());
contract.setContactArea(empInfo.getContactArea()); contract.setContactArea(empInfo.getContactArea());
contract.setEmpEmail(empInfo.getEmpEmail()); contract.setEmpEmail(empInfo.getEmpEmail());
contract.setEmpPhone(empInfo.getEmpPhone());
} }
if (Common.isEmpty(contract.getFadadaTemplateId())) { if (Common.isEmpty(contract.getFadadaTemplateId())) {
...@@ -395,16 +396,17 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr ...@@ -395,16 +396,17 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr
} }
TEmployeeContractPrePushFascVo empContactInfo = tEmpContactInfoMapper.getTEmpContactInfoOneByCard(empIdCard); TEmployeeContractPrePushFascVo empContactInfo = tEmpContactInfoMapper.getTEmpContactInfoOneByCard(empIdCard);
TEmployeeContractPrePushFascVo empInfo = tEmpContactInfoMapper.getTEmpInfoOneByCard(empIdCard); TEmployeeContractPrePushFascVo empInfo = tEmpContactInfoMapper.getTEmpInfoOneByCard(empIdCard);
if (empContactInfo != null) { if (empContactInfo != null) {
contract.setContactEmpName(empContactInfo.getContactEmpName()); contract.setContactEmpName(empContactInfo.getContactEmpName());
contract.setContactTel(empContactInfo.getContactTel()); contract.setContactTel(empContactInfo.getContactTel());
contract.setContactAddress(empContactInfo.getContactAddress()); contract.setContactAddress(empContactInfo.getContactAddress());
} }
// 如果员工档案信息有,默认用档案的手机号
if (empInfo != null) { if (empInfo != null) {
contract.setHuArea(empInfo.getHuArea()); contract.setHuArea(empInfo.getHuArea());
contract.setContactArea(empInfo.getContactArea()); contract.setContactArea(empInfo.getContactArea());
contract.setEmpEmail(empInfo.getEmpEmail()); contract.setEmpEmail(empInfo.getEmpEmail());
contract.setEmpPhone(empInfo.getEmpPhone());
} }
if (Common.isEmpty(contract.getFadadaTemplateId())) { if (Common.isEmpty(contract.getFadadaTemplateId())) {
......
...@@ -136,7 +136,8 @@ ...@@ -136,7 +136,8 @@
,ifnull(sc2.AREA_NAME,'') ,ifnull(sc2.AREA_NAME,'')
,ifnull(st2.AREA_NAME,'') ,ifnull(st2.AREA_NAME,'')
,ifnull(a.CONTACT_ADDRESS,'') ,ifnull(a.CONTACT_ADDRESS,'')
) contactArea,a.EMP_EMAIL empEmail ) contactArea,a.EMP_EMAIL empEmail,
a.EMP_PHONE empPhone
from t_employee_info a from t_employee_info a
left join sys_area sp on sp.id = a.ID_PROVINCE left join sys_area sp on sp.id = a.ID_PROVINCE
left join sys_area sc on sc.id = a.ID_CITY left join sys_area sc on sc.id = a.ID_CITY
......
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