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
1a7834e8
Commit
1a7834e8
authored
Jun 18, 2024
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
基础档案新增字段及必填调整
parent
5ec33286
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
28 additions
and
3 deletions
+28
-3
EmpCertificateExcelVO.java
...cloud/plus/v1/yifu/archives/vo/EmpCertificateExcelVO.java
+1
-1
TEmpDisabilityInfoController.java
...ifu/archives/controller/TEmpDisabilityInfoController.java
+9
-0
TEmpDisabilityInfoServiceImpl.java
.../archives/service/impl/TEmpDisabilityInfoServiceImpl.java
+7
-0
TEmpProfessionalQualificationServiceImpl.java
...ervice/impl/TEmpProfessionalQualificationServiceImpl.java
+4
-2
TEmpWorkRecordingServiceImpl.java
...u/archives/service/impl/TEmpWorkRecordingServiceImpl.java
+7
-0
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmpCertificateExcelVO.java
View file @
1a7834e8
...
...
@@ -51,7 +51,7 @@ public class EmpCertificateExcelVO extends RowIndex implements Serializable {
/**
* 资格等级
*/
@ExcelAttribute
(
name
=
"资格等级"
,
isNotEmpty
=
tru
e
,
errorInfo
=
"资格等级不可为空"
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
QUALIFICATION_LEVEL
)
@ExcelAttribute
(
name
=
"资格等级"
,
isNotEmpty
=
fals
e
,
errorInfo
=
"资格等级不可为空"
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
QUALIFICATION_LEVEL
)
@NotNull
(
message
=
"资格等级不可为空"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"资格等级"
)
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmpDisabilityInfoController.java
View file @
1a7834e8
...
...
@@ -102,6 +102,9 @@ public class TEmpDisabilityInfoController {
public
R
<
Boolean
>
save
(
@RequestBody
TEmpDisabilityInfo
tEmpDisabilityInfo
)
{
R
<
Boolean
>
failed
=
getCheckRes
(
tEmpDisabilityInfo
);
if
(
failed
!=
null
)
return
failed
;
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
tEmpDisabilityInfo
.
getOtherFlag
())){
tEmpDisabilityInfo
.
setRemark
(
"曾经或正在追究与承担过刑事责任"
);
}
return
tEmpDisabilityInfoService
.
saveDiy
(
tEmpDisabilityInfo
);
}
...
...
@@ -122,6 +125,9 @@ public class TEmpDisabilityInfoController {
return
R
.
failed
(
"伤残等级不可为空!"
);
}
}
if
(
Common
.
isEmpty
(
tEmpDisabilityInfo
.
getOtherFlag
())){
return
R
.
failed
(
"是否从事过井下、高空、高温、特别繁重体力劳动以及有毒有害工种 不可为空!"
);
}
return
null
;
}
...
...
@@ -137,6 +143,9 @@ public class TEmpDisabilityInfoController {
public
R
<
Boolean
>
updateById
(
@RequestBody
TEmpDisabilityInfo
tEmpDisabilityInfo
)
{
R
<
Boolean
>
failed
=
getCheckRes
(
tEmpDisabilityInfo
);
if
(
failed
!=
null
)
return
failed
;
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
tEmpDisabilityInfo
.
getOtherFlag
())){
tEmpDisabilityInfo
.
setRemark
(
"曾经或正在追究与承担过刑事责任"
);
}
return
tEmpDisabilityInfoService
.
updateByIdDiy
(
tEmpDisabilityInfo
);
}
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpDisabilityInfoServiceImpl.java
View file @
1a7834e8
...
...
@@ -126,6 +126,13 @@ public class TEmpDisabilityInfoServiceImpl extends ServiceImpl<TEmpDisabilityInf
continue
;
}
}
if
(
Common
.
isEmpty
(
excel
.
getOtherFlag
())){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"是否从事过井下、高空、高温、特别繁重体力劳动以及有毒有害工种 不可为空!"
));
continue
;
}
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
excel
.
getOtherFlag
())){
excel
.
setRemark
(
"曾经或正在追究与承担过刑事责任"
);
}
// 数据合法情况
insertExcel
(
excel
,
emp
);
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
CommonConstants
.
SAVE_SUCCESS
));
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpProfessionalQualificationServiceImpl.java
View file @
1a7834e8
...
...
@@ -159,8 +159,10 @@ public class TEmpProfessionalQualificationServiceImpl extends ServiceImpl<TEmpPr
}
if
(
Common
.
isNotNull
(
list
)){
// 检查添加是否已经存在
boolean
match
=
list
.
stream
().
anyMatch
(
info
->
excel
.
getQualificationLevel
()
.
equals
(
info
.
getQualificationLevel
())
boolean
match
=
list
.
stream
().
anyMatch
(
info
->
((
Common
.
isEmpty
(
excel
.
getQualificationLevel
())
&&
Common
.
isNotNull
(
info
.
getQualificationLevel
()))
||
(
Common
.
isNotNull
(
excel
.
getQualificationLevel
())
&&
excel
.
getQualificationLevel
().
equals
(
info
.
getQualificationLevel
())))
&&
excel
.
getEmpIdcard
().
equals
(
info
.
getEmpIdcard
())
&&
excel
.
getQualificationType
().
equals
(
info
.
getQualificationType
()));
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpWorkRecordingServiceImpl.java
View file @
1a7834e8
...
...
@@ -101,6 +101,10 @@ public class TEmpWorkRecordingServiceImpl extends ServiceImpl<TEmpWorkRecordingM
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
ARCHIVES_EMP_WORK_RECORD_EXISTING
)));
continue
;
}
if
(
Common
.
isEmpty
(
excel
.
getEndDate
())){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
MsgUtils
.
getMessage
(
ErrorCodes
.
EMP_WORKING_RECODE_END_DATE_NOT_EMPTY
)));
continue
;
}
// 数据合法情况
insertExcel
(
excel
,
emp
);
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
CommonConstants
.
SAVE_SUCCESS
));
...
...
@@ -119,6 +123,9 @@ public class TEmpWorkRecordingServiceImpl extends ServiceImpl<TEmpWorkRecordingM
@Override
public
R
<
Boolean
>
saveDiy
(
TEmpWorkRecording
recording
)
{
if
(
CommonConstants
.
ONE_STRING
.
equals
(
recording
.
getFirstWorkFlag
())
&&
Common
.
isEmpty
(
recording
.
getEndDate
())){
return
R
.
failed
(
"结束日期必填"
);
}
recording
.
setDeleteFlag
(
CommonConstants
.
ZERO_STRING
);
String
res
=
checkRepeat
(
recording
);
if
(
Common
.
isEmpty
(
res
)){
...
...
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