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
d6dcde1c
Commit
d6dcde1c
authored
Jun 28, 2023
by
wangzb
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.5.5' into MVP1.5.5
parents
2918df52
aab3f36b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.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 @
d6dcde1c
...
@@ -489,6 +489,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
...
@@ -489,6 +489,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
// 标准合同、劳动派遣合同、其他。————社保公积金都派减,自动审核通过
// 标准合同、劳动派遣合同、其他。————社保公积金都派减,自动审核通过
this
.
judgeAuditStatus
(
tEmployeeContractInfo
,
user
);
this
.
judgeAuditStatus
(
tEmployeeContractInfo
,
user
);
baseMapper
.
updateById
(
tEmployeeContractInfo
);
//如果是否同步终止合同、减项、减档为是则生成同步任务处理清单
//如果是否同步终止合同、减项、减档为是则生成同步任务处理清单
//增加任务处理情况查询表数据
//增加任务处理情况查询表数据
...
@@ -1306,7 +1307,6 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
...
@@ -1306,7 +1307,6 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
&&
Common
.
isNotNull
(
insert
.
getChangeContractAndEmployee
())
&&
Common
.
isNotNull
(
insert
.
getChangeContractAndEmployee
())
&&
CommonConstants
.
ZERO_STRING
.
equals
(
insert
.
getChangeContractAndEmployee
()))
{
&&
CommonConstants
.
ZERO_STRING
.
equals
(
insert
.
getChangeContractAndEmployee
()))
{
changeStatus
(
insert
,
user
);
changeStatus
(
insert
,
user
);
baseMapper
.
updateById
(
insert
);
}
}
}
}
}
}
...
...
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