Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
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
35f3cbf9
You need to sign in or sign up before continuing.
Commit
35f3cbf9
authored
Jun 25, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.12' into MVP1.7.12
parents
7c099d37
efc5b181
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
0 deletions
+5
-0
TGzEmpInfoServiceImpl.java
.../v1/yifu/archives/service/impl/TGzEmpInfoServiceImpl.java
+5
-0
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TGzEmpInfoServiceImpl.java
View file @
35f3cbf9
...
@@ -883,6 +883,8 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
...
@@ -883,6 +883,8 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
isNew
=
true
;
isNew
=
true
;
project
=
new
TEmployeeProject
();
project
=
new
TEmployeeProject
();
}
}
// 瓜子默认外包 2025-6-24 10:26:24 倩倩确认的
project
.
setEmpNatrue
(
CommonConstants
.
ZERO_STRING
);
project
.
setProjectStatus
(
CommonConstants
.
ZERO_INT
);
project
.
setProjectStatus
(
CommonConstants
.
ZERO_INT
);
if
(
Common
.
isEmpty
(
project
.
getStatus
()))
{
if
(
Common
.
isEmpty
(
project
.
getStatus
()))
{
project
.
setStatus
(
CommonConstants
.
ZERO_INT
);
project
.
setStatus
(
CommonConstants
.
ZERO_INT
);
...
@@ -913,6 +915,7 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
...
@@ -913,6 +915,7 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
if
(
Common
.
isNotNull
(
tSettleDomain
))
{
if
(
Common
.
isNotNull
(
tSettleDomain
))
{
insTEmployeePro
.
setDeptId
(
tSettleDomain
.
getId
());
insTEmployeePro
.
setDeptId
(
tSettleDomain
.
getId
());
insTEmployeePro
.
setDeptName
(
tSettleDomain
.
getDepartName
());
insTEmployeePro
.
setDeptName
(
tSettleDomain
.
getDepartName
());
insTEmployeePro
.
setDeptNo
(
tSettleDomain
.
getDepartNo
());
insTEmployeePro
.
setBusinessPrimaryType
(
tSettleDomain
.
getBusinessPrimaryType
());
insTEmployeePro
.
setBusinessPrimaryType
(
tSettleDomain
.
getBusinessPrimaryType
());
insTEmployeePro
.
setBusinessSecondType
(
tSettleDomain
.
getBusinessSecondType
());
insTEmployeePro
.
setBusinessSecondType
(
tSettleDomain
.
getBusinessSecondType
());
insTEmployeePro
.
setBusinessThirdType
(
tSettleDomain
.
getBusinessThirdType
());
insTEmployeePro
.
setBusinessThirdType
(
tSettleDomain
.
getBusinessThirdType
());
...
@@ -925,6 +928,7 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
...
@@ -925,6 +928,7 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
//员工编码生成规则
//员工编码生成规则
if
(
tEmployeeInfo
!=
null
)
{
if
(
tEmployeeInfo
!=
null
)
{
insTEmployeePro
.
setEmpId
(
tEmployeeInfo
.
getId
());
insTEmployeePro
.
setEmpId
(
tEmployeeInfo
.
getId
());
insTEmployeePro
.
setEmpIdcard
(
tEmployeeInfo
.
getEmpIdcard
());
insTEmployeePro
.
setEmpName
(
tEmployeeInfo
.
getEmpName
());
insTEmployeePro
.
setEmpName
(
tEmployeeInfo
.
getEmpName
());
insTEmployeePro
.
setEmpCode
(
tEmployeeInfo
.
getEmpCode
());
insTEmployeePro
.
setEmpCode
(
tEmployeeInfo
.
getEmpCode
());
}
}
...
@@ -932,6 +936,7 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
...
@@ -932,6 +936,7 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
insTEmployeePro
.
setCreateTime
(
LocalDateTime
.
now
());
insTEmployeePro
.
setCreateTime
(
LocalDateTime
.
now
());
insTEmployeePro
.
setCreateName
(
user
.
getNickname
());
insTEmployeePro
.
setCreateName
(
user
.
getNickname
());
insTEmployeePro
.
setProjectSource
(
CommonConstants
.
NINE_STRING
);
insTEmployeePro
.
setProjectSource
(
CommonConstants
.
NINE_STRING
);
insTEmployeePro
.
setContractType
(
""
);
}
}
/**
/**
...
...
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