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
5dd18334
Commit
5dd18334
authored
Jul 09, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.6.6' into MVP1.6.6
parents
731aff24
9fb36c4b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
20 deletions
+20
-20
EmployeeConstants.java
...ud/plus/v1/yifu/archives/constants/EmployeeConstants.java
+8
-8
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+12
-12
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/constants/EmployeeConstants.java
View file @
5dd18334
...
@@ -9,14 +9,14 @@ public class EmployeeConstants {
...
@@ -9,14 +9,14 @@ public class EmployeeConstants {
public
static
final
String
REMARL_LENGTH
=
"备注长度超过200"
;
public
static
final
String
REMARL_LENGTH
=
"备注长度超过200"
;
public
static
final
String
POST_LENGTH
=
"就职岗位长度超过20"
;
public
static
final
String
POST_LENGTH
=
"就职岗位长度超过20"
;
public
static
final
String
DEPT_NO_LENGTH
=
"项目编码长度超过20"
;
public
static
final
String
DEPT_NO_LENGTH
=
"项目编码长度超过20"
;
public
static
final
String
VALIDITY_START
=
"身份证开始日期必填
!
"
;
public
static
final
String
VALIDITY_START
=
"身份证开始日期必填"
;
public
static
final
String
VALIDITY_END
=
"身份证截止日期必填
!
"
;
public
static
final
String
VALIDITY_END
=
"身份证截止日期必填"
;
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
EMP_REGIS_TYPE
=
"户口性质必填
!
"
;
public
static
final
String
EMP_REGIS_TYPE
=
"户口性质必填"
;
public
static
final
String
IS_COLLEGE
=
"是否大专及以上必填
!
"
;
public
static
final
String
IS_COLLEGE
=
"是否大专及以上必填"
;
public
static
final
String
CONTACT_ADDRESS
=
"通信地址必填
!
"
;
public
static
final
String
CONTACT_ADDRESS
=
"通信地址必填"
;
public
static
final
String
EMP_NATRUE_ZERO
=
"派遣"
;
public
static
final
String
EMP_NATRUE_ZERO
=
"派遣"
;
public
static
final
String
EMP_NATRUE_ONE
=
"外包"
;
public
static
final
String
EMP_NATRUE_ONE
=
"外包"
;
public
static
final
String
EMP_NATRUE_THREE
=
"内部员工"
;
public
static
final
String
EMP_NATRUE_THREE
=
"内部员工"
;
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
5dd18334
...
@@ -781,27 +781,27 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
...
@@ -781,27 +781,27 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
private
void
checkEmployeeVOR
(
long
lineNum
,
EmployeeVO
employeeInfo
,
Map
<
Long
,
ErrorMessage
>
errorMsgMap
,
Set
<
String
>
errorMsg
)
{
private
void
checkEmployeeVOR
(
long
lineNum
,
EmployeeVO
employeeInfo
,
Map
<
Long
,
ErrorMessage
>
errorMsgMap
,
Set
<
String
>
errorMsg
)
{
if
(
Common
.
isEmpty
(
employeeInfo
.
getEmpIdcard
()))
{
if
(
Common
.
isEmpty
(
employeeInfo
.
getEmpIdcard
()))
{
errorMsg
.
add
(
"身份证号必填
!
"
);
errorMsg
.
add
(
"身份证号必填"
);
errorMsgMap
.
put
(
lineNum
,
new
ErrorMessage
(
"身份证号必填
!
"
));
errorMsgMap
.
put
(
lineNum
,
new
ErrorMessage
(
"身份证号必填"
));
}
}
if
(
Common
.
isEmpty
(
employeeInfo
.
getDeptNo
()))
{
if
(
Common
.
isEmpty
(
employeeInfo
.
getDeptNo
()))
{
errorMsg
.
add
(
"项目编码必填
!
"
);
errorMsg
.
add
(
"项目编码必填"
);
errorMsgMap
.
put
(
lineNum
,
new
ErrorMessage
(
"项目编码必填
!
"
));
errorMsgMap
.
put
(
lineNum
,
new
ErrorMessage
(
"项目编码必填"
));
}
else
if
(
employeeInfo
.
getDeptNo
().
length
()
>
20
)
{
}
else
if
(
employeeInfo
.
getDeptNo
().
length
()
>
20
)
{
errorMsg
.
add
(
"项目编码超长
!
"
);
errorMsg
.
add
(
"项目编码超长"
);
errorMsgMap
.
put
(
lineNum
,
new
ErrorMessage
(
"项目编码超长
!
"
));
errorMsgMap
.
put
(
lineNum
,
new
ErrorMessage
(
"项目编码超长"
));
}
}
if
(
Common
.
isEmpty
(
employeeInfo
.
getEmpName
()))
{
if
(
Common
.
isEmpty
(
employeeInfo
.
getEmpName
()))
{
errorMsg
.
add
(
"员工姓名必填
!
"
);
errorMsg
.
add
(
"员工姓名必填"
);
errorMsgMap
.
put
(
lineNum
,
new
ErrorMessage
(
"员工姓名必填
!
"
));
errorMsgMap
.
put
(
lineNum
,
new
ErrorMessage
(
"员工姓名必填"
));
}
}
if
(
Common
.
isEmpty
(
employeeInfo
.
getEmpPhone
()))
{
if
(
Common
.
isEmpty
(
employeeInfo
.
getEmpPhone
()))
{
errorMsg
.
add
(
"手机号码必填
!
"
);
errorMsg
.
add
(
"手机号码必填"
);
errorMsgMap
.
put
(
lineNum
,
new
ErrorMessage
(
"手机号码必填
!
"
));
errorMsgMap
.
put
(
lineNum
,
new
ErrorMessage
(
"手机号码必填"
));
}
}
if
(
Common
.
isEmpty
(
employeeInfo
.
getEmpRegisType
()))
{
if
(
Common
.
isEmpty
(
employeeInfo
.
getEmpRegisType
()))
{
errorMsg
.
add
(
"户口性质必填
!
"
);
errorMsg
.
add
(
"户口性质必填"
);
errorMsgMap
.
put
(
lineNum
,
new
ErrorMessage
(
"户口性质必填
!
"
));
errorMsgMap
.
put
(
lineNum
,
new
ErrorMessage
(
"户口性质必填"
));
}
}
//婚姻状态不可为空
//婚姻状态不可为空
if
(
Common
.
isEmpty
(
employeeInfo
.
getEmpMarriStatus
())){
if
(
Common
.
isEmpty
(
employeeInfo
.
getEmpMarriStatus
())){
...
...
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