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
f4ee4cf3
Commit
f4ee4cf3
authored
Jun 25, 2023
by
wangzb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feature-wzb :添加通信地址同时同步档案
parent
ad75c249
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
0 deletions
+21
-0
EmpAddDispatchVo.java
...yifu/cloud/plus/v1/yifu/archives/vo/EmpAddDispatchVo.java
+7
-0
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+3
-0
TDispatchImportVo.java
.../yifu/cloud/plus/v1/yifu/social/vo/TDispatchImportVo.java
+10
-0
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+1
-0
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmpAddDispatchVo.java
View file @
f4ee4cf3
...
@@ -161,4 +161,11 @@ public class EmpAddDispatchVo extends TEmployeeInfo {
...
@@ -161,4 +161,11 @@ public class EmpAddDispatchVo extends TEmployeeInfo {
@Schema
(
description
=
"是否删除 0否/1是"
)
@Schema
(
description
=
"是否删除 0否/1是"
)
private
String
deleteFlag
;
private
String
deleteFlag
;
/**
* 通信地址
*/
@Schema
(
description
=
"通信地址"
)
private
String
contactAddress
;
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
f4ee4cf3
...
@@ -2368,6 +2368,9 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
...
@@ -2368,6 +2368,9 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
employeeInfo
=
new
TEmployeeInfo
();
employeeInfo
=
new
TEmployeeInfo
();
BeanUtil
.
copyProperties
(
empAdd
,
employeeInfo
);
BeanUtil
.
copyProperties
(
empAdd
,
employeeInfo
);
employeeInfo
.
setEmpCode
(
getCode
());
employeeInfo
.
setEmpCode
(
getCode
());
employeeInfo
.
setContactAddress
(
employeeInfo
.
getContactAddress
());
employeeInfo
.
setIsCollege
(
CommonConstants
.
ONE_INT
);
employeeInfo
.
setHignEducation
(
employeeInfo
.
getHignEducation
());
employeeInfo
.
setStatus
(
CommonConstants
.
ZERO_INT
);
employeeInfo
.
setStatus
(
CommonConstants
.
ZERO_INT
);
date
=
IdCardUtil
.
getBirthdate
(
employeeInfo
.
getEmpIdcard
());
date
=
IdCardUtil
.
getBirthdate
(
employeeInfo
.
getEmpIdcard
());
if
(
Common
.
isNotNull
(
date
))
{
if
(
Common
.
isNotNull
(
date
))
{
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchImportVo.java
View file @
f4ee4cf3
...
@@ -488,6 +488,16 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
...
@@ -488,6 +488,16 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
@ExcelProperty
(
"派单ID"
)
@ExcelProperty
(
"派单ID"
)
private
String
dispatchId
;
private
String
dispatchId
;
/**
* 通信地址
*/
@Schema
(
description
=
"通信地址"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"通信地址"
)
private
String
contactAddress
;
/**
/**
* 订单ID
* 订单ID
*/
*/
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
f4ee4cf3
...
@@ -2048,6 +2048,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -2048,6 +2048,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
emp
.
setCreateBy
(
user
.
getId
());
emp
.
setCreateBy
(
user
.
getId
());
emp
.
setCreateName
(
user
.
getNickname
());
emp
.
setCreateName
(
user
.
getNickname
());
emp
.
setEmpIdcard
(
excel
.
getEmpIdcard
());
emp
.
setEmpIdcard
(
excel
.
getEmpIdcard
());
emp
.
setContactAddress
(
excel
.
getContactAddress
());
emp
.
setEmpName
(
excel
.
getEmpName
());
emp
.
setEmpName
(
excel
.
getEmpName
());
emp
.
setEmpNational
(
excel
.
getEmpNational
());
emp
.
setEmpNational
(
excel
.
getEmpNational
());
emp
.
setEmpNatrue
(
excel
.
getEmpType
());
emp
.
setEmpNatrue
(
excel
.
getEmpType
());
...
...
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