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
14ede6b2
Commit
14ede6b2
authored
Feb 11, 2025
by
chenyuxi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 不良记录职业资格接口
parent
5167d5f1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
9 deletions
+20
-9
PreUploadEmpImportTwoVo.java
...oud/plus/v1/yifu/archives/vo/PreUploadEmpImportTwoVo.java
+2
-2
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+15
-6
TPreEmpMainServiceImpl.java
...v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
+3
-1
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/PreUploadEmpImportTwoVo.java
View file @
14ede6b2
...
...
@@ -187,10 +187,10 @@ public class PreUploadEmpImportTwoVo implements Serializable {
@ExcelAttribute
(
name
=
"身份证截止日期-值"
)
private
Date
validityEndValue
;
@ExcelAttribute
(
name
=
"是否有职业资格证书"
,
isDataId
=
true
,
readConverterExp
=
"0=
否,1=是
"
)
@ExcelAttribute
(
name
=
"是否有职业资格证书"
,
isDataId
=
true
,
readConverterExp
=
"0=
是,1=否
"
)
private
String
badRecordFlag
;
@ExcelAttribute
(
name
=
"是否有不良记录"
,
isDataId
=
true
,
readConverterExp
=
"0=
否,1=是
"
)
@ExcelAttribute
(
name
=
"是否有不良记录"
,
isDataId
=
true
,
readConverterExp
=
"0=
是,1=否
"
)
private
String
haveQualification
;
// 字典值结束
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
14ede6b2
...
...
@@ -3769,7 +3769,11 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
}
// 1.9.6: 是否有职业资格证书
if
(
Common
.
isNotNull
(
excel
.
getHaveQualification
()))
{
saveEmp
.
setHaveQualification
(
excel
.
getHaveQualification
());
String
flag
=
CommonConstants
.
ZERO_STRING
;
if
(
"否"
.
equals
(
excel
.
getHaveQualification
())){
flag
=
CommonConstants
.
ONE_STRING
;
}
saveEmp
.
setHaveQualification
(
flag
);
}
// 更新时,不需要更新其余信息
...
...
@@ -3817,19 +3821,24 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
}
// 1.9.6 存不良记录
if
(
Common
.
isNotNull
(
excel
.
getBadRecordFlag
())
&&
(
CommonConstants
.
ONE_STRING
.
equals
(
excel
.
getBadRecordFlag
())
||
CommonConstants
.
ZERO_STRING
.
equals
(
excel
.
getBadRecordFlag
())))
{
&&
(
"是"
.
equals
(
excel
.
getBadRecordFlag
())
||
"否"
.
equals
(
excel
.
getBadRecordFlag
()))
)
{
String
badFlag
=
CommonConstants
.
ZERO_STRING
;
if
(
"否"
.
equals
(
excel
.
getHaveQualification
())){
badFlag
=
CommonConstants
.
ONE_STRING
;
}
badRecord
=
new
TEmpBadRecord
();
badRecord
.
setBadRecordFlag
(
badFlag
);
badRecord
.
setEmpName
(
saveEmp
.
getEmpName
());
badRecord
.
setEmpId
(
saveEmp
.
getId
());
badRecord
.
setEmpIdcard
(
saveEmp
.
getEmpIdcard
());
badRecord
.
setCreateBy
(
user
.
getId
());
badRecord
.
setCreateName
(
user
.
getNickname
());
badRecord
.
setCreateTime
(
LocalDateTime
.
now
());
if
(
CommonConstants
.
ONE_STRING
.
equals
(
excel
.
getBadRecordFlag
())){
if
(
"否"
.
equals
(
excel
.
getBadRecordFlag
())){
badRecord
.
setRemark
(
"未曾经或正在追究与承担过刑事责任"
);
badRecord
.
setBadRecordFlag
(
CommonConstants
.
ONE_STRING
);
}
else
{
badRecord
.
setRemark
(
"曾经或正在追究与承担过刑事责任"
);
badRecord
.
setBadRecordFlag
(
CommonConstants
.
ZERO_STRING
);
badRecord
.
setProject
(
dept
.
getDepartName
());
badRecord
.
setProjectCode
(
dept
.
getDepartNo
());
}
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
View file @
14ede6b2
...
...
@@ -3889,7 +3889,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
tPreEmpBadRecord
=
new
TPreEmpBadRecord
();
tPreEmpBadRecord
.
setOldId
(
oldBadRecordMap
.
get
(
empIdCard
));
tPreEmpBadRecord
.
setPreMainId
(
mainId
);
if
(
employee
!=
null
)
{
tPreEmpBadRecord
.
setEmpName
(
employee
.
getEmpName
());
}
tPreEmpBadRecord
.
setEmpIdcard
(
empIdCard
);
tPreEmpBadRecord
.
setCreateBy
(
user
.
getId
());
tPreEmpBadRecord
.
setCreateName
(
user
.
getNickname
());
...
...
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