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
c40c9727
Commit
c40c9727
authored
Jul 01, 2022
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
不良记录导入
parent
4a52034d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
8 deletions
+17
-8
TEmpEducation.java
...ifu/cloud/plus/v1/yifu/archives/entity/TEmpEducation.java
+6
-6
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+2
-2
LocalDateTimeUtils.java
...oud/plus/v1/yifu/common/core/util/LocalDateTimeUtils.java
+9
-0
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmpEducation.java
View file @
c40c9727
...
...
@@ -16,15 +16,15 @@
*/
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
entity
;
import
com.alibaba.excel.annotation.format.DateTimeFormat
;
import
com.baomidou.mybatisplus.annotation.*
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
javax.validation.constraints.Max
;
import
java.
time.Local
Date
;
import
java.
util.
Date
;
/**
* 员工学历信息表
...
...
@@ -75,9 +75,9 @@ public class TEmpEducation extends BaseEntity {
/**
* 入学时间
*/
@
DateTimeFormat
(
"yyyy-MM-dd hh:mm:ss
"
)
@
JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd
"
)
@Schema
(
description
=
"入学时间"
)
private
Local
Date
entryDate
;
private
Date
entryDate
;
/**
* 学历名称
...
...
@@ -89,9 +89,9 @@ public class TEmpEducation extends BaseEntity {
/**
* 结业日期
*/
@
DateTimeFormat
(
"yyyy-MM-dd hh:mm:ss
"
)
@
JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd
"
)
@Schema
(
description
=
"结业日期"
)
private
Local
Date
gradutionDate
;
private
Date
gradutionDate
;
/**
* 学校名称
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
c40c9727
...
...
@@ -1370,8 +1370,8 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
education
.
setHighIdentification
(
CommonConstants
.
ZERO_STRING
);
education
.
setSchool
(
employeeInfo
.
getSchool
());
education
.
setMajor
(
employeeInfo
.
getMajor
());
education
.
setEntryDate
(
employeeInfo
.
getAdmissionDate
(
));
education
.
setGradutionDate
(
employeeInfo
.
getGradutionDate
(
));
education
.
setEntryDate
(
LocalDateTimeUtils
.
convertLDToDate
(
employeeInfo
.
getAdmissionDate
()
));
education
.
setGradutionDate
(
LocalDateTimeUtils
.
convertLDToDate
(
employeeInfo
.
getGradutionDate
()
));
tEmpEducationService
.
insertEducationOfEmp
(
education
);
}
...
...
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/util/LocalDateTimeUtils.java
View file @
c40c9727
...
...
@@ -47,7 +47,16 @@ public class LocalDateTimeUtils {
}
return
null
;
}
public
static
LocalDateTime
convertLocalDateToLDT
(
LocalDate
date
)
{
return
LocalDateTime
.
ofInstant
(
date
.
atStartOfDay
(
ZoneOffset
.
ofHours
(
8
)).
toInstant
(),
ZoneId
.
systemDefault
());
}
public
static
Date
convertLDToDate
(
LocalDate
time
)
{
if
(
null
!=
time
){
return
Date
.
from
(
time
.
atStartOfDay
(
ZoneOffset
.
ofHours
(
8
)).
toInstant
());
}
return
null
;
}
//获取指定日期的毫秒
public
static
Long
getMilliByTime
(
LocalDateTime
time
)
{
...
...
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