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
2ef11abf
Commit
2ef11abf
authored
May 08, 2026
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.22' into MVP1.7.22
parents
00ae7d63
c478f476
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
59 additions
and
31 deletions
+59
-31
TEmployeeContractPrePushFascVo.java
...s/v1/yifu/archives/vo/TEmployeeContractPrePushFascVo.java
+0
-3
EmployeeRegistrationPreServiceImpl.java
...ives/service/impl/EmployeeRegistrationPreServiceImpl.java
+13
-0
FascServiceImpl.java
...d/plus/v1/yifu/archives/service/impl/FascServiceImpl.java
+0
-3
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+12
-2
TEmployeePreLogServiceImpl.java
...ifu/archives/service/impl/TEmployeePreLogServiceImpl.java
+4
-0
TEmpContactInfoMapper.xml
...s-biz/src/main/resources/mapper/TEmpContactInfoMapper.xml
+1
-2
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+29
-21
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TEmployeeContractPrePushFascVo.java
View file @
2ef11abf
...
@@ -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/EmployeeRegistrationPreServiceImpl.java
View file @
2ef11abf
...
@@ -103,6 +103,8 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
...
@@ -103,6 +103,8 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
private
final
TEmployeeContractPreMapper
contractPreMapper
;
private
final
TEmployeeContractPreMapper
contractPreMapper
;
private
final
TEmployeeContractPreNewMapper
contractPreNewMapper
;
private
final
TGzOfferInfoMapper
gzOfferInfoMapper
;
private
final
TGzOfferInfoMapper
gzOfferInfoMapper
;
@Autowired
@Autowired
...
@@ -1146,6 +1148,17 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
...
@@ -1146,6 +1148,17 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
}
}
try
{
try
{
baseMapper
.
updateById
(
employeeRegistrationPre
);
baseMapper
.
updateById
(
employeeRegistrationPre
);
// 如果手机号发生变化,同步更新合同待签订(TEmployeeContractPre)的手机号码
if
(
Common
.
isNotNull
(
employeeRegistrationPre
.
getEmpPhone
())
&&
!
employeeRegistrationPre
.
getEmpPhone
().
equals
(
comparePre
.
getEmpPhone
()))
{
// 同步更新合同待签订的手机号码(通过registerId关联)
LambdaUpdateWrapper
<
TEmployeeContractPre
>
contractPreUpdateWrapper
=
new
LambdaUpdateWrapper
<>();
contractPreUpdateWrapper
.
eq
(
TEmployeeContractPre:
:
getRegisterId
,
employeeRegistrationPre
.
getId
())
.
set
(
TEmployeeContractPre:
:
getEmpPhone
,
employeeRegistrationPre
.
getEmpPhone
());
contractPreMapper
.
update
(
null
,
contractPreUpdateWrapper
);
}
// 如果预计收集时间改变且新的时间不为空,添加新的定时任务
// 如果预计收集时间改变且新的时间不为空,添加新的定时任务
if
(
expectedCollectionTimeChanged
&&
employeeRegistrationPre
.
getExpectedCollectionTime
()
!=
null
)
{
if
(
expectedCollectionTimeChanged
&&
employeeRegistrationPre
.
getExpectedCollectionTime
()
!=
null
)
{
log
.
info
(
"员工预入职 ID: {} 按新预计收集时间:{} 添加定时任务"
,
log
.
info
(
"员工预入职 ID: {} 按新预计收集时间:{} 添加定时任务"
,
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/FascServiceImpl.java
View file @
2ef11abf
...
@@ -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/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
2ef11abf
...
@@ -28,6 +28,7 @@ import com.alibaba.excel.write.metadata.WriteSheet;
...
@@ -28,6 +28,7 @@ import com.alibaba.excel.write.metadata.WriteSheet;
import
com.baomidou.lock.annotation.Lock4j
;
import
com.baomidou.lock.annotation.Lock4j
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.pig4cloud.plugin.excel.vo.ErrorMessage
;
import
com.pig4cloud.plugin.excel.vo.ErrorMessage
;
...
@@ -146,6 +147,8 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
...
@@ -146,6 +147,8 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
private
final
TEmployeeContractPreMapper
contractPreMapper
;
private
final
TEmployeeContractPreMapper
contractPreMapper
;
private
final
TEmployeeContractPreNewMapper
contractPreNewMapper
;
@Autowired
@Autowired
private
OSSUtil
ossUtil
;
private
OSSUtil
ossUtil
;
...
@@ -4763,10 +4766,17 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
...
@@ -4763,10 +4766,17 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
}
else
{
}
else
{
return
R
.
failed
(
EmployeeConstants
.
CHECK_ERROR
);
return
R
.
failed
(
EmployeeConstants
.
CHECK_ERROR
);
}
}
// 可以更新
:
// 可以更新
:
emp
.
setEmpPhone
(
empPhoneNew
);
emp
.
setEmpPhone
(
empPhoneNew
);
baseMapper
.
updateById
(
emp
);
baseMapper
.
updateById
(
emp
);
return
R
.
ok
(
"更新成功!"
);
// 同步更新合同待续签(TEmployeeContractPreNew)的手机号码
LambdaUpdateWrapper
<
TEmployeeContractPreNew
>
contractPreNewUpdateWrapper
=
new
LambdaUpdateWrapper
<>();
contractPreNewUpdateWrapper
.
eq
(
TEmployeeContractPreNew:
:
getEmpIdcard
,
emp
.
getEmpIdcard
())
.
set
(
TEmployeeContractPreNew:
:
getEmpPhone
,
empPhoneNew
);
contractPreNewMapper
.
update
(
null
,
contractPreNewUpdateWrapper
);
return
R
.
ok
(
"更新成功!"
);
}
else
{
}
else
{
return
R
.
failed
(
"无该人员信息,不可修改手机号!"
);
return
R
.
failed
(
"无该人员信息,不可修改手机号!"
);
}
}
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeePreLogServiceImpl.java
View file @
2ef11abf
...
@@ -710,6 +710,8 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
...
@@ -710,6 +710,8 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
//修改
//修改
}
else
if
(
newInfo
.
getServerItem
().
contains
(
"社保"
)&&
null
!=
newInfo
.
getSocialUpdateFlag
()
}
else
if
(
newInfo
.
getServerItem
().
contains
(
"社保"
)&&
null
!=
newInfo
.
getSocialUpdateFlag
()
&&
newInfo
.
getSocialUpdateFlag
()
&&
dispatchInfoPreOldVo
!=
null
&&
dispatchInfoPreVo
!=
null
)
{
&&
newInfo
.
getSocialUpdateFlag
()
&&
dispatchInfoPreOldVo
!=
null
&&
dispatchInfoPreVo
!=
null
)
{
//为了加状态日志
dispatchInfoPreVo
.
setProcessStatus
(
CommonConstants
.
ZERO_STRING
);
differenceSocialKey
=
HrEquator
.
comparisonValueIgnoreField
(
dispatchInfoPreOldVo
differenceSocialKey
=
HrEquator
.
comparisonValueIgnoreField
(
dispatchInfoPreOldVo
,
dispatchInfoPreVo
,
SOCIAL_IGNORE_FIELD_TWO
);
,
dispatchInfoPreVo
,
SOCIAL_IGNORE_FIELD_TWO
);
if
(
differenceSocialKey
.
length
()
>
0
)
{
if
(
differenceSocialKey
.
length
()
>
0
)
{
...
@@ -811,6 +813,8 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
...
@@ -811,6 +813,8 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
&&
newInfo
.
getFundUpdateFlag
()
&&
dispatchInfoFundPreOldVo
!=
null
&&
newInfo
.
getFundUpdateFlag
()
&&
dispatchInfoFundPreOldVo
!=
null
&&
dispatchInfoFundPreVo
!=
null
)
{
&&
dispatchInfoFundPreVo
!=
null
)
{
//initFundTime(dispatchInfoFundPreVo);
//initFundTime(dispatchInfoFundPreVo);
//为了加状态日志
dispatchInfoFundPreVo
.
setProcessStatus
(
CommonConstants
.
ZERO_STRING
);
differenceFundKey
=
HrEquator
.
comparisonValueIgnoreField
(
dispatchInfoFundPreOldVo
differenceFundKey
=
HrEquator
.
comparisonValueIgnoreField
(
dispatchInfoFundPreOldVo
,
dispatchInfoFundPreVo
,
SOCIAL_IGNORE_FIELD_TWO
);
,
dispatchInfoFundPreVo
,
SOCIAL_IGNORE_FIELD_TWO
);
if
(
differenceFundKey
.
length
()
>
0
)
{
if
(
differenceFundKey
.
length
()
>
0
)
{
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmpContactInfoMapper.xml
View file @
2ef11abf
...
@@ -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
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
2ef11abf
...
@@ -2005,10 +2005,10 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -2005,10 +2005,10 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
initFundPreInfo
(
registrationNow
,
preVo
.
getDispatchInfoFundPreVo
(),
user
,
domainR
.
getData
(),
fundLimitVo
);
initFundPreInfo
(
registrationNow
,
preVo
.
getDispatchInfoFundPreVo
(),
user
,
domainR
.
getData
(),
fundLimitVo
);
}
}
socialDaprUtils
.
saveFundPreInfo
(
preVo
);
socialDaprUtils
.
saveFundPreInfo
(
preVo
);
//保存确认接收日志(合同、商险、社保、公积金新增日志)
}
if
(
Common
.
isNotNull
(
domainR
)
&&
Common
.
isNotNull
(
domainR
.
getData
()))
{
//保存确认接收日志(合同、商险、社保、公积金新增日志)
saveConfirmReceiveLog
(
domainR
.
getData
(),
preVo
,
user
);
if
(
Common
.
isNotNull
(
domainR
)
&&
Common
.
isNotNull
(
domainR
.
getData
()))
{
}
saveConfirmReceiveLog
(
domainR
.
getData
(),
preVo
,
user
);
}
}
}
}
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
...
@@ -3324,32 +3324,40 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -3324,32 +3324,40 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
if
(
Common
.
isNotNull
(
preVo
.
getEmployeeContractPreVos
())){
if
(
Common
.
isNotNull
(
preVo
.
getEmployeeContractPreVos
())){
// 是否已参保
// 是否已参保
if
(
Common
.
isNotNull
(
preVo
.
getEmployeeContractPreVos
().
getContractFlag
()))
{
TEmployeePreLogDetail
contractDetail
=
new
TEmployeePreLogDetail
();
contractDetail
.
setModelType
(
CommonConstants
.
ONE_STRING
);
contractDetail
.
setType
(
CommonConstants
.
THREE_STRING
);
// 3合同
contractDetail
.
setPreId
(
empPreId
);
contractDetail
.
setPreLogId
(
logId
);
contractDetail
.
setOldInfo
(
null
);
Map
<
String
,
Object
>
newInfo
=
new
HashMap
<>();
newInfo
.
put
(
"contractIsBuy"
,
preVo
.
getEmployeeContractPreVos
().
getContractFlag
());
contractDetail
.
setNewInfo
(
JSON
.
toJSONString
(
newInfo
));
contractDetail
.
setDifferenceInfo
(
"contractIsBuy"
);
contractDetail
.
setCreateBy
(
user
.
getId
());
contractDetail
.
setCreateName
(
user
.
getNickname
());
detailList
.
add
(
contractDetail
);
}
TEmployeePreLogDetail
contractDetail
=
new
TEmployeePreLogDetail
();
TEmployeePreLogDetail
contractDetail
=
new
TEmployeePreLogDetail
();
contractDetail
.
setModelType
(
CommonConstants
.
ONE_STRING
);
contractDetail
.
setModelType
(
CommonConstants
.
ONE_STRING
);
contractDetail
.
setType
(
CommonConstants
.
THREE_STRING
);
// 3合同
contractDetail
.
setType
(
CommonConstants
.
THREE_STRING
);
// 3合同
contractDetail
.
setPreId
(
empPreId
);
contractDetail
.
setPreId
(
empPreId
);
contractDetail
.
setPreLogId
(
logId
);
contractDetail
.
setPreLogId
(
logId
);
contractDetail
.
setOldInfo
(
null
);
contractDetail
.
setOldInfo
(
null
);
contractDetail
.
setNewInfo
(
JSON
.
toJSONString
(
preVo
.
getEmployeeContractPreVos
(),
JSON_FEATURES
));
Map
<
String
,
Object
>
newInfo
=
new
HashMap
<>();
contractDetail
.
setDifferenceInfo
(
null
);
if
(
preVo
.
getEmployeeContractPreVos
().
getContractFlag
()
!=
null
){
newInfo
.
put
(
"contractIsBuy"
,
preVo
.
getEmployeeContractPreVos
().
getContractFlag
());
}
else
{
//默认否
newInfo
.
put
(
"contractIsBuy"
,
CommonConstants
.
ONE_STRING
);
}
contractDetail
.
setNewInfo
(
JSON
.
toJSONString
(
newInfo
));
contractDetail
.
setDifferenceInfo
(
"contractIsBuy"
);
contractDetail
.
setCreateBy
(
user
.
getId
());
contractDetail
.
setCreateBy
(
user
.
getId
());
contractDetail
.
setCreateName
(
user
.
getNickname
());
contractDetail
.
setCreateName
(
user
.
getNickname
());
detailList
.
add
(
contractDetail
);
detailList
.
add
(
contractDetail
);
//批量都是否,单个如果 是 是 不生成记录
if
(
CommonConstants
.
ONE_STRING
.
equals
(
preVo
.
getEmployeeContractPreVos
().
getContractFlag
())
||
null
==
preVo
.
getEmployeeContractPreVos
().
getContractFlag
()
){
contractDetail
=
new
TEmployeePreLogDetail
();
contractDetail
.
setModelType
(
CommonConstants
.
ONE_STRING
);
contractDetail
.
setType
(
CommonConstants
.
THREE_STRING
);
// 3合同
contractDetail
.
setPreId
(
empPreId
);
contractDetail
.
setPreLogId
(
logId
);
contractDetail
.
setOldInfo
(
null
);
contractDetail
.
setNewInfo
(
JSON
.
toJSONString
(
preVo
.
getEmployeeContractPreVos
(),
JSON_FEATURES
));
contractDetail
.
setDifferenceInfo
(
null
);
contractDetail
.
setCreateBy
(
user
.
getId
());
contractDetail
.
setCreateName
(
user
.
getNickname
());
detailList
.
add
(
contractDetail
);
}
}
}
}
}
...
...
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