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
68194b46
Commit
68194b46
authored
Mar 27, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.8-状态
parent
7638cff7
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
2 deletions
+7
-2
TPreEmpMainServiceImpl.java
...v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
+7
-2
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
View file @
68194b46
...
@@ -1967,6 +1967,11 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -1967,6 +1967,11 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
emp
.
setCreateBy
(
user
.
getId
());
emp
.
setCreateBy
(
user
.
getId
());
emp
.
setCreateName
(
user
.
getNickname
());
emp
.
setCreateName
(
user
.
getNickname
());
emp
.
setCreateTime
(
LocalDateTime
.
now
());
emp
.
setCreateTime
(
LocalDateTime
.
now
());
emp
.
setFileProvince
(
tPreEmployeeInfo
.
getFileProvince
());
emp
.
setFileCity
(
tPreEmployeeInfo
.
getFileCity
());
emp
.
setFileTown
(
tPreEmployeeInfo
.
getFileTown
());
}
else
{
}
else
{
BeanUtil
.
copyProperties
(
tPreEmployeeInfo
,
emp
,
ID
);
BeanUtil
.
copyProperties
(
tPreEmployeeInfo
,
emp
,
ID
);
}
}
...
@@ -1992,7 +1997,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -1992,7 +1997,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
tPreEmployeeProject
.
setTryPeriod
(
""
);
tPreEmployeeProject
.
setTryPeriod
(
""
);
}
}
// 2024-7-23 11:52:33 金龙弟预张倩倩认为不同步项目的合同信息
// 2024-7-23 11:52:33 金龙弟预张倩倩认为不同步项目的合同信息
// String[
] ignoreProperties = new String[]{"id", "contractType", "workingHours", "post", "enjoinDate", "tryPeriod"}
// String[
ignoreProperties new Strin{"id", "contractType", "workingHours", "post", "enjoinDate", "tryPeriod"
// 2025-3-27 15:13:30 张倩倩认为要同步项目的合同信息
// 2025-3-27 15:13:30 张倩倩认为要同步项目的合同信息
String
[]
ignoreProperties
=
new
String
[]{
"id"
,
"workingHours"
,
"tryPeriod"
};
String
[]
ignoreProperties
=
new
String
[]{
"id"
,
"workingHours"
,
"tryPeriod"
};
BeanUtil
.
copyProperties
(
tPreEmployeeProject
,
project
,
ignoreProperties
);
BeanUtil
.
copyProperties
(
tPreEmployeeProject
,
project
,
ignoreProperties
);
...
@@ -2427,7 +2432,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -2427,7 +2432,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
tPreEmployeeProject
.
setTryPeriod
(
""
);
tPreEmployeeProject
.
setTryPeriod
(
""
);
}
}
// 2024-7-23 11:52:33 金龙弟预张倩倩认为不同步项目的合同信息
// 2024-7-23 11:52:33 金龙弟预张倩倩认为不同步项目的合同信息
//String
[] ignoreProperties = new String[]{"id", "contractType", "workingHours", "post", "enjoinDate", "tryPeriod"}
//String
] ignoreProperties = new String]"id", "contractType", "workingHours", "post", "enjoinDate", "tryPeriod"
// 2025-3-27 15:13:30 张倩倩认为要同步项目的合同信息
// 2025-3-27 15:13:30 张倩倩认为要同步项目的合同信息
String
[]
ignoreProperties
=
new
String
[]{
"id"
,
"workingHours"
,
"tryPeriod"
};
String
[]
ignoreProperties
=
new
String
[]{
"id"
,
"workingHours"
,
"tryPeriod"
};
...
...
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