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
da329395
Commit
da329395
authored
Apr 07, 2023
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
预派单优化修改
parent
35564446
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
31 deletions
+1
-31
TPreDispatchInfoServiceImpl.java
...yifu/social/service/impl/TPreDispatchInfoServiceImpl.java
+1
-31
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPreDispatchInfoServiceImpl.java
View file @
da329395
...
...
@@ -701,7 +701,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
info
.
setPreStatus
(
CommonConstants
.
ONE_STRING
);
}
int
finalI
=
i
;
if
(
!
errList
.
stream
().
any
Match
(
e
->
hasError
(
e
,
finalI
)))
{
if
(
errList
.
stream
().
none
Match
(
e
->
hasError
(
e
,
finalI
)))
{
baseMapper
.
insert
(
info
);
}
}
...
...
@@ -2283,36 +2283,6 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
}
}
private
R
<
Boolean
>
handleBatchSocialFundReduce
(
TPreDispatchInfo
preInfo
,
TDispatchInfo
dispatchInfo
,
TSocialInfo
social
,
TProvidentFund
fund
)
{
if
(
Common
.
isEmpty
(
preInfo
.
getSocialProvince
())
&&
Common
.
isEmpty
(
preInfo
.
getFundProvince
()))
{
return
R
.
failed
(
"请检查派减缴纳地是否准确!"
);
}
if
(
Common
.
isNotNull
(
preInfo
.
getSocialProvince
()))
{
if
(
null
!=
social
)
{
dispatchInfo
.
setSettleDomain
(
social
.
getSettleDomain
());
dispatchInfo
.
setBelongUnit
(
social
.
getBelongUnit
());
}
else
{
preInfo
.
setPreStatus
(
CommonConstants
.
ONE_STRING
);
preInfo
.
setExceptionContent
(
PreDispatchConstants
.
NO_SOCIAL_CAN_REDUCE
);
baseMapper
.
updatePreStatusById
(
preInfo
);
return
R
.
failed
(
PreDispatchConstants
.
NO_SOCIAL_CAN_REDUCE
);
}
}
if
(
Common
.
isNotNull
(
preInfo
.
getFundProvince
()))
{
if
(
null
!=
fund
)
{
dispatchInfo
.
setSettleDomain
(
fund
.
getSettleDomain
());
dispatchInfo
.
setBelongUnit
(
fund
.
getBelongUnit
());
}
else
{
preInfo
.
setPreStatus
(
CommonConstants
.
ONE_STRING
);
preInfo
.
setExceptionContent
(
PreDispatchConstants
.
NO_FUND_CAN_REDUCE
);
baseMapper
.
updatePreStatusById
(
preInfo
);
return
R
.
failed
(
PreDispatchConstants
.
NO_FUND_CAN_REDUCE
);
}
}
return
null
;
}
/**
* 派减派单时间处理
* @param dispatchInfo
...
...
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