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
7c57310a
Commit
7c57310a
authored
Jan 29, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.19' into MVP1.7.19
parents
2b13e0c8
1e99229a
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+1
-1
SocialFriendConfig.java
.../cloud/plus/v1/yifu/social/config/SocialFriendConfig.java
+1
-1
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
7c57310a
...
@@ -2449,7 +2449,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
...
@@ -2449,7 +2449,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
}
}
}
}
// 同步处理终止合同
// 同步处理终止合同
(2026-01-29 倩倩:作废、终止的合同审核通过后,将待审核的终止的合同处理为审核不通过,以使得 自动化离职的合同 变为无需处理。未处理作废的合同,后续有需要再追加)
private
void
doZhongZhiContract
(
TEmployeeContractInfo
contractInfo
,
YifuUser
user
)
{
private
void
doZhongZhiContract
(
TEmployeeContractInfo
contractInfo
,
YifuUser
user
)
{
// 1将待审核的变为审核不通过且不在用
// 1将待审核的变为审核不通过且不在用
List
<
TEmployeeContractInfo
>
contractInfoList
=
baseMapper
.
selectList
(
Wrappers
.<
TEmployeeContractInfo
>
query
()
List
<
TEmployeeContractInfo
>
contractInfoList
=
baseMapper
.
selectList
(
Wrappers
.<
TEmployeeContractInfo
>
query
()
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/config/SocialFriendConfig.java
View file @
7c57310a
...
@@ -788,7 +788,7 @@ public class SocialFriendConfig {
...
@@ -788,7 +788,7 @@ public class SocialFriendConfig {
// 人员身份 个人身份 社保必填 默认“职员”
// 人员身份 个人身份 社保必填 默认“职员”
tszdxx
.
put
(
"grsf"
,
"职员"
);
tszdxx
.
put
(
"grsf"
,
"职员"
);
// 工作时间制度 社保必填
// 工作时间制度 社保必填
//
tszdxx.put("gzsjzd", vo.getWorkingHours());
tszdxx
.
put
(
"gzsjzd"
,
vo
.
getWorkingHours
());
// 医保用工形式 医保新参必填 默认“原固定职工”
// 医保用工形式 医保新参必填 默认“原固定职工”
tszdxx
.
put
(
"ybygxs"
,
"原固定职工"
);
tszdxx
.
put
(
"ybygxs"
,
"原固定职工"
);
// 毕业院校
// 毕业院校
...
...
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