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
4de6b6e2
Commit
4de6b6e2
authored
Feb 17, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
人员档案&预入职批量新增和更新对应身份证有效期起止日志校验-fxj
parent
e3efd7e8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+4
-4
TPreEmpMainServiceImpl.java
...v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
+2
-2
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
4de6b6e2
...
...
@@ -1564,7 +1564,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
if
(
Common
.
isNotNull
(
excel
.
getValidityStart
())
&&
!
"长期"
.
equals
(
excel
.
getValidityEnd
())
&&
DateUtil
.
checkStringToDate
(
excel
.
getValidityEnd
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
)
&&
excel
.
getValidityStart
().
after
(
DateUtil
.
stringToDate
(
excel
.
getValidityEnd
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
))){
&&
!
DateUtil
.
stringToDate
(
excel
.
getValidityEnd
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
).
after
(
excel
.
getValidityStart
(
))){
errorMsg
.
add
(
EmployeeConstants
.
EMP_VALIDITY_END_START_DATE
);
}
// 邮箱
...
...
@@ -2094,7 +2094,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
if
(
Common
.
isNotNull
(
excel
.
getValidityStart
())
&&
!
"长期"
.
equals
(
excel
.
getValidityEnd
())
&&
DateUtil
.
checkStringToDate
(
excel
.
getValidityEnd
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
)
&&
excel
.
getValidityStart
().
after
(
DateUtil
.
stringToDate
(
excel
.
getValidityEnd
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
))){
&&
!
DateUtil
.
stringToDate
(
excel
.
getValidityEnd
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
).
after
(
excel
.
getValidityStart
(
))){
errorMsg
.
add
(
EmployeeConstants
.
EMP_VALIDITY_END_START_DATE
);
}
}
...
...
@@ -3532,8 +3532,8 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
if
(
Common
.
isNotNull
(
detail
.
getValidityStart
())
&&
Common
.
isNotNull
(
detail
.
getValidityEnd
())
&&
!
"长期"
.
equals
(
detail
.
getValidityEnd
())
&&
DateUtil
.
stringToDate
(
detail
.
getValidityStart
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
)
.
after
(
DateUtil
.
stringToDate
(
detail
.
getValidity
End
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
))){
&&
!
DateUtil
.
stringToDate
(
detail
.
getValidityEnd
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
)
.
after
(
DateUtil
.
stringToDate
(
detail
.
getValidity
Start
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
))){
detail
.
setErrorInfo
(
EmployeeConstants
.
EMP_VALIDITY_END_START_DATE
);
}
excelList
.
add
(
detail
);
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
View file @
4de6b6e2
...
...
@@ -3499,8 +3499,8 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
if
(
Common
.
isNotNull
(
detail
.
getValidityStart
())
&&
Common
.
isNotNull
(
detail
.
getValidityEnd
())
&&
!
"长期"
.
equals
(
detail
.
getValidityEnd
())
&&
DateUtil
.
stringToDate
(
detail
.
getValidityStart
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
)
.
after
(
DateUtil
.
stringToDate
(
detail
.
getValidity
End
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
))){
&&
!
DateUtil
.
stringToDate
(
detail
.
getValidityEnd
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
)
.
after
(
DateUtil
.
stringToDate
(
detail
.
getValidity
Start
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
))){
detail
.
setErrorInfo
(
EmployeeConstants
.
EMP_VALIDITY_END_START_DATE
);
}
excelList
.
add
(
detail
);
...
...
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