Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
7ffa74b4
Commit
7ffa74b4
authored
May 07, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
发大大手机号码取值回退-fxj
parent
935ce133
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
8 deletions
+1
-8
TEmployeeContractPrePushFascVo.java
...s/v1/yifu/archives/vo/TEmployeeContractPrePushFascVo.java
+0
-3
FascServiceImpl.java
...d/plus/v1/yifu/archives/service/impl/FascServiceImpl.java
+0
-3
TEmpContactInfoMapper.xml
...s-biz/src/main/resources/mapper/TEmpContactInfoMapper.xml
+1
-2
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TEmployeeContractPrePushFascVo.java
View file @
7ffa74b4
...
@@ -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
;
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/FascServiceImpl.java
View file @
7ffa74b4
...
@@ -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
());
}
}
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmpContactInfoMapper.xml
View file @
7ffa74b4
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment