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
74d90fb5
Commit
74d90fb5
authored
Jul 08, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.6.6' into MVP1.6.6
parents
67303de6
57356960
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
2 deletions
+17
-2
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+17
-2
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
74d90fb5
...
...
@@ -763,7 +763,14 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
// 渲染字典值
Map
<
String
,
String
>
dicObj
=
(
Map
<
String
,
String
>)
RedisUtil
.
redis
.
opsForValue
().
get
(
CacheConstants
.
DICT_DETAILS
+
CommonConstants
.
COLON_STRING
+
"personnel_type"
);
preEmployeeProject
.
setContractType
(
null
==
dicObj
?
""
:
dicObj
.
get
(
contractInfo
.
getContractName
()));
String
tempStr
=
null
;
for
(
Map
.
Entry
<
String
,
String
>
entry:
dicObj
.
entrySet
()){
if
(
Common
.
isNotNull
(
entry
.
getValue
())
&&
entry
.
getValue
().
equals
(
contractInfo
.
getContractName
())){
tempStr
=
entry
.
getKey
();
break
;
}
}
preEmployeeProject
.
setContractType
(
null
==
tempStr
?
""
:
tempStr
);
preEmployeeProject
.
setWorkingHours
(
contractInfo
.
getWorkingHours
());
preEmployeeProject
.
setPost
(
contractInfo
.
getPost
());
preEmployeeProject
.
setEnjoinDate
(
contractInfo
.
getContractStart
());
...
...
@@ -1604,6 +1611,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
// 渲染字典值
Map
<
String
,
String
>
dicObj
=
(
Map
<
String
,
String
>)
RedisUtil
.
redis
.
opsForValue
().
get
(
CacheConstants
.
DICT_DETAILS
+
CommonConstants
.
COLON_STRING
+
"personnel_type"
);
for
(
TEmployeeContractInfo
contract
:
contractInfos
)
{
i
++;
if
(
contract
.
getAuditStatus
()
!=
CommonConstants
.
ONE_INT
)
{
...
...
@@ -1655,7 +1663,14 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
TPreEmployeeProject
preEmployeeProject
=
preEmployeeProjectMapper
.
selectOne
(
Wrappers
.<
TPreEmployeeProject
>
query
()
.
lambda
().
eq
(
TPreEmployeeProject:
:
getPreMainId
,
empMain
.
getId
()));
if
(
Optional
.
ofNullable
(
preEmployeeProject
).
isPresent
())
{
preEmployeeProject
.
setContractType
(
null
==
dicObj
?
""
:
dicObj
.
get
(
contract
.
getContractName
()));
String
tempStr
=
null
;
for
(
Map
.
Entry
<
String
,
String
>
entry:
dicObj
.
entrySet
()){
if
(
Common
.
isNotNull
(
entry
.
getValue
())
&&
entry
.
getValue
().
equals
(
contract
.
getContractName
())){
tempStr
=
entry
.
getKey
();
break
;
}
}
preEmployeeProject
.
setContractType
(
null
==
tempStr
?
""
:
tempStr
);
preEmployeeProject
.
setWorkingHours
(
contract
.
getWorkingHours
());
preEmployeeProject
.
setPost
(
contract
.
getPost
());
preEmployeeProject
.
setEnjoinDate
(
contract
.
getContractStart
());
...
...
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