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
1419a49b
Commit
1419a49b
authored
Mar 02, 2026
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.20' into MVP1.7.20
parents
eea786b4
0d194f70
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
DoFascTask.java
...om/yifu/cloud/plus/v1/yifu/archives/utils/DoFascTask.java
+2
-2
TDispatchInfoPreServiceImpl.java
...yifu/social/service/impl/TDispatchInfoPreServiceImpl.java
+2
-0
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/utils/DoFascTask.java
View file @
1419a49b
...
...
@@ -145,7 +145,7 @@ public class DoFascTask {
preNew
.
setRequestId
(
""
);
}
preNew
.
setSignFlag
(
CommonConstants
.
ZERO_STRING
);
preNew
.
setRevokeReason
(
terminationNote
);
preNew
.
setRevokeReason
(
Common
.
isEmpty
(
terminationNote
)?
CommonConstants
.
EMPTY_STRING
:
terminationNote
);
tEmployeeContractPreNewService
.
updateById
(
preNew
);
}
//如果存在合同申请审核数据,将状态更新成5撤销签署
...
...
@@ -158,7 +158,7 @@ public class DoFascTask {
||
fddEvent
.
equals
(
"sign-task-fill-rejected"
))
{
// 3:签署任务参与方签署失败事件
preNew
.
setProcessStatus
(
CommonConstants
.
dingleDigitStrArray
[
7
]);
preNew
.
setErrorInfo
(
terminationNote
);
preNew
.
setErrorInfo
(
Common
.
isEmpty
(
terminationNote
)?
CommonConstants
.
EMPTY_STRING
:
terminationNote
);
preNew
.
setErrorTime
(
new
Date
());
preNew
.
setRequestId
(
""
);
tEmployeeContractPreNewService
.
updateById
(
preNew
);
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoPreServiceImpl.java
View file @
1419a49b
...
...
@@ -217,6 +217,7 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
for
(
TSocialPreDetailVo
vo
:
registrationPreVo
.
getExitSocialInfoList
())
{
TSocialPreDetail
preDetal
=
new
TSocialPreDetail
();
BeanUtils
.
copyProperties
(
vo
,
preDetal
);
preDetal
.
setId
(
null
);
socialPreDetailService
.
save
(
preDetal
);
}
//批量删除社保待购买列表中的待确认、待派单、派单失败、审核、办理失败的数据
...
...
@@ -292,6 +293,7 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
for
(
TFundPreDetailVo
vo
:
registrationPreVo
.
getExitFundInfoList
())
{
TFundPreDetail
preDetal
=
new
TFundPreDetail
();
BeanUtils
.
copyProperties
(
vo
,
preDetal
);
preDetal
.
setId
(
null
);
fundPreDetailService
.
save
(
preDetal
);
}
//批量删除公积金待购买列表中的待确认、待派单、派单失败、审核、办理失败的数据
...
...
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