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
4791f720
Commit
4791f720
authored
Mar 09, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
合同续签待办-fxj
parent
944931dc
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
4 deletions
+15
-4
TEmployeeContractPreNewServiceImpl.java
...ives/service/impl/TEmployeeContractPreNewServiceImpl.java
+15
-4
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractPreNewServiceImpl.java
View file @
4791f720
...
@@ -630,7 +630,7 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
...
@@ -630,7 +630,7 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
}
}
}
}
if
(
CommonConstants
.
TWENTY_STRING
.
equals
(
preVo
.
getContractType
())){
if
(
CommonConstants
.
TWENTY_STRING
.
equals
(
preVo
.
getContractType
())){
//处理劳务协议
//处理劳务协议
: 先看上一份合同是否为劳务协议,如果是取值上一份合同的劳务协议结束日期
preVo
.
setDispatchPeriodStart
(
DateUtil
.
addDayByDate
(
contract
.
getContractEnd
(),
1
));
preVo
.
setDispatchPeriodStart
(
DateUtil
.
addDayByDate
(
contract
.
getContractEnd
(),
1
));
if
(
Common
.
isNotNull
(
preVo
.
getDispatchPeriodYear
())
&&
Common
.
isNotNull
(
preVo
.
getDispatchPeriodMonth
())){
if
(
Common
.
isNotNull
(
preVo
.
getDispatchPeriodYear
())
&&
Common
.
isNotNull
(
preVo
.
getDispatchPeriodMonth
())){
vo
=
new
TEmployeeContractDateVo
();
vo
=
new
TEmployeeContractDateVo
();
...
@@ -1378,13 +1378,24 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
...
@@ -1378,13 +1378,24 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
if
(
Common
.
isEmpty
(
contractIds
))
{
if
(
Common
.
isEmpty
(
contractIds
))
{
return
R
.
ok
(
"前一日撤销记录中未找到有效的合同ID"
);
return
R
.
ok
(
"前一日撤销记录中未找到有效的合同ID"
);
}
}
List
<
TEmployeeContractInfo
>
contracts
=
contractInfoMapper
.
selectList
(
Wrappers
.<
TEmployeeContractInfo
>
query
()
.
lambda
()
.
in
(
TEmployeeContractInfo:
:
getId
,
contractIds
));
List
<
String
>
preNewIds
=
null
;
if
(!
Common
.
isEmpty
(
contracts
)){
preNewIds
=
contracts
.
stream
()
.
map
(
TEmployeeContractInfo:
:
getPreNewId
)
.
filter
(
Objects:
:
nonNull
)
.
collect
(
Collectors
.
toList
());
}
if
(
Common
.
isEmpty
(
preNewIds
))
{
return
R
.
ok
(
"前一日撤销记录中未找到有效的PreNewID"
);
}
// 根据合同ID查询对应的合同预签订记录
// 根据合同ID查询对应的合同预签订记录
List
<
TEmployeeContractPreNew
>
revokedContracts
=
baseMapper
.
selectList
(
Wrappers
.<
TEmployeeContractPreNew
>
query
()
List
<
TEmployeeContractPreNew
>
revokedContracts
=
baseMapper
.
selectList
(
Wrappers
.<
TEmployeeContractPreNew
>
query
()
.
lambda
()
.
lambda
()
.
in
(
TEmployeeContractPreNew:
:
get
ContractId
,
contract
Ids
)
.
in
(
TEmployeeContractPreNew:
:
get
Id
,
preNew
Ids
)
.
eq
(
TEmployeeContractPreNew:
:
getProcessStatus
,
CommonConstants
.
ELEVEN_STRING
)
// 撤销签署-系统自动撤销
.
eq
(
TEmployeeContractPreNew:
:
getProcessStatus
,
CommonConstants
.
ELEVEN_STRING
)
// 撤销签署-系统自动撤销
.
eq
(
TEmployeeContractPreNew:
:
getSignType
,
CommonConstants
.
ZERO_STRING
)
// 线下签
.
eq
(
TEmployeeContractPreNew:
:
getChangeTypeReason
,
"超时未签署自行变更为线下签"
)
.
eq
(
TEmployeeContractPreNew:
:
getChangeTypeReason
,
"超时未签署自行变更为线下签"
)
);
);
...
...
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