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
05a06b5f
You need to sign in or sign up before continuing.
Commit
05a06b5f
authored
May 31, 2023
by
wangzb
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.5.4' into MVP1.5.4
parents
dec684ed
714ff140
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
44 additions
and
43 deletions
+44
-43
TEmpChangeInfoServiceImpl.java
...yifu/archives/service/impl/TEmpChangeInfoServiceImpl.java
+38
-41
TPaymentInfoMapper.xml
...cial-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
+6
-2
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpChangeInfoServiceImpl.java
View file @
05a06b5f
...
...
@@ -416,12 +416,6 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
&&
vo
.
getChangeItems
().
indexOf
(
CommonConstants
.
TWO_STRING
)
>=
CommonConstants
.
ZERO_INT
){
return
R
.
failed
(
"人员在原项目中存在在途的公积金,请先终止后,再进行划转"
);
}
if
(
vo
.
getChangeItems
().
indexOf
(
CommonConstants
.
ONE_STRING
)
>=
CommonConstants
.
ZERO_INT
)
{
if
(
Common
.
isEmpty
(
newEmpProject
.
getSocialStatus
())
||
CommonConstants
.
ZERO_INT
==
newEmpProject
.
getSocialStatus
())
{
}
}
TSettleDomain
tSettleDomain
=
tSettleDomainMapper
.
selectOne
(
Wrappers
.<
TSettleDomain
>
query
().
lambda
()
.
eq
(
TSettleDomain:
:
getDepartNo
,
vo
.
getNewDeptNo
())
.
eq
(
TSettleDomain:
:
getDeleteFlag
,
CommonConstants
.
ZERO_STRING
)
...
...
@@ -480,22 +474,23 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
if
(
Common
.
isEmpty
(
oldEmpProject
.
getSocialStatus
())
||
CommonConstants
.
ZERO_INT
==
oldEmpProject
.
getSocialStatus
()){
resStr
.
append
(
"社保项不存在,无法划转! <br>"
);
}
if
(
Common
.
isEmpty
(
newEmpProject
.
getSocialStatus
())
||
CommonConstants
.
ZERO_INT
==
newEmpProject
.
getSocialStatus
()){
newEmpProject
.
setSocialStatus
(
oldEmpProject
.
getSocialStatus
());
newEmpProject
.
setSocialProvince
(
oldEmpProject
.
getSocialProvince
());
newEmpProject
.
setSocialCity
(
oldEmpProject
.
getSocialCity
());
newEmpProject
.
setSocialTown
(
oldEmpProject
.
getSocialTown
());
updatesf
.
setFlag
(
CommonConstants
.
ZERO_STRING
);
socialDaprUtils
.
updateSocialAndFoundInfo
(
updatesf
);
oldEmpProject
.
setSocialStatus
(
CommonConstants
.
ZERO_INT
);
oldEmpProject
.
setSocialProvince
(
null
);
oldEmpProject
.
setSocialCity
(
null
);
oldEmpProject
.
setSocialTown
(
null
);
resStr
.
append
(
"社保划转成功! <br>"
);
}
else
{
resStr
.
append
(
"目标项目档案存在社保数据,社保划转失败! <br>"
);
if
(
Common
.
isEmpty
(
newEmpProject
.
getSocialStatus
())
||
CommonConstants
.
ZERO_INT
==
newEmpProject
.
getSocialStatus
()){
newEmpProject
.
setSocialStatus
(
oldEmpProject
.
getSocialStatus
());
newEmpProject
.
setSocialProvince
(
oldEmpProject
.
getSocialProvince
());
newEmpProject
.
setSocialCity
(
oldEmpProject
.
getSocialCity
());
newEmpProject
.
setSocialTown
(
oldEmpProject
.
getSocialTown
());
updatesf
.
setFlag
(
CommonConstants
.
ZERO_STRING
);
socialDaprUtils
.
updateSocialAndFoundInfo
(
updatesf
);
oldEmpProject
.
setSocialStatus
(
CommonConstants
.
ZERO_INT
);
oldEmpProject
.
setSocialProvince
(
null
);
oldEmpProject
.
setSocialCity
(
null
);
oldEmpProject
.
setSocialTown
(
null
);
resStr
.
append
(
"社保划转成功! <br>"
);
}
else
{
resStr
.
append
(
"目标项目档案存在社保数据,社保划转失败! <br>"
);
}
}
}
// 处理公积金 如果目标项目档案已存在公积金 不划转
...
...
@@ -503,16 +498,17 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
if
(
Common
.
isEmpty
(
oldEmpProject
.
getFundStatus
())
||
CommonConstants
.
ZERO_INT
==
oldEmpProject
.
getFundStatus
()){
resStr
.
append
(
"公积金项不存在,无法划转! <br>"
);
}
if
(
Common
.
isEmpty
(
newEmpProject
.
getFundStatus
())
||
CommonConstants
.
ZERO_INT
==
newEmpProject
.
getFundStatus
()){
newEmpProject
.
setFundStatus
(
oldEmpProject
.
getFundStatus
());
updatesf
.
setFlag
(
CommonConstants
.
ONE_STRING
);
socialDaprUtils
.
updateSocialAndFoundInfo
(
updatesf
);
oldEmpProject
.
setFundStatus
(
CommonConstants
.
ZERO_INT
);
resStr
.
append
(
"公积金划转成功! <br>"
);
}
else
{
resStr
.
append
(
"目标项目档案存在公积金数据,公积金划转失败! <br>"
);
}
else
{
if
(
Common
.
isEmpty
(
newEmpProject
.
getFundStatus
())
||
CommonConstants
.
ZERO_INT
==
newEmpProject
.
getFundStatus
()){
newEmpProject
.
setFundStatus
(
oldEmpProject
.
getFundStatus
());
updatesf
.
setFlag
(
CommonConstants
.
ONE_STRING
);
socialDaprUtils
.
updateSocialAndFoundInfo
(
updatesf
);
oldEmpProject
.
setFundStatus
(
CommonConstants
.
ZERO_INT
);
resStr
.
append
(
"公积金划转成功! <br>"
);
}
else
{
resStr
.
append
(
"目标项目档案存在公积金数据,公积金划转失败! <br>"
);
}
}
}
// 处理員工合同 目标 已有合同状态 不在处理合同划转
...
...
@@ -520,17 +516,18 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
if
(
Common
.
isEmpty
(
oldEmpProject
.
getContractStatus
())
||
CommonConstants
.
ZERO_INT
==
oldEmpProject
.
getContractStatus
()){
resStr
.
append
(
"员工合同不存在,无法划转! <br>"
);
}
if
(
Common
.
isEmpty
(
newEmpProject
.
getContractStatus
())
||
CommonConstants
.
ZERO_INT
==
newEmpProject
.
getContractStatus
()){
newEmpProject
.
setContractStatus
(
oldEmpProject
.
getContractStatus
());
newEmpProject
.
setContractType
(
oldEmpProject
.
getContractType
());
// 合同同步划转---只划转在用合同 fxj 2023-03-06
contractInfoMapper
.
updateContractChange
(
updateTEmployeeProject
.
getEmpIdcard
(),
updateTEmployeeProject
.
getDeptNo
(),
updateTEmployeeProject
.
getOldDeptNo
());
oldEmpProject
.
setContractStatus
(
CommonConstants
.
ZERO_INT
);
resStr
.
append
(
"员工合同划转成功! <br>"
);
}
else
{
resStr
.
append
(
"目标项目档案存在员工合同数据,员工合同划转失败! <br>"
);
if
(
Common
.
isEmpty
(
newEmpProject
.
getContractStatus
())
||
CommonConstants
.
ZERO_INT
==
newEmpProject
.
getContractStatus
()){
newEmpProject
.
setContractStatus
(
oldEmpProject
.
getContractStatus
());
newEmpProject
.
setContractType
(
oldEmpProject
.
getContractType
());
// 合同同步划转---只划转在用合同 fxj 2023-03-06
contractInfoMapper
.
updateContractChange
(
updateTEmployeeProject
.
getEmpIdcard
(),
updateTEmployeeProject
.
getDeptNo
(),
updateTEmployeeProject
.
getOldDeptNo
());
oldEmpProject
.
setContractStatus
(
CommonConstants
.
ZERO_INT
);
resStr
.
append
(
"员工合同划转成功! <br>"
);
}
else
{
resStr
.
append
(
"目标项目档案存在员工合同数据,员工合同划转失败! <br>"
);
}
}
}
// 变更老的项目档案
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
View file @
05a06b5f
...
...
@@ -1231,7 +1231,7 @@
SUM( w.UNIT_PROVIDENT_SUM ) AS UNIT_PROVIDENT_SUM
FROM (
(SELECT
CONCAT( a.EMP_IDCARD, '_', a.SOCIAL_PAY_MONTH, '_', a.SOCIAL_CREATE_MONTH ) AS keyGroup,
CONCAT( a.EMP_IDCARD, '_', a.SOCIAL_PAY_MONTH, '_', a.SOCIAL_CREATE_MONTH
, '_', a.SETTLE_DOMAIN_CODE
) AS keyGroup,
a.EMP_NAME,
a.EMP_IDCARD,
a.UNIT_NAME,
...
...
@@ -1285,7 +1285,7 @@
)
union all
(SELECT
CONCAT( a.EMP_IDCARD, '_', a.PROVIDENT_PAY_MONTH, '_', a.PROVIDENT_CREATE_MONTH ) AS keyGroup,
CONCAT( a.EMP_IDCARD, '_', a.PROVIDENT_PAY_MONTH, '_', a.PROVIDENT_CREATE_MONTH
, '_', a.SETTLE_DOMAIN_CODE
) AS keyGroup,
a.EMP_NAME,
a.EMP_IDCARD,
a.UNIT_NAME,
...
...
@@ -1338,6 +1338,10 @@
GROUP BY a.EMP_IDCARD,a.PROVIDENT_PAY_MONTH,a.PROVIDENT_CREATE_MONTH,a.SETTLE_DOMAIN_CODE
)
) w
<where>
1 = 1
<include
refid=
"tPaymentInfo_export_socialFund_where"
/>
</where>
GROUP BY w.keyGroup
</select>
...
...
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