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
34144adc
Commit
34144adc
authored
Nov 03, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.16' into MVP1.7.16
parents
68cb0a91
8f9ad1ea
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
4 deletions
+8
-4
TEmployeeContractPreServiceImpl.java
...rchives/service/impl/TEmployeeContractPreServiceImpl.java
+2
-2
DoFascTask.java
...om/yifu/cloud/plus/v1/yifu/archives/utils/DoFascTask.java
+6
-2
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractPreServiceImpl.java
View file @
34144adc
...
@@ -949,9 +949,9 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
...
@@ -949,9 +949,9 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
List
<
TEmployeeContractPre
>
revokedContracts
=
baseMapper
.
selectList
(
Wrappers
.<
TEmployeeContractPre
>
query
()
List
<
TEmployeeContractPre
>
revokedContracts
=
baseMapper
.
selectList
(
Wrappers
.<
TEmployeeContractPre
>
query
()
.
lambda
()
.
lambda
()
.
in
(
TEmployeeContractPre:
:
getContractId
,
contractIds
)
.
in
(
TEmployeeContractPre:
:
getContractId
,
contractIds
)
.
eq
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
ONE_STRING
)
// 待发起
.
eq
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
ELEVEN_STRING
)
// 撤销签署-系统自动撤销
.
eq
(
TEmployeeContractPre:
:
getSignType
,
CommonConstants
.
ONE_STRING
)
// 线下签
.
eq
(
TEmployeeContractPre:
:
getSignType
,
CommonConstants
.
ONE_STRING
)
// 线下签
.
eq
(
TEmployeeContractPre:
:
get
Revok
eReason
,
"超时未签署自行变更为线下签"
)
.
eq
(
TEmployeeContractPre:
:
get
ChangeTyp
eReason
,
"超时未签署自行变更为线下签"
)
);
);
if
(
Common
.
isEmpty
(
revokedContracts
))
{
if
(
Common
.
isEmpty
(
revokedContracts
))
{
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/utils/DoFascTask.java
View file @
34144adc
...
@@ -130,7 +130,9 @@ public class DoFascTask {
...
@@ -130,7 +130,9 @@ public class DoFascTask {
// 加日志
// 加日志
this
.
saveAuditLogFail
(
pre
,
"撤销签署成功"
,
terminationNote
);
this
.
saveAuditLogFail
(
pre
,
"撤销签署成功"
,
terminationNote
);
}
}
if
(!
CommonConstants
.
ELEVEN_STRING
.
equals
(
pre
.
getProcessStatus
()))
{
pre
.
setProcessStatus
(
CommonConstants
.
TEN_STRING
);
pre
.
setProcessStatus
(
CommonConstants
.
TEN_STRING
);
}
pre
.
setSignFlag
(
CommonConstants
.
ZERO_STRING
);
pre
.
setSignFlag
(
CommonConstants
.
ZERO_STRING
);
pre
.
setRevokeReason
(
terminationNote
);
pre
.
setRevokeReason
(
terminationNote
);
tEmployeeContractPreService
.
updateById
(
pre
);
tEmployeeContractPreService
.
updateById
(
pre
);
...
@@ -202,7 +204,9 @@ public class DoFascTask {
...
@@ -202,7 +204,9 @@ public class DoFascTask {
// 加日志
// 加日志
this
.
saveAuditLogFail
(
preHistory
,
"撤销签署成功"
,
terminationNote
);
this
.
saveAuditLogFail
(
preHistory
,
"撤销签署成功"
,
terminationNote
);
}
}
if
(!
CommonConstants
.
ELEVEN_STRING
.
equals
(
preHistory
.
getProcessStatus
()))
{
preHistory
.
setProcessStatus
(
CommonConstants
.
TEN_STRING
);
preHistory
.
setProcessStatus
(
CommonConstants
.
TEN_STRING
);
}
preHistory
.
setSignFlag
(
CommonConstants
.
ZERO_STRING
);
preHistory
.
setSignFlag
(
CommonConstants
.
ZERO_STRING
);
preHistory
.
setRevokeReason
(
terminationNote
);
preHistory
.
setRevokeReason
(
terminationNote
);
tEmployeeContractPreHistoryService
.
updateById
(
preHistory
);
tEmployeeContractPreHistoryService
.
updateById
(
preHistory
);
...
...
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