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
00f054a2
Commit
00f054a2
authored
Jul 05, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.6.6' into MVP1.6.6
parents
356edcf8
78d4ee82
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
2 deletions
+12
-2
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+9
-2
TPreEmpMainServiceImpl.java
...v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
+3
-0
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
00f054a2
...
...
@@ -760,7 +760,10 @@ 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
(
contractInfo
.
getContractType
());
// 渲染字典值
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
()));
preEmployeeProject
.
setWorkingHours
(
contractInfo
.
getWorkingHours
());
preEmployeeProject
.
setPost
(
contractInfo
.
getPost
());
preEmployeeProject
.
setEnjoinDate
(
contractInfo
.
getContractStart
());
...
...
@@ -1597,6 +1600,10 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
List
<
TEmployeeContractInfo
>
contractInfoList
;
List
<
TEmployeeContractInfo
>
contractInfoListZt
;
TWorkHandlerInfo
handlerInfo
;
// 渲染字典值
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
)
{
...
...
@@ -1648,7 +1655,7 @@ 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
(
contract
.
getContractType
(
));
preEmployeeProject
.
setContractType
(
null
==
dicObj
?
""
:
dicObj
.
get
(
contract
.
getContractName
()
));
preEmployeeProject
.
setWorkingHours
(
contract
.
getWorkingHours
());
preEmployeeProject
.
setPost
(
contract
.
getPost
());
preEmployeeProject
.
setEnjoinDate
(
contract
.
getContractStart
());
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
View file @
00f054a2
...
...
@@ -1185,6 +1185,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
tEmpContactInfo
.
setCreateName
(
user
.
getNickname
());
tEmpContactInfo
.
setCreateTime
(
LocalDateTime
.
now
());
}
if
(
Common
.
isEmpty
(
tEmpContactInfo
.
getEmpIdcard
())
&&
Common
.
isNotNull
(
emp
)){
tEmpContactInfo
.
setEmpIdcard
(
emp
.
getEmpIdcard
());
}
tEmpContactInfoService
.
saveOrUpdate
(
tEmpContactInfo
);
}
// 预入职-员工伤残信息表
...
...
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