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
a3c0c2c7
Commit
a3c0c2c7
authored
Jun 30, 2023
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.5.5' into MVP1.5.5
parents
c0b3d46e
817704a8
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
55 additions
and
50 deletions
+55
-50
TEmployeeProjectServiceImpl.java
...fu/archives/service/impl/TEmployeeProjectServiceImpl.java
+48
-46
TDispatchReduceVo.java
.../yifu/cloud/plus/v1/yifu/social/vo/TDispatchReduceVo.java
+1
-0
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+6
-4
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java
View file @
a3c0c2c7
...
...
@@ -1385,6 +1385,48 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
if
(
Common
.
isEmpty
(
vo
)
||
Common
.
isEmpty
(
vo
.
getEmpIdCard
())
||
Common
.
isEmpty
(
vo
.
getDepartNo
())){
return
false
;
}
TEmployeeInfo
employee
=
tEmployeeInfoMapper
.
selectOne
(
Wrappers
.<
TEmployeeInfo
>
query
().
lambda
()
.
eq
(
TEmployeeInfo:
:
getEmpIdcard
,
vo
.
getEmpIdCard
())
.
eq
(
TEmployeeInfo:
:
getDeleteFlag
,
CommonConstants
.
ZERO_STRING
).
last
(
CommonConstants
.
LAST_ONE_SQL
));
// : 0 无社保|无公积金 1 处理中 2.部分购买 3.正常 4.已派减
if
(
Common
.
isNotNull
(
employee
))
{
if
(
Common
.
isNotNull
(
vo
.
getSocialStatus
()))
{
employee
.
setSocialStatus
(
Integer
.
parseInt
(
vo
.
getSocialStatus
()));
}
if
(
Common
.
isNotNull
(
vo
.
getFundStatus
()))
{
employee
.
setFundStatus
(
Integer
.
parseInt
(
vo
.
getFundStatus
()));
}
if
(
Common
.
isNotNull
(
vo
.
getFileProvince
()))
{
employee
.
setFileProvince
(
Integer
.
parseInt
(
vo
.
getFileProvince
()));
}
if
(
Common
.
isNotNull
(
vo
.
getFileCity
()))
{
employee
.
setFileCity
(
Integer
.
parseInt
(
vo
.
getFileCity
()));
if
(
Common
.
isNotNull
(
vo
.
getFileTown
()))
{
employee
.
setFileTown
(
Integer
.
parseInt
(
vo
.
getFileTown
()));
}
else
{
employee
.
setFileTown
(
null
);
}
}
if
(
Common
.
isNotNull
(
vo
.
getMobile
()))
{
employee
.
setEmpPhone
(
vo
.
getMobile
());
}
tEmployeeInfoMapper
.
updateSocialInfoById
(
employee
);
}
TEmployeeProject
project
=
baseMapper
.
selectOne
(
Wrappers
.<
TEmployeeProject
>
query
().
lambda
()
.
eq
(
TEmployeeProject:
:
getDeptNo
,
vo
.
getDepartNo
())
.
eq
(
TEmployeeProject:
:
getEmpIdcard
,
vo
.
getEmpIdCard
())
.
eq
(
TEmployeeProject:
:
getDeleteFlag
,
CommonConstants
.
ZERO_STRING
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
// : 0 无社保|无公积金 1 处理中 2.部分购买 3.正常 4.已派减
if
(
Common
.
isNotNull
(
project
))
{
if
(
Common
.
isNotNull
(
vo
.
getSocialStatus
()))
{
project
.
setSocialStatus
(
Integer
.
parseInt
(
vo
.
getSocialStatus
()));
}
if
(
Common
.
isNotNull
(
vo
.
getFundStatus
()))
{
project
.
setFundStatus
(
Integer
.
parseInt
(
vo
.
getFundStatus
()));
}
baseMapper
.
updateSocialAndFundStatusById
(
project
);
}
//是否同步终止合同、减项、减档为是的时候 单独写逻辑
if
(
Common
.
isNotNull
(
vo
.
getChangeContractAndEmployee
())
&&
CommonConstants
.
ZERO_STRING
.
equals
(
vo
.
getChangeContractAndEmployee
()))
{
...
...
@@ -1492,52 +1534,11 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
TWorkHandlerInfo
handlerInfo
=
workHandlerInfoService
.
getOne
(
Wrappers
.<
TWorkHandlerInfo
>
query
()
.
lambda
().
eq
(
TWorkHandlerInfo:
:
getDetailId
,
vo
.
getDetailId
())
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
handlerInfo
.
setOperInfo
(
workInfo
.
substring
(
0
,
workInfo
.
length
()
-
1
));
handlerInfo
.
setReason
(
failueInfo
.
length
()
>
1
?
failueInfo
.
toString
()
:
""
);
handlerInfo
.
setOperResult
(
failueInfo
.
length
()
>
1
?
"1"
:
"2"
);
workHandlerInfoService
.
updateById
(
handlerInfo
);
}
else
{
TEmployeeInfo
employee
=
tEmployeeInfoMapper
.
selectOne
(
Wrappers
.<
TEmployeeInfo
>
query
().
lambda
()
.
eq
(
TEmployeeInfo:
:
getEmpIdcard
,
vo
.
getEmpIdCard
())
.
eq
(
TEmployeeInfo:
:
getDeleteFlag
,
CommonConstants
.
ZERO_STRING
).
last
(
CommonConstants
.
LAST_ONE_SQL
));
// : 0 无社保|无公积金 1 处理中 2.部分购买 3.正常 4.已派减
if
(
Common
.
isNotNull
(
employee
))
{
if
(
Common
.
isNotNull
(
vo
.
getSocialStatus
()))
{
employee
.
setSocialStatus
(
Integer
.
parseInt
(
vo
.
getSocialStatus
()));
}
if
(
Common
.
isNotNull
(
vo
.
getFundStatus
()))
{
employee
.
setFundStatus
(
Integer
.
parseInt
(
vo
.
getFundStatus
()));
}
if
(
Common
.
isNotNull
(
vo
.
getFileProvince
()))
{
employee
.
setFileProvince
(
Integer
.
parseInt
(
vo
.
getFileProvince
()));
}
if
(
Common
.
isNotNull
(
vo
.
getFileCity
()))
{
employee
.
setFileCity
(
Integer
.
parseInt
(
vo
.
getFileCity
()));
if
(
Common
.
isNotNull
(
vo
.
getFileTown
()))
{
employee
.
setFileTown
(
Integer
.
parseInt
(
vo
.
getFileTown
()));
}
else
{
employee
.
setFileTown
(
null
);
}
}
if
(
Common
.
isNotNull
(
vo
.
getMobile
()))
{
employee
.
setEmpPhone
(
vo
.
getMobile
());
}
tEmployeeInfoMapper
.
updateSocialInfoById
(
employee
);
}
TEmployeeProject
project
=
baseMapper
.
selectOne
(
Wrappers
.<
TEmployeeProject
>
query
().
lambda
()
.
eq
(
TEmployeeProject:
:
getDeptNo
,
vo
.
getDepartNo
())
.
eq
(
TEmployeeProject:
:
getEmpIdcard
,
vo
.
getEmpIdCard
())
.
eq
(
TEmployeeProject:
:
getDeleteFlag
,
CommonConstants
.
ZERO_STRING
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
// : 0 无社保|无公积金 1 处理中 2.部分购买 3.正常 4.已派减
if
(
Common
.
isNotNull
(
project
))
{
if
(
Common
.
isNotNull
(
vo
.
getSocialStatus
()))
{
project
.
setSocialStatus
(
Integer
.
parseInt
(
vo
.
getSocialStatus
()));
}
if
(
Common
.
isNotNull
(
vo
.
getFundStatus
()))
{
project
.
setFundStatus
(
Integer
.
parseInt
(
vo
.
getFundStatus
()));
}
baseMapper
.
updateSocialAndFundStatusById
(
project
);
if
(
Common
.
isNotNull
(
handlerInfo
))
{
handlerInfo
.
setOperInfo
(
workInfo
.
substring
(
0
,
workInfo
.
length
()
-
1
));
handlerInfo
.
setReason
(
failueInfo
.
length
()
>
1
?
failueInfo
.
toString
()
:
""
);
handlerInfo
.
setOperResult
(
failueInfo
.
length
()
>
1
?
"1"
:
"2"
);
workHandlerInfoService
.
updateById
(
handlerInfo
);
}
}
return
true
;
...
...
@@ -1854,6 +1855,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
audit
.
setRootName
(
"社保派减联动减合同"
);
audit
.
setLinkId
(
tEmployeeContractInfo
.
getId
());
audit
.
setLinkType
(
CommonConstants
.
ONE_INT
);
audit
.
setCreateName
(
tEmployeeContractInfo
.
getAuditUserName
());
tEmployeeContractAuditService
.
save
(
audit
);
}
}
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchReduceVo.java
View file @
a3c0c2c7
...
...
@@ -134,5 +134,6 @@ public class TDispatchReduceVo extends RowIndex implements Serializable {
@Length
(
max
=
1
,
message
=
"是否同步终止合同、减项、减档不能超过1个字符"
)
@ExcelAttribute
(
name
=
"是否同步终止合同、减项、减档"
,
maxLength
=
1
,
readConverterExp
=
"0=是,1=否"
)
@Schema
(
description
=
"是否同步终止合同、减项、减档"
,
name
=
"changeContractAndEmployee"
)
@ExcelProperty
(
"是否同步终止合同、减项、减档"
)
private
String
changeContractAndEmployee
;
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
a3c0c2c7
...
...
@@ -3956,8 +3956,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
&&
(
CommonConstants
.
FOUR_STRING
.
equals
(
sf
.
getFundStatus
())
||
CommonConstants
.
NINE_STRING
.
equals
(
sf
.
getFundStatus
()))))
{
UpProjectSocialFundVo
vo
=
new
UpProjectSocialFundVo
();
// 社保状态 社保状态(字典): 0 无社保 1 处理中 2.部分购买 3.正常 4.已派减
initSocialFundStatus
(
socialInfo
,
providentFund
,
vo
,
sf
);
if
(
Common
.
isNotNull
(
dis
.
getChangeContractAndEmployee
())
&&
CommonConstants
.
ZERO_STRING
.
equals
(
dis
.
getChangeContractAndEmployee
()))
{
&&
CommonConstants
.
ZERO_STRING
.
equals
(
dis
.
getChangeContractAndEmployee
())
&&
(
Common
.
isNotNull
(
vo
.
getSocialStatus
())
||
Common
.
isNotNull
(
vo
.
getFundStatus
())))
{
vo
.
setEmpIdCard
(
dis
.
getEmpIdcard
());
vo
.
setDepartNo
(
dis
.
getSettleDomainCode
());
vo
.
setChangeContractAndEmployee
(
dis
.
getChangeContractAndEmployee
());
...
...
@@ -3972,9 +3975,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
errorList
.
add
(
new
ErrorMessage
(-
1
,
vo
.
getEmpIdCard
()
+
DispatchConstants
.
DISPATCH_SYN_DOC_EXE
,
CommonConstants
.
RED
,
dis
.
getEmpName
()));
continue
;
}
}
// 派减公积金办理失败不同步档案的相关字段信息
if
(!(
CommonConstants
.
ONE_STRING
.
equals
(
dis
.
getType
())
// 派减公积金办理失败不同步档案的相关字段信息
}
else
if
(!(
CommonConstants
.
ONE_STRING
.
equals
(
dis
.
getType
())
&&
CommonConstants
.
ONE_INT
==
flag
&&
CommonConstants
.
ONE_STRING
.
equals
(
typeSub
))){
UpProjectSocialFundVo
vo
=
new
UpProjectSocialFundVo
();
...
...
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