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
94a68c49
Commit
94a68c49
authored
Jan 13, 2023
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化修改
parent
b481112f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
6 deletions
+2
-6
TBusinessEmployeeExtendInfo.java
.../v1/yifu/archives/entity/TBusinessEmployeeExtendInfo.java
+1
-4
TEmployeeProjectServiceImpl.java
...fu/archives/service/impl/TEmployeeProjectServiceImpl.java
+1
-2
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TBusinessEmployeeExtendInfo.java
View file @
94a68c49
...
...
@@ -4,12 +4,10 @@ import cn.hutool.core.bean.BeanUtil;
import
cn.hutool.core.bean.copier.CopyOptions
;
import
com.baomidou.mybatisplus.annotation.*
;
import
com.baomidou.mybatisplus.extension.activerecord.Model
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
lombok.Data
;
import
lombok.ToString
;
import
java.time.LocalDate
;
import
java.time.LocalDateTime
;
import
java.util.Collection
;
import
java.util.List
;
import
java.util.stream.Collectors
;
...
...
@@ -113,8 +111,7 @@ public class TBusinessEmployeeExtendInfo extends Model<TBusinessEmployeeExtendIn
/**
* B端维护的入职时间
*/
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
private
LocalDateTime
businessEnjoinDate
;
private
LocalDate
businessEnjoinDate
;
/**
* B端维护的离职原因
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java
View file @
94a68c49
...
...
@@ -55,7 +55,6 @@ import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprSocialProperties;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprUpmsProperties
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.HttpDaprUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils
;
import
com.yifu.cloud.plus.v1.yifu.insurances.util.LocalDateUtil
;
import
lombok.RequiredArgsConstructor
;
import
lombok.extern.log4j.Log4j2
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -1671,7 +1670,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
businessVo
.
setDepartCode
(
tBusinessEmployeeExtendInfo
.
getDepartCode
());
businessVo
.
setExtendId
(
tBusinessEmployeeExtendInfo
.
getId
());
if
(
null
!=
tBusinessEmployeeExtendInfo
.
getBusinessEnjoinDate
())
{
businessVo
.
setBusinessEnjoinDate
(
tBusinessEmployeeExtendInfo
.
getBusinessEnjoinDate
()
.
toLocalDate
()
);
businessVo
.
setBusinessEnjoinDate
(
tBusinessEmployeeExtendInfo
.
getBusinessEnjoinDate
());
}
if
(
StringUtils
.
isNotBlank
(
tBusinessEmployeeExtendInfo
.
getBusinessPost
()))
{
businessVo
.
setBusinessPost
(
tBusinessEmployeeExtendInfo
.
getBusinessPost
());
...
...
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