Commit 7ffa74b4 authored by fangxinjiang's avatar fangxinjiang

发大大手机号码取值回退-fxj

parent 935ce133
...@@ -33,9 +33,6 @@ public class TEmployeeContractPrePushFascVo { ...@@ -33,9 +33,6 @@ public class TEmployeeContractPrePushFascVo {
@ExcelAttribute(name = "紧急联系人地址") @ExcelAttribute(name = "紧急联系人地址")
private String contactAddress; private String contactAddress;
@ExcelAttribute(name = "手机号码")
private String empPhone;
@ExcelProperty("微信号") @ExcelProperty("微信号")
private String weChatId; private String weChatId;
......
...@@ -342,7 +342,6 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr ...@@ -342,7 +342,6 @@ 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());
contract.setWeChatId(empInfo.getWeChatId()); contract.setWeChatId(empInfo.getWeChatId());
} }
...@@ -402,12 +401,10 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr ...@@ -402,12 +401,10 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr
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());
contract.setWeChatId(empInfo.getWeChatId()); contract.setWeChatId(empInfo.getWeChatId());
} }
......
...@@ -136,8 +136,7 @@ ...@@ -136,8 +136,7 @@
,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.WE_CHAT_ID weChatId
a.EMP_PHONE empPhone,a.WE_CHAT_ID weChatId
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