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
d0a94b0e
Commit
d0a94b0e
authored
Jan 24, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
见费出单逻辑-fxj
parent
873a8555
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
15 deletions
+10
-15
TSettleDomainController.java
.../v1/yifu/archives/controller/TSettleDomainController.java
+2
-2
EmployeeRegistrationPreServiceImpl.java
...ives/service/impl/EmployeeRegistrationPreServiceImpl.java
+5
-5
TSettleDomainServiceImpl.java
.../yifu/archives/service/impl/TSettleDomainServiceImpl.java
+1
-1
TDispatchInfoPreServiceImpl.java
...yifu/social/service/impl/TDispatchInfoPreServiceImpl.java
+2
-7
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TSettleDomainController.java
View file @
d0a94b0e
...
...
@@ -237,7 +237,7 @@ public class TSettleDomainController {
TSettleDomainListVo
listVo
=
new
TSettleDomainListVo
();
listVo
.
setListSelectVO
(
list
);
if
(
Common
.
isNotNull
(
list
)){
listVo
.
setMapSelectVo
(
list
.
stream
().
collect
(
Collectors
.
toMap
(
TSettleDomain:
:
getDepartNo
,
k
->
k
)));
listVo
.
setMapSelectVo
(
list
.
stream
().
collect
(
Collectors
.
toMap
(
TSettleDomain:
:
getDepartNo
,
k
->
k
,
(
existing
,
replacement
)
->
existing
)));
}
return
listVo
;
}
...
...
@@ -255,7 +255,7 @@ public class TSettleDomainController {
TSettleDomainListVo
listVo
=
new
TSettleDomainListVo
();
listVo
.
setListSelectVO
(
list
);
if
(
Common
.
isNotNull
(
list
)){
listVo
.
setMapSelectVo
(
list
.
stream
().
collect
(
Collectors
.
toMap
(
TSettleDomain:
:
getId
,
k
->
k
)));
listVo
.
setMapSelectVo
(
list
.
stream
().
collect
(
Collectors
.
toMap
(
TSettleDomain:
:
getId
,
k
->
k
,
(
existing
,
replacement
)
->
existing
)));
}
return
listVo
;
}
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/EmployeeRegistrationPreServiceImpl.java
View file @
d0a94b0e
...
...
@@ -285,7 +285,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
//处理公积金待办信息
booleanR
=
socialDaprUtils
.
deleteUnProcessFundPreInfo
(
updatePre
.
getId
());
if
(
null
!=
booleanR
&&
booleanR
.
getData
().
booleanValue
()){
if
(
sb
.
length
()
>
0
){
if
(
sb
.
length
()
==
0
){
sb
.
append
(
"公积金"
);
}
else
{
sb
.
append
(
"/公积金"
);
...
...
@@ -296,7 +296,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
insuranceSearchVo
.
setRegisterId
(
updatePre
.
getId
());
booleanR
=
insuranceDaprUtil
.
delInsurancePreByRegisterId
(
insuranceSearchVo
);
if
(
null
!=
booleanR
&&
booleanR
.
getData
().
booleanValue
()){
if
(
sb
.
length
()
>
0
){
if
(
sb
.
length
()
==
0
){
sb
.
append
(
"商险"
);
}
else
{
sb
.
append
(
"/商险"
);
...
...
@@ -306,10 +306,10 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
int
res
=
contractPreMapper
.
delete
(
Wrappers
.<
TEmployeeContractPre
>
query
().
lambda
()
.
eq
(
TEmployeeContractPre:
:
getRegisterId
,
updatePre
.
getId
()));
if
(
res
>
0
){
if
(
sb
.
length
()
>
0
){
sb
.
append
(
"/合同"
);
}
else
{
if
(
sb
.
length
()
==
0
){
sb
.
append
(
"合同"
);
}
else
{
sb
.
append
(
"/合同"
);
}
}
}
catch
(
Exception
e
)
{
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TSettleDomainServiceImpl.java
View file @
d0a94b0e
...
...
@@ -422,7 +422,7 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
List
<
TSettleDomain
>
voList
=
baseMapper
.
getSettleInfoByCodes
(
codes
);
TSettleDomainListVo
setMap
=
new
TSettleDomainListVo
();
if
(
Common
.
isNotNull
(
voList
)){
setMap
.
setMapVO
(
voList
.
stream
().
collect
(
Collectors
.
toMap
(
TSettleDomain:
:
getDepartNo
,
k
->
k
)));
setMap
.
setMapVO
(
voList
.
stream
().
collect
(
Collectors
.
toMap
(
TSettleDomain:
:
getDepartNo
,
k
->
k
,
(
existing
,
replacement
)
->
existing
)));
}
return
setMap
;
}
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoPreServiceImpl.java
View file @
d0a94b0e
...
...
@@ -452,25 +452,20 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
@Override
public
Boolean
deleteUnProcessSocialPreInfo
(
String
id
)
{
//删除未处理的社保待购买信息
this
.
remove
(
Wrappers
.<
TDispatchInfoPre
>
query
().
lambda
()
return
this
.
remove
(
Wrappers
.<
TDispatchInfoPre
>
query
().
lambda
()
.
eq
(
TDispatchInfoPre:
:
getTypeSub
,
CommonConstants
.
ZERO_STRING
)
.
in
(
TDispatchInfoPre:
:
getProcessStatus
,
Arrays
.
asList
(
"0"
,
"1"
,
"2"
,
"4"
,
"8"
))
.
eq
(
TDispatchInfoPre:
:
getRegisterId
,
id
));
return
socialPreDetailService
.
remove
(
Wrappers
.<
TSocialPreDetail
>
query
().
lambda
()
.
eq
(
TSocialPreDetail:
:
getRegisterId
,
id
));
}
@Override
public
Boolean
deleteUnProcessFundPreInfo
(
String
id
)
{
//删除未处理的公积金待购买信息
this
.
remove
(
Wrappers
.<
TDispatchInfoPre
>
query
().
lambda
()
return
this
.
remove
(
Wrappers
.<
TDispatchInfoPre
>
query
().
lambda
()
.
eq
(
TDispatchInfoPre:
:
getTypeSub
,
CommonConstants
.
ONE_STRING
)
.
in
(
TDispatchInfoPre:
:
getProcessStatus
,
Arrays
.
asList
(
"0"
,
"1"
,
"2"
,
"4"
,
"8"
))
.
eq
(
TDispatchInfoPre:
:
getRegisterId
,
id
));
return
socialPreDetailService
.
remove
(
Wrappers
.<
TSocialPreDetail
>
query
().
lambda
()
.
eq
(
TSocialPreDetail:
:
getRegisterId
,
id
));
}
@Override
...
...
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