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
a4f6e254
You need to sign in or sign up before continuing.
Commit
a4f6e254
authored
Oct 25, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.0 优化
parent
2312743e
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
24 deletions
+31
-24
PreUploadEmpImportTwoVo.java
...oud/plus/v1/yifu/archives/vo/PreUploadEmpImportTwoVo.java
+2
-2
PreUploadEmpImportVo.java
.../cloud/plus/v1/yifu/archives/vo/PreUploadEmpImportVo.java
+2
-2
TPreEmpMainServiceImpl.java
...v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
+27
-20
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/PreUploadEmpImportTwoVo.java
View file @
a4f6e254
...
@@ -88,9 +88,9 @@ public class PreUploadEmpImportTwoVo implements Serializable {
...
@@ -88,9 +88,9 @@ public class PreUploadEmpImportTwoVo implements Serializable {
private
String
isCollege
;
private
String
isCollege
;
@ExcelAttribute
(
name
=
"最高学历"
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
EDUCATION
,
maxLength
=
32
)
@ExcelAttribute
(
name
=
"最高学历"
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
EDUCATION
,
maxLength
=
32
)
private
String
educationName
;
private
String
educationName
;
@ExcelAttribute
(
name
=
"学校"
,
maxLength
=
64
)
@ExcelAttribute
(
name
=
"学校"
,
maxLength
=
50
)
private
String
school
;
private
String
school
;
@ExcelAttribute
(
name
=
"专业"
,
maxLength
=
64
)
@ExcelAttribute
(
name
=
"专业"
,
maxLength
=
50
)
private
String
major
;
private
String
major
;
@ExcelAttribute
(
name
=
"入学时间"
,
isDate
=
true
)
@ExcelAttribute
(
name
=
"入学时间"
,
isDate
=
true
)
private
String
entryDate
;
private
String
entryDate
;
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/PreUploadEmpImportVo.java
View file @
a4f6e254
...
@@ -103,9 +103,9 @@ public class PreUploadEmpImportVo implements Serializable {
...
@@ -103,9 +103,9 @@ public class PreUploadEmpImportVo implements Serializable {
// 学历 学校 专业 教育开始时间 教育结束时间 是否大专及以上 最高学历
// 学历 学校 专业 教育开始时间 教育结束时间 是否大专及以上 最高学历
@ExcelAttribute
(
name
=
"学历"
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
EDUCATION
,
isNotEmpty
=
true
,
maxLength
=
32
)
@ExcelAttribute
(
name
=
"学历"
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
EDUCATION
,
isNotEmpty
=
true
,
maxLength
=
32
)
private
String
educationName
;
private
String
educationName
;
@ExcelAttribute
(
name
=
"学校"
,
maxLength
=
64
)
@ExcelAttribute
(
name
=
"学校"
,
maxLength
=
50
)
private
String
school
;
private
String
school
;
@ExcelAttribute
(
name
=
"专业"
,
maxLength
=
64
)
@ExcelAttribute
(
name
=
"专业"
,
maxLength
=
50
)
private
String
major
;
private
String
major
;
@ExcelAttribute
(
name
=
"教育开始时间"
,
isDate
=
true
)
@ExcelAttribute
(
name
=
"教育开始时间"
,
isDate
=
true
)
private
String
entryDate
;
private
String
entryDate
;
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
View file @
a4f6e254
...
@@ -3610,20 +3610,22 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -3610,20 +3610,22 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
}
}
private
void
judgeDisability
(
PreUploadEmpImportVo
detail
,
StringBuilder
errorMust
)
{
private
void
judgeDisability
(
PreUploadEmpImportVo
detail
,
StringBuilder
errorMust
)
{
if
(
Common
.
isNotNull
(
detail
.
getOccupationalDiseaseFlag
())
if
(
Common
.
isNotNull
(
detail
.
getOccupationalDiseaseFlag
()))
{
&&
detail
.
getOccupationalDiseaseFlag
().
contains
(
"是"
)
if
(
detail
.
getOccupationalDiseaseFlag
().
contains
(
"是"
)
&&
Common
.
isEmpty
(
detail
.
getOccupationalDisease
()))
{
&&
Common
.
isEmpty
(
detail
.
getOccupationalDisease
()))
{
errorMust
.
append
(
"是否有职业病为是则必填:职业病名称;"
);
errorMust
.
append
(
"是否有职业病为是则必填:职业病名称;"
);
}
else
if
(
detail
.
getOccupationalDiseaseFlag
().
contains
(
"否"
))
{
detail
.
setOccupationalDisease
(
null
);
}
}
if
(
Common
.
isNotNull
(
detail
.
getInfectiousDiseaseFlag
())
}
&&
detail
.
getInfectiousDiseaseFlag
().
contains
(
"是"
)
if
(
Common
.
isNotNull
(
detail
.
getInfectiousDiseaseFlag
()))
{
&&
Common
.
isEmpty
(
detail
.
getInfectiousName
()))
{
if
(
detail
.
getInfectiousDiseaseFlag
().
contains
(
"是"
)
&&
Common
.
isEmpty
(
detail
.
getInfectiousName
()))
{
errorMust
.
append
(
"是否有传染性疾病为是则必填:传染病名称;"
);
errorMust
.
append
(
"是否有传染性疾病为是则必填:传染病名称;"
);
}
else
if
(
detail
.
getInfectiousDiseaseFlag
().
contains
(
"否"
))
{
detail
.
setInfectiousName
(
null
);
}
}
}
if
(
Common
.
isNotNull
(
detail
.
getDisabilityFlag
())
if
(
Common
.
isNotNull
(
detail
.
getDisabilityFlag
()))
{
&&
detail
.
getDisabilityFlag
().
contains
(
"是"
)
if
(
detail
.
getDisabilityFlag
().
contains
(
"是"
)
&&
(
Common
.
isEmpty
(
detail
.
getDisabilityName
())
||
Common
.
isEmpty
(
detail
.
getDisabilityLevel
())))
{
&&
(
Common
.
isEmpty
(
detail
.
getDisabilityName
())
||
Common
.
isEmpty
(
detail
.
getDisabilityLevel
())))
{
errorMust
.
append
(
"是否被劳动能力鉴定委员会鉴定为具有伤残等级为是则必填:"
);
errorMust
.
append
(
"是否被劳动能力鉴定委员会鉴定为具有伤残等级为是则必填:"
);
if
(
Common
.
isEmpty
(
detail
.
getDisabilityName
()))
{
if
(
Common
.
isEmpty
(
detail
.
getDisabilityName
()))
{
errorMust
.
append
(
"伤残病名称;"
);
errorMust
.
append
(
"伤残病名称;"
);
...
@@ -3631,6 +3633,11 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -3631,6 +3633,11 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
if
(
Common
.
isEmpty
(
detail
.
getDisabilityLevel
()))
{
if
(
Common
.
isEmpty
(
detail
.
getDisabilityLevel
()))
{
errorMust
.
append
(
"伤残等级;"
);
errorMust
.
append
(
"伤残等级;"
);
}
}
}
else
if
(
detail
.
getDisabilityFlag
().
contains
(
"否"
))
{
detail
.
setDisabilityName
(
null
);
detail
.
setDisabilityLevel
(
null
);
detail
.
setDisabilityLevelValue
(
null
);
}
}
}
}
}
...
...
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