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
d42b7493
Commit
d42b7493
authored
Jun 19, 2024
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
项目档案无岗位更新岗位fxj 2024-04-17
parent
dff63329
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
3 deletions
+9
-3
TEmpBadRecord.java
...ifu/cloud/plus/v1/yifu/archives/entity/TEmpBadRecord.java
+3
-1
EmpBadRecordVo.java
...m/yifu/cloud/plus/v1/yifu/archives/vo/EmpBadRecordVo.java
+1
-1
EmpCertificateExcelVO.java
...cloud/plus/v1/yifu/archives/vo/EmpCertificateExcelVO.java
+1
-1
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+4
-0
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmpBadRecord.java
View file @
d42b7493
...
...
@@ -18,6 +18,7 @@ package com.yifu.cloud.plus.v1.yifu.archives.entity;
import
com.alibaba.excel.annotation.ExcelIgnore
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.alibaba.excel.annotation.format.DateTimeFormat
;
import
com.alibaba.excel.annotation.write.style.HeadFontStyle
;
import
com.baomidou.mybatisplus.annotation.*
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
...
...
@@ -100,6 +101,7 @@ public class TEmpBadRecord extends BaseEntity {
* 发生时间
*/
@ExcelAttribute
(
name
=
"发生时间"
,
isDate
=
true
,
dateFormat
=
LocalDateTimeUtils
.
DATE_TIME_PATTERN_DEFAULT
)
@DateTimeFormat
(
"yyyy-MM-dd"
)
@Schema
(
description
=
"发生时间"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"发生时间"
)
...
...
@@ -155,7 +157,7 @@ public class TEmpBadRecord extends BaseEntity {
/**
* 是否曾经或正在追究与承担过刑事责任 0 是 1 否
*/
@ExcelAttribute
(
name
=
"是否曾经或正在追究与承担过刑事责任"
,
isNotEmpty
=
tru
e
,
errorInfo
=
"是否曾经或正在追究与承担过刑事责任不可为空"
,
readConverterExp
=
"0=是,1=否"
)
@ExcelAttribute
(
name
=
"是否曾经或正在追究与承担过刑事责任"
,
isNotEmpty
=
false
,
isExport
=
fals
e
,
errorInfo
=
"是否曾经或正在追究与承担过刑事责任不可为空"
,
readConverterExp
=
"0=是,1=否"
)
@Schema
(
description
=
"是否曾经或正在追究与承担过刑事责任 0 是 1 否 "
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"是否曾经或正在追究与承担过刑事责任"
)
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmpBadRecordVo.java
View file @
d42b7493
...
...
@@ -93,7 +93,7 @@ public class EmpBadRecordVo extends RowIndex implements Serializable {
/**
* 是否曾经或正在追究与承担过刑事责任 0 是 1 否
*/
@ExcelAttribute
(
name
=
"是否曾经或正在追究与承担过刑事责任"
,
isNotEmpty
=
tru
e
,
errorInfo
=
"是否曾经或正在追究与承担过刑事责任不可为空"
,
readConverterExp
=
"0=是,1=否"
)
@ExcelAttribute
(
name
=
"是否曾经或正在追究与承担过刑事责任"
,
isNotEmpty
=
fals
e
,
errorInfo
=
"是否曾经或正在追究与承担过刑事责任不可为空"
,
readConverterExp
=
"0=是,1=否"
)
@Schema
(
description
=
"是否曾经或正在追究与承担过刑事责任 0 是 1 否 "
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"是否曾经或正在追究与承担过刑事责任"
)
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmpCertificateExcelVO.java
View file @
d42b7493
...
...
@@ -92,7 +92,7 @@ public class EmpCertificateExcelVO extends RowIndex implements Serializable {
/**
* 是否最高资格0是/1否
*/
@ExcelAttribute
(
name
=
"是否最高资格"
,
isNotEmpty
=
tru
e
,
errorInfo
=
"是否最高资格不可为空"
,
readConverterExp
=
"0=是,1=否"
)
@ExcelAttribute
(
name
=
"是否最高资格"
,
isNotEmpty
=
fals
e
,
errorInfo
=
"是否最高资格不可为空"
,
readConverterExp
=
"0=是,1=否"
)
@NotNull
(
message
=
"是否最高资格不可为空"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"是否最高资格"
)
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
d42b7493
...
...
@@ -799,6 +799,10 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
errorMsg
.
add
(
"手机号码必填!"
);
errorMsgMap
.
put
(
lineNum
,
new
ErrorMessage
(
"手机号码必填!"
));
}
if
(
Common
.
isEmpty
(
employeeInfo
.
getEmpRegisType
()))
{
errorMsg
.
add
(
"户口性质!"
);
errorMsgMap
.
put
(
lineNum
,
new
ErrorMessage
(
"户口性质!"
));
}
if
(
Common
.
isEmpty
(
employeeInfo
.
getEmpNatrue
()))
{
errorMsg
.
add
(
"员工类型必填!"
);
errorMsgMap
.
put
(
lineNum
,
new
ErrorMessage
(
"员工类型必填!"
));
...
...
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