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
f1751fde
Commit
f1751fde
authored
Jul 08, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.6.6' into MVP1.6.6
parents
ad9df436
85c87897
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+3
-3
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
f1751fde
...
@@ -49,7 +49,6 @@ import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
...
@@ -49,7 +49,6 @@ import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprSocialProperties
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprSocialProperties
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.HttpDaprUtil
;
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.common.security.util.SecurityUtils
;
import
com.yifu.cloud.plus.v1.yifu.insurances.util.LocalDateUtil
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TSocialFundInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TSocialFundInfo
;
import
lombok.RequiredArgsConstructor
;
import
lombok.RequiredArgsConstructor
;
import
lombok.extern.log4j.Log4j2
;
import
lombok.extern.log4j.Log4j2
;
...
@@ -70,6 +69,7 @@ import java.lang.reflect.Field;
...
@@ -70,6 +69,7 @@ import java.lang.reflect.Field;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
import
java.net.URLEncoder
;
import
java.net.URLEncoder
;
import
java.time.LocalDateTime
;
import
java.time.LocalDateTime
;
import
java.time.ZoneId
;
import
java.util.*
;
import
java.util.*
;
/**
/**
...
@@ -757,7 +757,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
...
@@ -757,7 +757,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
tEmployeeProject
.
setContractType
(
null
==
tempStr
?
""
:
tempStr
);
tEmployeeProject
.
setContractType
(
null
==
tempStr
?
""
:
tempStr
);
tEmployeeProject
.
setWorkingHours
(
contractInfo
.
getWorkingHours
());
tEmployeeProject
.
setWorkingHours
(
contractInfo
.
getWorkingHours
());
tEmployeeProject
.
setPost
(
contractInfo
.
getPost
());
tEmployeeProject
.
setPost
(
contractInfo
.
getPost
());
tEmployeeProject
.
setEnjoinDate
(
LocalDateUtil
.
parseLocalDate
(
contractInfo
.
getContractStart
().
toString
()
));
tEmployeeProject
.
setEnjoinDate
(
contractInfo
.
getContractStart
().
toInstant
().
atZone
(
ZoneId
.
systemDefault
()).
toLocalDate
(
));
tEmployeeProject
.
setTryPeriod
(
contractInfo
.
getTryPeriod
());
tEmployeeProject
.
setTryPeriod
(
contractInfo
.
getTryPeriod
());
}
}
tEmployeeProjectService
.
updateById
(
tEmployeeProject
);
tEmployeeProjectService
.
updateById
(
tEmployeeProject
);
...
@@ -1665,7 +1665,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
...
@@ -1665,7 +1665,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
tEmployeeProject
.
setContractType
(
null
==
tempStr
?
""
:
tempStr
);
tEmployeeProject
.
setContractType
(
null
==
tempStr
?
""
:
tempStr
);
tEmployeeProject
.
setWorkingHours
(
contract
.
getWorkingHours
());
tEmployeeProject
.
setWorkingHours
(
contract
.
getWorkingHours
());
tEmployeeProject
.
setPost
(
contract
.
getPost
());
tEmployeeProject
.
setPost
(
contract
.
getPost
());
tEmployeeProject
.
setEnjoinDate
(
LocalDateUtil
.
parseLocalDate
(
contract
.
getContractStart
().
toString
()
));
tEmployeeProject
.
setEnjoinDate
(
contract
.
getContractStart
().
toInstant
().
atZone
(
ZoneId
.
systemDefault
()).
toLocalDate
(
));
tEmployeeProject
.
setTryPeriod
(
contract
.
getTryPeriod
());
tEmployeeProject
.
setTryPeriod
(
contract
.
getTryPeriod
());
}
}
tEmployeeProjectService
.
updateById
(
tEmployeeProject
);
tEmployeeProjectService
.
updateById
(
tEmployeeProject
);
...
...
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