Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
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
2d21b42e
You need to sign in or sign up before continuing.
Commit
2d21b42e
authored
Sep 29, 2024
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
区域更新-fxj
parent
4f5229b8
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
1 deletion
+11
-1
EmployeeConstants.java
...ud/plus/v1/yifu/archives/constants/EmployeeConstants.java
+1
-1
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+2
-0
TCheckMobileServiceImpl.java
...d/plus/v1/check/service/impl/TCheckMobileServiceImpl.java
+8
-0
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/constants/EmployeeConstants.java
View file @
2d21b42e
...
@@ -14,7 +14,7 @@ public class EmployeeConstants {
...
@@ -14,7 +14,7 @@ public class EmployeeConstants {
public
static
final
String
VALIDITY_END_FORMAT
=
"身份证截止日期只能为日期格式:yyyy-MM-dd或者固定值:长期"
;
public
static
final
String
VALIDITY_END_FORMAT
=
"身份证截止日期只能为日期格式:yyyy-MM-dd或者固定值:长期"
;
public
static
final
String
EMP_NATIONAL
=
"民族必填"
;
public
static
final
String
EMP_NATIONAL
=
"民族必填"
;
public
static
final
String
ID_PROVINCE
=
"户籍所在地必填"
;
public
static
final
String
ID_PROVINCE
=
"户籍所在地必填"
;
public
static
final
String
FILE_PROVINCE
=
"档案所在地(省市
县
)必填"
;
public
static
final
String
FILE_PROVINCE
=
"档案所在地(省市)必填"
;
public
static
final
String
CONTACT_PROVINCE
=
"通信地址(省市县)必填"
;
public
static
final
String
CONTACT_PROVINCE
=
"通信地址(省市县)必填"
;
public
static
final
String
EMP_REGIS_TYPE
=
"户口性质必填"
;
public
static
final
String
EMP_REGIS_TYPE
=
"户口性质必填"
;
public
static
final
String
IS_COLLEGE
=
"是否大专及以上必填"
;
public
static
final
String
IS_COLLEGE
=
"是否大专及以上必填"
;
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
2d21b42e
...
@@ -1414,6 +1414,8 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
...
@@ -1414,6 +1414,8 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
}
}
if
(
Common
.
isNotNull
(
excel
.
getFileTown
()))
{
if
(
Common
.
isNotNull
(
excel
.
getFileTown
()))
{
saveEmp
.
setFileTown
(
Integer
.
parseInt
(
excel
.
getFileTown
()));
saveEmp
.
setFileTown
(
Integer
.
parseInt
(
excel
.
getFileTown
()));
}
else
{
saveEmp
.
setFileTown
(
null
);
}
}
if
(
Common
.
isNotNull
(
excel
.
getIsCollege
()))
{
if
(
Common
.
isNotNull
(
excel
.
getIsCollege
()))
{
if
(
CommonConstants
.
IS_TRUE
.
equals
(
excel
.
getIsCollege
()))
{
if
(
CommonConstants
.
IS_TRUE
.
equals
(
excel
.
getIsCollege
()))
{
...
...
yifu-check/yifu-check-biz/src/main/java/com/yifu/cloud/plus/v1/check/service/impl/TCheckMobileServiceImpl.java
View file @
2d21b42e
...
@@ -75,6 +75,14 @@ public class TCheckMobileServiceImpl extends ServiceImpl<TCheckMobileMapper, TCh
...
@@ -75,6 +75,14 @@ public class TCheckMobileServiceImpl extends ServiceImpl<TCheckMobileMapper, TCh
.
in
(
TCheckMobile:
:
getMobile
,
mobileList
)
.
in
(
TCheckMobile:
:
getMobile
,
mobileList
)
.
eq
(
TCheckMobile:
:
getStatus
,
CommonConstants
.
ONE_STRING
));
.
eq
(
TCheckMobile:
:
getStatus
,
CommonConstants
.
ONE_STRING
));
if
(
Common
.
isNotNull
(
checkMobiles
))
{
if
(
Common
.
isNotNull
(
checkMobiles
))
{
for
(
TCheckMobile
c
:
checkMobiles
)
{
if
(
CommonConstants
.
ONE_STRING
.
equals
(
c
.
getStatus
())
||
CommonConstants
.
FOUR_STRING
.
equals
(
c
.
getStatus
())
||
CommonConstants
.
FIVE_STRING
.
equals
(
c
.
getStatus
()))
{
c
.
setStatus
(
CommonConstants
.
ONE_STRING
);
c
.
setMessage
(
c
.
getMessage
());
}
}
existMap
=
checkMobiles
.
stream
().
collect
(
Collectors
.
toMap
(
TCheckMobile:
:
getMobile
,
TCheckMobile
->
TCheckMobile
));
existMap
=
checkMobiles
.
stream
().
collect
(
Collectors
.
toMap
(
TCheckMobile:
:
getMobile
,
TCheckMobile
->
TCheckMobile
));
}
}
mobileList
.
removeAll
(
existMap
.
keySet
());
mobileList
.
removeAll
(
existMap
.
keySet
());
...
...
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