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
7f53eb73
Commit
7f53eb73
authored
Jul 08, 2024
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
合同同步档案信息
parent
8b21e6ba
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
1 deletion
+10
-1
EmpProjectDispatchVo.java
.../cloud/plus/v1/yifu/archives/vo/EmpProjectDispatchVo.java
+7
-0
TCompleteMonitorMapper.xml
...-biz/src/main/resources/mapper/TCompleteMonitorMapper.xml
+1
-1
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+2
-0
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmpProjectDispatchVo.java
View file @
7f53eb73
...
...
@@ -13,6 +13,7 @@ import lombok.Data;
import
javax.validation.constraints.NotNull
;
import
javax.validation.constraints.Size
;
import
java.io.Serializable
;
import
java.time.LocalDate
;
/**
* @Author fxj
...
...
@@ -203,4 +204,10 @@ public class EmpProjectDispatchVo implements Serializable {
*/
@Schema
(
description
=
"是否更新岗位信息"
)
private
Boolean
postUpdate
;
/**
* 入职日期
*/
@Schema
(
description
=
"入职日期"
)
private
LocalDate
enjoinDate
;
}
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TCompleteMonitorMapper.xml
View file @
7f53eb73
...
...
@@ -150,7 +150,7 @@
from
t_employee_project a
left join t_employee_info b on a.EMP_ID = b.id
where a.DELETE_FLAG = '0' and a.dept_no = #{deptNo}
where a.DELETE_FLAG = '0' and a.
project_status = 0 and a.
dept_no = #{deptNo}
</select>
<!--生成数据封装-->
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
7f53eb73
...
...
@@ -86,6 +86,7 @@ import java.io.InputStream;
import
java.math.BigDecimal
;
import
java.net.URLEncoder
;
import
java.time.LocalDateTime
;
import
java.time.ZoneId
;
import
java.util.*
;
import
java.util.concurrent.ConcurrentHashMap
;
import
java.util.stream.Collectors
;
...
...
@@ -2119,6 +2120,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
project
.
setPost
(
excel
.
getPost
());
project
.
setWorkingHours
(
excel
.
getWorkingHours
());
project
.
setTryPeriod
(
excel
.
getTryPeriod
());
project
.
setEnjoinDate
(
null
!=
excel
.
getContractStart
()
?
excel
.
getContractStart
().
toInstant
().
atZone
(
ZoneId
.
systemDefault
()).
toLocalDate
()
:
null
);
if
(
Common
.
isNotNull
(
socialSet
)){
project
.
setSocialProvince
(
socialSet
.
getProvince
());
project
.
setSocialCity
(
socialSet
.
getCity
());
...
...
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