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
bac74407
Commit
bac74407
authored
Nov 29, 2022
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
30号版本:档案合同、商险、薪资状态;缴费库反馈列;合同提交的直接审核优化等
parent
c167dc18
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
37 additions
and
4 deletions
+37
-4
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+37
-4
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
bac74407
...
...
@@ -344,7 +344,9 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
this
.
setAuditInfo
(
tEmployeeContractInfo
);
// 更新档案合同状态
this
.
updateEmployeeContractStatus
(
tEmployeeContractInfo
.
getEmpId
());
if
(
tEmployeeContractInfo
.
getAuditStatus
()
==
CommonConstants
.
TWO_INT
)
{
this
.
updateEmployeeContractStatus
(
tEmployeeContractInfo
);
}
return
R
.
ok
(
null
,
CommonConstants
.
SAVE_SUCCESS
);
}
...
...
@@ -442,11 +444,42 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
tEmployeeContractAuditService
.
save
(
audit
);
}
private
void
updateEmployeeContractStatus
(
String
empId
)
{
//查看未作废合同数
TEmployeeInfo
employeeInfo
=
tEmployeeInfoMapper
.
selectById
(
empId
);
private
void
updateEmployeeContractStatus
(
TEmployeeContractInfo
tEmployeeContractInfo
)
{
TEmployeeInfo
employeeInfo
=
tEmployeeInfoMapper
.
selectById
(
tEmployeeContractInfo
.
getEmpId
());
if
(
employeeInfo
!=
null
)
{
employeeInfo
.
setContractStatus
(
CommonConstants
.
ONE_INT
);
if
(
Common
.
isNotNull
(
tEmployeeContractInfo
.
getSituation
())
&&
(
EmployeeConstants
.
SITUATION_SIX
.
equals
(
tEmployeeContractInfo
.
getSituation
())
||
EmployeeConstants
.
SITUATION_SEVEN
.
equals
(
tEmployeeContractInfo
.
getSituation
())))
{
TEmployeeContractInfo
contractInfoInUse
=
this
.
getOne
(
Wrappers
.<
TEmployeeContractInfo
>
query
()
.
lambda
().
eq
(
TEmployeeContractInfo:
:
getEmpId
,
tEmployeeContractInfo
.
getEmpId
())
.
and
(
obj
->
obj
.
ge
(
TEmployeeContractInfo:
:
getContractEnd
,
DateUtil
.
getThisDayByPatten
(
"yyyy-MM-dd"
))
.
or
().
isNull
(
TEmployeeContractInfo:
:
getContractEnd
))
.
eq
(
TEmployeeContractInfo:
:
getDeleteFlag
,
CommonConstants
.
ZERO_INT
)
.
eq
(
TEmployeeContractInfo:
:
getInUse
,
CommonConstants
.
ZERO_INT
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
contractInfoInUse
!=
null
)
{
employeeInfo
.
setContractStatus
(
CommonConstants
.
ONE_INT
);
}
else
{
employeeInfo
.
setContractStatus
(
CommonConstants
.
TWO_INT
);
}
}
tEmployeeInfoMapper
.
updateById
(
employeeInfo
);
}
TEmployeeProject
tEmployeeProject
=
tEmployeeProjectService
.
getOne
(
Wrappers
.<
TEmployeeProject
>
query
()
.
lambda
().
eq
(
TEmployeeProject:
:
getEmpId
,
tEmployeeContractInfo
.
getEmpId
())
.
eq
(
TEmployeeProject:
:
getDeptId
,
tEmployeeContractInfo
.
getSettleDomain
())
.
eq
(
TEmployeeProject:
:
getProjectStatus
,
CommonConstants
.
ZERO_INT
)
.
eq
(
TEmployeeProject:
:
getDeleteFlag
,
CommonConstants
.
STATUS_NORMAL
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
tEmployeeProject
!=
null
)
{
tEmployeeProject
.
setContractStatus
(
CommonConstants
.
ONE_INT
);
if
(
Common
.
isNotNull
(
tEmployeeContractInfo
.
getSituation
())
&&
(
EmployeeConstants
.
SITUATION_SIX
.
equals
(
tEmployeeContractInfo
.
getSituation
())
||
EmployeeConstants
.
SITUATION_SEVEN
.
equals
(
tEmployeeContractInfo
.
getSituation
())))
{
tEmployeeProject
.
setContractStatus
(
CommonConstants
.
TWO_INT
);
}
tEmployeeProjectService
.
updateById
(
tEmployeeProject
);
}
}
@Override
...
...
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