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
20b36bd4
Commit
20b36bd4
authored
Jun 30, 2023
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化修改
parent
e1ca3176
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
1 deletion
+5
-1
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+5
-1
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
20b36bd4
...
...
@@ -2792,7 +2792,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
//单减社保,判断是否有正常的公积金
if
(
Common
.
isNotNull
(
excel
.
getSocialReduceDate
())
&&
Common
.
isEmpty
(
excel
.
getFundReduceDate
())
&&
(
CommonConstants
.
THREE_STRING
.
equals
(
socialFund
.
getFundStatus
())
||
CommonConstants
.
EIGHT_STRING
.
equals
(
socialFund
.
getFundStatus
()))
||
CommonConstants
.
EIGHT_STRING
.
equals
(
socialFund
.
getFundStatus
())
||
CommonConstants
.
ZERO_STRING
.
equals
(
socialFund
.
getFundStatus
())
||
CommonConstants
.
ONE_STRING
.
equals
(
socialFund
.
getFundStatus
())
||
CommonConstants
.
FIVE_STRING
.
equals
(
socialFund
.
getFundStatus
())
||
CommonConstants
.
SIX_STRING
.
equals
(
socialFund
.
getFundStatus
()))
&&
CommonConstants
.
ZERO_STRING
.
equals
(
excel
.
getChangeContractAndEmployee
()))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_FUND_NOT_EMPTY_CHANGE
)));
continue
;
...
...
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