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
3f153b86
Commit
3f153b86
authored
Oct 29, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-社保自动化相关提交
parent
9f7e9719
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
4 deletions
+11
-4
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+1
-1
TEmployeeContractPreServiceImpl.java
...rchives/service/impl/TEmployeeContractPreServiceImpl.java
+10
-3
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
3f153b86
...
@@ -542,7 +542,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
...
@@ -542,7 +542,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
if
(
Common
.
isNotNull
(
tEmployeeContractInfo
.
getPreId
()))
{
if
(
Common
.
isNotNull
(
tEmployeeContractInfo
.
getPreId
()))
{
TEmployeeContractPre
contractPre
=
contractPreMapper
.
selectOne
(
Wrappers
.<
TEmployeeContractPre
>
query
().
lambda
()
TEmployeeContractPre
contractPre
=
contractPreMapper
.
selectOne
(
Wrappers
.<
TEmployeeContractPre
>
query
().
lambda
()
.
eq
(
TEmployeeContractPre:
:
getId
,
tEmployeeContractInfo
.
getPreId
())
.
eq
(
TEmployeeContractPre:
:
getId
,
tEmployeeContractInfo
.
getPreId
())
.
in
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
contractDIsStatus
)
.
in
(
TEmployeeContractPre:
:
getProcessStatus
,
Arrays
.
asList
(
"0"
,
"1"
,
"3"
,
"5"
,
"7"
,
"11"
)
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
contractPre
))
{
if
(
Common
.
isNotNull
(
contractPre
))
{
//合同状态初始为签署中
//合同状态初始为签署中
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractPreServiceImpl.java
View file @
3f153b86
...
@@ -277,9 +277,16 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
...
@@ -277,9 +277,16 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
@Override
@Override
public
R
dispatcherContract
(
List
<
String
>
idList
,
String
type
)
{
public
R
dispatcherContract
(
List
<
String
>
idList
,
String
type
)
{
List
<
TEmployeeContractPre
>
contractPreList
=
baseMapper
.
selectList
(
Wrappers
.<
TEmployeeContractPre
>
query
()
List
<
TEmployeeContractPre
>
contractPreList
;
.
lambda
().
in
(
TEmployeeContractPre:
:
getId
,
idList
)
if
(
"2"
.
equals
(
type
))
{
.
in
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
contractDIsStatus
));
contractPreList
=
baseMapper
.
selectList
(
Wrappers
.<
TEmployeeContractPre
>
query
()
.
lambda
().
in
(
TEmployeeContractPre:
:
getId
,
idList
)
.
in
(
TEmployeeContractPre:
:
getProcessStatus
,
Arrays
.
asList
(
"0"
,
"1"
,
"3"
,
"5"
,
"7"
,
"11"
)));
}
else
{
contractPreList
=
baseMapper
.
selectList
(
Wrappers
.<
TEmployeeContractPre
>
query
()
.
lambda
().
in
(
TEmployeeContractPre:
:
getId
,
idList
)
.
in
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
contractDIsStatus
));
}
// 如果没有找到任何未处理的合同待派单数据,返回失败消息
// 如果没有找到任何未处理的合同待派单数据,返回失败消息
if
(
Common
.
isEmpty
(
contractPreList
))
{
if
(
Common
.
isEmpty
(
contractPreList
))
{
return
R
.
failed
(
CommonConstants
.
NO_DATA_TO_HANDLE
);
return
R
.
failed
(
CommonConstants
.
NO_DATA_TO_HANDLE
);
...
...
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