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
f301b0e8
Commit
f301b0e8
authored
May 22, 2023
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.5.4-派单委托备注(合同起缴日期等)
parent
242f95ea
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
12 deletions
+1
-12
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+1
-12
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
f301b0e8
...
...
@@ -2551,17 +2551,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_SOCIAL_BASE_LIMIT_ERROR
)));
return
true
;
}
flag
=
(
Common
.
isNotNull
(
contractDateTemp
)
&&
((!
contractDateTemp
.
equals
(
excel
.
getPensionStart
())
&&
Common
.
isNotNull
(
excel
.
getPensionStart
()))
||
(!
contractDateTemp
.
equals
(
excel
.
getMedicalStart
())
&&
Common
.
isNotNull
(
excel
.
getMedicalStart
()))
||
(!
contractDateTemp
.
equals
(
excel
.
getUnemployStart
())
&&
Common
.
isNotNull
(
excel
.
getUnemployStart
()))
||
(!
contractDateTemp
.
equals
(
excel
.
getBirthStart
())
&&
Common
.
isNotNull
(
excel
.
getBirthStart
()))
||
(!
contractDateTemp
.
equals
(
excel
.
getWorkInjuryStart
())
&&
Common
.
isNotNull
(
excel
.
getWorkInjuryStart
()))
||
(!
contractDateTemp
.
equals
(
excel
.
getBigailmentStart
())
&&
Common
.
isNotNull
(
excel
.
getBigailmentStart
()))));
if
(
flag
){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_SOCIAL_DATE_LIMIT_ERROR2
)));
return
true
;
}
}
Date
temp
;
if
(
Common
.
isEmpty
(
empVo
)){
...
...
@@ -2581,7 +2570,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
// 其他 只用判断对应养老基数和时间 与合同时间 即可
if
(!
CommonConstants
.
ONE_STRING
.
equals
(
excel
.
getPaymentType
())
&&
Common
.
isEmpty
(
excel
.
getTrustRemark
())
&&
!
temp
.
equals
(
excel
.
getPensionStart
(
))
&&
!
DateUtil
.
formatDatePatten
(
temp
,
DateUtil
.
DATETIME_YYYYMM
).
equals
(
DateUtil
.
formatDatePatten
(
excel
.
getPensionStart
(),
DateUtil
.
DATETIME_YYYYMM
))
){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_DISPATCH_SOCIAL_DATE_LIMIT_ERROR2
)));
return
true
;
...
...
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